Ros-diffs

ros-diffs@reactos.org

81390 discussions

[zguo] 49119: Revert wininet Wine 1.2RC sync for release. Resource file left intact. See issue #5663 for more details.
by zguo＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: zguo Date: Mon Oct 11 19:19:48 2010 New Revision: 49119 URL: http://svn.reactos.org/svn/reactos?rev=49119&view=rev Log: Revert wininet Wine 1.2RC sync for release. Resource file left intact. See issue #5663 for more details. Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/wininet.rbuild branches/ros-branch-0_3_12/reactos/include/psdk/wininet.h branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -1176,7 +1176,7 @@ } } } - return INET_QueryOption(hdr, option, buffer, size, unicode); + return INET_QueryOption(option, buffer, size, unicode); } static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read) Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -1756,7 +1756,7 @@ } } - return INET_QueryOption(hdr, option, buffer, size, unicode); + return INET_QueryOption(option, buffer, size, unicode); } static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, DWORD size) Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -812,7 +812,7 @@ } } - return INET_QueryOption(hdr, option, buffer, size, unicode); + return INET_QueryOption(option, buffer, size, unicode); } static const object_vtbl_t APPINFOVtbl = { Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -160,7 +160,6 @@ DWORD dwFlags; DWORD_PTR dwContext; DWORD dwError; - ULONG ErrorMask; DWORD dwInternalFlags; LONG refs; INTERNET_STATUS_CALLBACK lpfnStatusCB; Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -134,7 +134,6 @@ MAKE_FUNCPTR(SSL_write); MAKE_FUNCPTR(SSL_read); MAKE_FUNCPTR(SSL_pending); -MAKE_FUNCPTR(SSL_get_error); MAKE_FUNCPTR(SSL_get_ex_new_index); MAKE_FUNCPTR(SSL_get_ex_data); MAKE_FUNCPTR(SSL_set_ex_data); Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -2435,6 +2435,7 @@ DWORD dwFileSizeLow = 0; DWORD dwFileSizeHigh = 0; BYTE cDirectory = 0; + int len; char achFile[MAX_PATH]; LPSTR lpszUrlNameA = NULL; LPSTR lpszFileExtensionA = NULL; Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -307,7 +307,6 @@ case INTERNET_STATUS_CONNECTING_TO_SERVER: case INTERNET_STATUS_CONNECTED_TO_SERVER: lpvNewInfo = heap_strdupAtoW(lpvStatusInfo); - dwStatusInfoLength *= sizeof(WCHAR); break; case INTERNET_STATUS_RESOLVING_NAME: case INTERNET_STATUS_REDIRECT: Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -6,7 +6,6 @@ <importlibrary definition="wininet.spec" /> <include base="wininet">.</include> <include base="ReactOS">include/reactos/wine</include> - <include base="zlib">.</include> <define name="__WINESRC__" /> <define name="_WINE" /> @@ -23,7 +22,6 @@ <library>secur32</library> <library>crypt32</library> <library>ws2_32</library> - <library>zlib</library> <library>pseh</library> <file>cookie.c</file> <file>dialogs.c</file> Modified: branches/ros-branch-0_3_12/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/inclu… ============================================================================== --- branches/ros-branch-0_3_12/reactos/include/psdk/wininet.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/include/psdk/wininet.h [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -122,9 +122,6 @@ ) #define INTERNET_ERROR_MASK_INSERT_CDROM 0x1 -#define INTERNET_ERROR_MASK_COMBINED_SEC_CERT 0x2 -#define INTERNET_ERROR_MASK_NEED_MSN_SSPI_PKG 0x4 -#define INTERNET_ERROR_MASK_LOGIN_FAILURE_DISPLAY_ENTITY_BODY 0x8 #define INTERNET_OPTIONS_MASK (~INTERNET_FLAGS_MASK) #define WININET_API_FLAG_ASYNC 0x00000001 Modified: branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/inclu… ============================================================================== --- branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -99,43 +99,37 @@ #define HAVE_FPCLASS 1 /* Define if FreeType 2 is installed */ -#define HAVE_FREETYPE 1 +/* #undef HAVE_FREETYPE */ /* Define to 1 if you have the <freetype/freetype.h> header file. */ -#define HAVE_FREETYPE_FREETYPE_H 1 +/* #undef HAVE_FREETYPE_FREETYPE_H */ /* Define to 1 if you have the <freetype/ftglyph.h> header file. */ -#define HAVE_FREETYPE_FTGLYPH_H 1 - -/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */ -#define HAVE_FREETYPE_FTLCDFIL_H 1 - -/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ -#define HAVE_FREETYPE_FTMODAPI_H 1 +/* #undef HAVE_FREETYPE_FTGLYPH_H */ /* Define to 1 if you have the <freetype/ftnames.h> header file. */ /* #undef HAVE_FREETYPE_FTNAMES_H */ /* Define to 1 if you have the <freetype/ftoutln.h> header file. */ -#define HAVE_FREETYPE_FTOUTLN_H 1 +/* #undef HAVE_FREETYPE_FTOUTLN_H */ /* Define to 1 if you have the <freetype/ftsnames.h> header file. */ -#define HAVE_FREETYPE_FTSNAMES_H 1 +/* #undef HAVE_FREETYPE_FTSNAMES_H */ /* Define if you have the <freetype/fttrigon.h> header file. */ -#define HAVE_FREETYPE_FTTRIGON_H 1 +/* #undef HAVE_FREETYPE_FTTRIGON_H */ /* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ -#define HAVE_FREETYPE_FTWINFNT_H 1 +/* #undef HAVE_FREETYPE_FTWINFNT_H */ /* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ /* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */ /* Define to 1 if you have the <freetype/ttnameid.h> header file. */ -#define HAVE_FREETYPE_TTNAMEID_H 1 +/* #undef HAVE_FREETYPE_TTNAMEID_H */ /* Define to 1 if you have the <freetype/tttables.h> header file. */ -#define HAVE_FREETYPE_TTTABLES_H 1 +/* #undef HAVE_FREETYPE_TTTABLES_H */ /* Define to 1 if the system has the type `fsblkcnt_t'. */ /* #undef HAVE_FSBLKCNT_T */ @@ -150,13 +144,7 @@ /* #undef HAVE_FSTATVFS */ /* Define to 1 if you have the <ft2build.h> header file. */ -#define HAVE_FT2BUILD_H 1 - -/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */ -/* #undef HAVE_FT_LOAD_SFNT_TABLE */ - -/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ -#define HAVE_FT_TRUETYPEENGINETYPE 1 +/* #undef HAVE_FT2BUILD_H */ /* Define to 1 if you have the `ftruncate' function. */ #define HAVE_FTRUNCATE 1

1 0

[khornicek] 49118: [WIN32K] UserEnumDisplaySettings returns NTSTATUS.
by khornicek＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: khornicek Date: Mon Oct 11 15:56:46 2010 New Revision: 49118 URL: http://svn.reactos.org/svn/reactos?rev=49118&view=rev Log: [WIN32K] UserEnumDisplaySettings returns NTSTATUS. Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/display.c [iso-8859-1] Mon Oct 11 15:56:46 2010 @@ -499,7 +499,7 @@ { /* No device found */ DPRINT1("No device found!\n"); - return FALSE; + return STATUS_UNSUCCESSFUL; } if (iModeNum == 0)

1 0

[jimtabor] 49117: [Wine Tests] - Update the only two tests that I tested and know that does not have RTL support. The Right To Left support will be another comprehensive change that can be done in ...
by jimtabor＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: jimtabor Date: Mon Oct 11 15:12:47 2010 New Revision: 49117 URL: http://svn.reactos.org/svn/reactos?rev=49117&view=rev Log: [Wine Tests] - Update the only two tests that I tested and know that does not have RTL support. The Right To Left support will be another comprehensive change that can be done in a non intrusive way as long no one uses it. Modified: trunk/rostests/winetests/user32/class.c trunk/rostests/winetests/user32/dialog.c Modified: trunk/rostests/winetests/user32/class.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/class.c?… ============================================================================== --- trunk/rostests/winetests/user32/class.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/class.c [iso-8859-1] Mon Oct 11 15:12:47 2010 @@ -19,7 +19,7 @@ */ /* To get CS_DROPSHADOW with the MSVC headers */ -#define _WIN32_WINNT 0x0501 +//#define _WIN32_WINNT 0x0501 #include <assert.h> #include <stdlib.h> @@ -315,6 +315,7 @@ static void test_instances(void) { WNDCLASSA cls, wc; + WNDCLASSEXA wcexA; HWND hwnd, hwnd2; const char *name = "__test__"; HINSTANCE kernel32 = GetModuleHandleA("kernel32"); @@ -347,6 +348,25 @@ check_instance( name, kernel32, kernel32, kernel32 ); check_thread_instance( name, kernel32, kernel32, kernel32 ); ok( UnregisterClassA( name, kernel32 ), "Unregister failed for kernel32\n" ); + + ZeroMemory(&wcexA, sizeof(wcexA)); + wcexA.lpfnWndProc = DefWindowProcA; + wcexA.lpszClassName = "__classex_test__"; + SetLastError(0xdeadbeef); + wcexA.cbSize = sizeof(wcexA) - 1; + ok( ((RegisterClassExA( &wcexA ) == 0) && (GetLastError() == ERROR_INVALID_PARAMETER)), + "Succeeded with invalid number of cbSize bytes\n"); + SetLastError(0xdeadbeef); + wcexA.cbSize = sizeof(wcexA) + 1; + ok( ((RegisterClassExA( &wcexA ) == 0) && (GetLastError() == ERROR_INVALID_PARAMETER)), + "Succeeded with invalid number of cbSize bytes\n"); + SetLastError(0xdeadbeef); + wcexA.cbSize = sizeof(wcexA); + ok( RegisterClassExA( &wcexA ), "Failed with valid number of cbSize bytes\n"); + wcexA.cbSize = 0xdeadbeef; + ok( GetClassInfoEx(main_module, wcexA.lpszClassName, &wcexA), "GetClassInfoEx failed\n"); + ok( wcexA.cbSize == 0xdeadbeef, "GetClassInfoEx returned wrong cbSize value %d\n", wcexA.cbSize); + UnregisterClassA(wcexA.lpszClassName, main_module); /* Bug 2631 - Supplying an invalid number of bytes fails */ cls.cbClsExtra = 0; @@ -880,10 +900,71 @@ } } +static void test_GetClassInfo(void) +{ + static const WCHAR staticW[] = {'s','t','a','t','i','c',0}; + WNDCLASSA wc; + WNDCLASSEXA wcx; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = GetClassInfoA(0, "static", &wc); + ok(ret, "GetClassInfoA() error %d\n", GetLastError()); + +if (0) { /* crashes under XP */ + SetLastError(0xdeadbeef); + ret = GetClassInfoA(0, "static", NULL); + ok(ret, "GetClassInfoA() error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetClassInfoW(0, staticW, NULL); + ok(ret, "GetClassInfoW() error %d\n", GetLastError()); +} + + wcx.cbSize = sizeof(wcx); + SetLastError(0xdeadbeef); + ret = GetClassInfoExA(0, "static", &wcx); + ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetClassInfoExA(0, "static", NULL); + ok(!ret, "GetClassInfoExA() should fail\n"); + ok(GetLastError() == ERROR_NOACCESS || + broken(GetLastError() == 0xdeadbeef), /* win9x */ + "expected ERROR_NOACCESS, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetClassInfoExW(0, staticW, NULL); + ok(!ret, "GetClassInfoExW() should fail\n"); + ok(GetLastError() == ERROR_NOACCESS || + broken(GetLastError() == 0xdeadbeef) /* NT4 */ || + broken(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), /* win9x */ + "expected ERROR_NOACCESS, got %d\n", GetLastError()); + + wcx.cbSize = 0; + SetLastError(0xdeadbeef); + ret = GetClassInfoExA(0, "static", &wcx); + ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); + ok(wcx.cbSize == 0, "expected 0, got %u\n", wcx.cbSize); + + wcx.cbSize = sizeof(wcx) - 1; + SetLastError(0xdeadbeef); + ret = GetClassInfoExA(0, "static", &wcx); + ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); + ok(wcx.cbSize == sizeof(wcx) - 1, "expected sizeof(wcx)-1, got %u\n", wcx.cbSize); + + wcx.cbSize = sizeof(wcx) + 1; + SetLastError(0xdeadbeef); + ret = GetClassInfoExA(0, "static", &wcx); + ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); + ok(wcx.cbSize == sizeof(wcx) + 1, "expected sizeof(wcx)+1, got %u\n", wcx.cbSize); +} + START_TEST(class) { HANDLE hInstance = GetModuleHandleA( NULL ); + test_GetClassInfo(); test_extra_values(); if (!GetModuleHandleW(0)) Modified: trunk/rostests/winetests/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dialog.c… ============================================================================== --- trunk/rostests/winetests/user32/dialog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dialog.c [iso-8859-1] Mon Oct 11 15:12:47 2010 @@ -760,12 +760,7 @@ return TRUE; case WM_COMMAND: - if (LOWORD(wParam) == IDCANCEL) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - else if (LOWORD(wParam) == 200) + if (LOWORD(wParam) == 200) { if (HIWORD(wParam) == EN_SETFOCUS) g_hwndInitialFocusT1 = (HWND)lParam; @@ -1005,6 +1000,28 @@ return FALSE; } +static INT_PTR CALLBACK TestReturnKeyDlgProc (HWND hDlg, UINT uiMsg, + WPARAM wParam, LPARAM lParam) +{ + static int received_idok = 0; + switch (uiMsg) + { + case WM_INITDIALOG: + { + MSG msg = {hDlg, WM_KEYDOWN, VK_RETURN, 0x011c0001}; + IsDialogMessage(hDlg, &msg); + } + ok(received_idok, "WM_COMMAND not received\n"); + EndDialog(hDlg, 0); + return TRUE; + case WM_COMMAND: + ok(wParam==IDOK, "Expected IDOK\n"); + received_idok = 1; + return TRUE; + } + return FALSE; +} + static void test_DialogBoxParamA(void) { INT_PTR ret; @@ -1049,6 +1066,8 @@ ret = DialogBoxParamA(GetModuleHandle(NULL), "TEST_EMPTY_DIALOG", 0, TestDefButtonDlgProc, 0); ok(ret == IDOK, "Expected IDOK\n"); + + DialogBoxParamA(GetModuleHandle(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); } static void test_DisabledDialogTest(void)

1 0

[khornicek] 49116: [WINED3D] Update wined3d, ddraw, d3d8 and d3d9 to Wine 1.3.4.
by khornicek＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: khornicek Date: Mon Oct 11 13:56:39 2010 New Revision: 49116 URL: http://svn.reactos.org/svn/reactos?rev=49116&view=rev Log: [WINED3D] Update wined3d, ddraw, d3d8 and d3d9 to Wine 1.3.4. Added: trunk/reactos/dll/directx/wine/d3d8/buffer.c (with props) trunk/reactos/dll/directx/wine/d3d8/shader.c (with props) trunk/reactos/dll/directx/wine/d3d9/buffer.c (with props) trunk/reactos/dll/directx/wine/d3d9/shader.c (with props) trunk/reactos/dll/directx/wine/ddraw/legacy.h (with props) Removed: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c trunk/reactos/dll/directx/wine/d3d8/pixelshader.c trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d8/vertexshader.c trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c trunk/reactos/dll/directx/wine/d3d9/pixelshader.c trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c trunk/reactos/dll/directx/wine/d3d9/vertexshader.c trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c trunk/reactos/dll/directx/wine/ddraw/direct3d.c trunk/reactos/dll/directx/wine/ddraw/gamma.c trunk/reactos/dll/directx/wine/ddraw/surface_thunks.c trunk/reactos/dll/directx/wine/ddraw/texture.c Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/query.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/ddraw/clipper.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/light.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/material.c trunk/reactos/dll/directx/wine/ddraw/palette.c trunk/reactos/dll/directx/wine/ddraw/parent.c trunk/reactos/dll/directx/wine/ddraw/regsvr.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/basetexture.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/clipper.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/cubetexture.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/surface_base.c trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/view.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/volumetexture.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.idl [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/buff… Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Removed: trunk/reactos/dll/directx/wine/d3d8/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/inde… Removed: trunk/reactos/dll/directx/wine/d3d8/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/pixe… Added: trunk/reactos/dll/directx/wine/d3d8/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/shad… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Removed: trunk/reactos/dll/directx/wine/d3d8/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Removed: trunk/reactos/dll/directx/wine/d3d8/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Added: trunk/reactos/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/buff… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Removed: trunk/reactos/dll/directx/wine/d3d9/indexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/inde… Removed: trunk/reactos/dll/directx/wine/d3d9/pixelshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/pixe… Modified: trunk/reactos/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/quer… Added: trunk/reactos/dll/directx/wine/d3d9/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/shad… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Removed: trunk/reactos/dll/directx/wine/d3d9/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Removed: trunk/reactos/dll/directx/wine/d3d9/vertexshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/cli… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Removed: trunk/reactos/dll/directx/wine/ddraw/ddraw_thunks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Removed: trunk/reactos/dll/directx/wine/ddraw/direct3d.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dir… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Removed: trunk/reactos/dll/directx/wine/ddraw/gamma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/gam… Added: trunk/reactos/dll/directx/wine/ddraw/legacy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/leg… Modified: trunk/reactos/dll/directx/wine/ddraw/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/lig… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/material.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mat… Modified: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal… Modified: trunk/reactos/dll/directx/wine/ddraw/parent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/par… Modified: trunk/reactos/dll/directx/wine/ddraw/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/reg… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Removed: trunk/reactos/dll/directx/wine/ddraw/surface_thunks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Removed: trunk/reactos/dll/directx/wine/ddraw/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/tex… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/basetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Modified: trunk/reactos/dll/directx/wine/wined3d/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_base.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain_gdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

[gadamopoulos] 49115: [win32k] - Remove the FreeLParam 'feature' from win32k. This hack allowed us to post messages that contain pointers. However we don't do it anymore so we can also remove this ...
by gadamopoulos＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: gadamopoulos Date: Mon Oct 11 13:01:46 2010 New Revision: 49115 URL: http://svn.reactos.org/svn/reactos?rev=49115&view=rev Log: [win32k] - Remove the FreeLParam 'feature' from win32k. This hack allowed us to post messages that contain pointers. However we don't do it anymore so we can also remove this as well - Add keyboard messages to the list with Hardware messages and not in the list with post messages Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Mon Oct 11 13:01:46 2010 @@ -11,7 +11,6 @@ typedef struct _USER_MESSAGE { LIST_ENTRY ListEntry; - BOOLEAN FreeLParam; MSG Msg; } USER_MESSAGE, *PUSER_MESSAGE; @@ -116,12 +115,12 @@ UINT uTimeout, BOOL Block, INT HookMessage, ULONG_PTR *uResult); PUSER_MESSAGE FASTCALL -MsqCreateMessage(LPMSG Msg, BOOLEAN FreeLParam); +MsqCreateMessage(LPMSG Msg); VOID FASTCALL MsqDestroyMessage(PUSER_MESSAGE Message); VOID FASTCALL MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, - MSG* Msg, BOOLEAN FreeLParam, DWORD MessageBits); + MSG* Msg, BOOLEAN HardwareMessage, DWORD MessageBits); VOID FASTCALL MsqPostQuitMessage(PUSER_MESSAGE_QUEUE MessageQueue, ULONG ExitCode); BOOLEAN APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Oct 11 13:01:46 2010 @@ -810,7 +810,6 @@ Msg->Msg.message = WM_QUIT; Msg->Msg.wParam = ThreadQueue->QuitExitCode; Msg->Msg.lParam = 0; - Msg->FreeLParam = FALSE; if (RemoveMessages) { ThreadQueue->QuitPosted = FALSE; @@ -866,7 +865,6 @@ &Msg->Msg, RemoveMessages)) { - Msg->FreeLParam = FALSE; goto MsgExit; } @@ -2143,10 +2141,6 @@ RETURN( (BOOL) -1); } Info.Msg.lParam = (LPARAM) UserMem; - } - if (Msg.FreeLParam && 0 != Msg.Msg.lParam) - { - ExFreePool((void *) Msg.Msg.lParam); } Status = MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERGETMESSAGEINFO)); if (! NT_SUCCESS(Status)) @@ -2299,10 +2293,6 @@ RETURN( (BOOL) -1); } Info.Msg.lParam = (LPARAM) UserMem; - } - if (RemoveMsg && Msg.FreeLParam && 0 != Msg.Msg.lParam) - { - ExFreePool((void *) Msg.Msg.lParam); } Status = MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERGETMESSAGEINFO)); if (! NT_SUCCESS(Status)) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon Oct 11 13:01:46 2010 @@ -591,7 +591,7 @@ if (DesktopWindow) { - UserRefObjectCo(DesktopWindow, &Ref);//can DesktopWindow be NULL? + UserRefObjectCo(DesktopWindow, &Ref); Desk = DesktopWindow->head.pti->pDeskInfo; } @@ -628,6 +628,18 @@ } } + else + { + if (Remove) + { + RemoveEntryList(&Current->ListEntry); + } + IntUnLockHardwareMessageQueue(MessageQueue); + IntUnLockSystemHardwareMessageQueueLock(FALSE); + *Message = Current; + + RETURN(TRUE); + } } IntUnLockHardwareMessageQueue(MessageQueue); @@ -650,7 +662,6 @@ UserMsg = ExAllocateFromPagedLookasideList(&MessageLookasideList); /* What to do if out of memory? For now we just panic a bit in debug */ ASSERT(UserMsg); - UserMsg->FreeLParam = FALSE; UserMsg->Msg = Msg; InsertTailList(&HardwareMessageQueueHead, &UserMsg->ListEntry); @@ -808,7 +819,7 @@ FocusMessageQueue->Desktop->pDeskInfo->LastInputWasKbd = TRUE; Msg.pt = gpsi->ptCursor; - MsqPostMessage(FocusMessageQueue, &Msg, FALSE, QS_KEY); + MsqPostMessage(FocusMessageQueue, &Msg, TRUE, QS_KEY); } else { @@ -866,7 +877,7 @@ } PUSER_MESSAGE FASTCALL -MsqCreateMessage(LPMSG Msg, BOOLEAN FreeLParam) +MsqCreateMessage(LPMSG Msg) { PUSER_MESSAGE Message; @@ -876,7 +887,6 @@ return NULL; } - Message->FreeLParam = FreeLParam; RtlMoveMemory(&Message->Msg, Msg, sizeof(MSG)); return Message; @@ -1302,17 +1312,26 @@ } VOID FASTCALL -MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, MSG* Msg, BOOLEAN FreeLParam, +MsqPostMessage(PUSER_MESSAGE_QUEUE MessageQueue, MSG* Msg, BOOLEAN HardwareMessage, DWORD MessageBits) { PUSER_MESSAGE Message; - if(!(Message = MsqCreateMessage(Msg, FreeLParam))) + if(!(Message = MsqCreateMessage(Msg))) { return; } - InsertTailList(&MessageQueue->PostedMessagesListHead, - &Message->ListEntry); + + if(!HardwareMessage) + { + InsertTailList(&MessageQueue->PostedMessagesListHead, + &Message->ListEntry); + } + else + { + InsertTailList(&MessageQueue->HardwareMessagesListHead, + &Message->ListEntry); + } MessageQueue->QueueBits |= MessageBits; MessageQueue->ChangedBits |= MessageBits; if (MessageQueue->WakeMask & MessageBits)

1 0

[gadamopoulos] 49114: [win32k] -Move checks for active hooks in co_HOOK_CallHooks
by gadamopoulos＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: gadamopoulos Date: Mon Oct 11 10:58:33 2010 New Revision: 49114 URL: http://svn.reactos.org/svn/reactos?rev=49114&view=rev Log: [win32k] -Move checks for active hooks in co_HOOK_CallHooks Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Mon Oct 11 10:58:33 2010 @@ -117,7 +117,6 @@ case WM_SYSCOMMAND: { DPRINT1("hwnd %p WM_SYSCOMMAND %lx %lx\n", Wnd->head.h, wParam, lParam ); - if (!ISITHOOKED(WH_CBT)) break; lResult = co_HOOK_CallHooks(WH_CBT, HCBT_SYSCOMMAND, wParam, lParam); break; } @@ -145,8 +144,6 @@ case WM_CBT: { - if (!ISITHOOKED(WH_CBT)) break; - switch (wParam) { case HCBT_MOVESIZE: 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] Mon Oct 11 10:58:33 2010 @@ -331,6 +331,12 @@ NTSTATUS Status; ASSERT(WH_MINHOOK <= HookId && HookId <= WH_MAXHOOK); + + /* FIXME! Check pDeskInfo->fsHooks for global hooks! */ + if (!ISITHOOKED(HookId)) + { + return 0; + } pti = PsGetCurrentThreadWin32Thread(); if (!pti) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Oct 11 10:58:33 2010 @@ -330,20 +330,16 @@ ( PWND Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { BOOL SameThread = FALSE; + CWPSTRUCT CWP; if (Window->head.pti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) SameThread = TRUE; - if ((!SameThread && (Window->head.pti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || - (SameThread && ISITHOOKED(WH_CALLWNDPROC)) ) - { - CWPSTRUCT CWP; - CWP.hwnd = hWnd; - CWP.message = Msg; - CWP.wParam = wParam; - CWP.lParam = lParam; - co_HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, SameThread, (LPARAM)&CWP ); - } + CWP.hwnd = hWnd; + CWP.message = Msg; + CWP.wParam = wParam; + CWP.lParam = lParam; + co_HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, SameThread, (LPARAM)&CWP ); } static @@ -353,21 +349,17 @@ ( PWND Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *uResult) { BOOL SameThread = FALSE; + CWPRETSTRUCT CWPR; if (Window->head.pti == ((PTHREADINFO)PsGetCurrentThreadWin32Thread())) SameThread = TRUE; - if ((!SameThread && (Window->head.pti->fsHooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || - (SameThread && ISITHOOKED(WH_CALLWNDPROCRET)) ) - { - CWPRETSTRUCT CWPR; - CWPR.hwnd = hWnd; - CWPR.message = Msg; - CWPR.wParam = wParam; - CWPR.lParam = lParam; - CWPR.lResult = *uResult; - co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); - } + CWPR.hwnd = hWnd; + CWPR.message = Msg; + CWPR.wParam = wParam; + CWPR.lParam = lParam; + CWPR.lResult = *uResult; + co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); } LRESULT @@ -709,17 +701,14 @@ Msg->message, (LPARAM)&MHook )) { - if (ISITHOOKED(WH_CBT)) - { - MHook.pt = Msg->pt; - MHook.hwnd = Msg->hwnd; - MHook.wHitTestCode = HitTest; - MHook.dwExtraInfo = 0; - co_HOOK_CallHooks( WH_CBT, - HCBT_CLICKSKIPPED, - Msg->message, - (LPARAM)&MHook); - } + MHook.pt = Msg->pt; + MHook.hwnd = Msg->hwnd; + MHook.wHitTestCode = HitTest; + MHook.dwExtraInfo = 0; + co_HOOK_CallHooks( WH_CBT, + HCBT_CLICKSKIPPED, + Msg->message, + (LPARAM)&MHook); return FALSE; } @@ -743,14 +732,11 @@ LOWORD(Msg->wParam), Msg->lParam)) { - if (ISITHOOKED(WH_CBT)) - { - /* skip this message */ - co_HOOK_CallHooks( WH_CBT, - HCBT_KEYSKIPPED, - LOWORD(Msg->wParam), - Msg->lParam ); - } + /* skip this message */ + co_HOOK_CallHooks( WH_CBT, + HCBT_KEYSKIPPED, + LOWORD(Msg->wParam), + Msg->lParam ); return FALSE; } return TRUE; @@ -965,7 +951,7 @@ MsgExit: pti->rpdesk->htEx = HitTest; /* Now set the capture hit. */ - if ( ISITHOOKED(WH_MOUSE) && IS_MOUSE_MESSAGE(Msg->Msg.message)) + if ( IS_MOUSE_MESSAGE(Msg->Msg.message)) { if (!ProcessMouseMessage(&Msg->Msg, HitTest, RemoveMsg)) { @@ -973,7 +959,7 @@ } } - if ( ISITHOOKED(WH_KEYBOARD) && IS_KBD_MESSAGE(Msg->Msg.message)) + if ( IS_KBD_MESSAGE(Msg->Msg.message)) { if(!ProcessKeyboardMessage(&Msg->Msg, RemoveMsg)) { @@ -982,11 +968,8 @@ } // The WH_GETMESSAGE hook enables an application to monitor messages about to // be returned by the GetMessage or PeekMessage function. - if (ISITHOOKED(WH_GETMESSAGE)) - { - //DPRINT1("Peek WH_GETMESSAGE -> %x\n",&Msg); - co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg->Msg); - } + + co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg->Msg); return TRUE; } @@ -2419,17 +2402,13 @@ if (BadChk) RETURN( FALSE); - if ( ISITHOOKED(WH_SYSMSGFILTER) && - co_HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)&Msg)) + if ( co_HOOK_CallHooks( WH_SYSMSGFILTER, code, 0, (LPARAM)&Msg)) { Ret = TRUE; } else { - if ( ISITHOOKED(WH_MSGFILTER) ) - { - Ret = co_HOOK_CallHooks( WH_MSGFILTER, code, 0, (LPARAM)&Msg); - } + Ret = co_HOOK_CallHooks( WH_MSGFILTER, code, 0, (LPARAM)&Msg); } _SEH2_TRY @@ -2620,12 +2599,13 @@ case FNID_SENDMESSAGECALLBACK: { PCALL_BACK_INFO CallBackInfo = (PCALL_BACK_INFO)ResultInfo; + ULONG_PTR uResult; if (!CallBackInfo) break; if (!co_IntSendMessageWithCallBack(hWnd, Msg, wParam, lParam, - CallBackInfo->CallBack, CallBackInfo->Context, NULL)) + CallBackInfo->CallBack, CallBackInfo->Context, &uResult)) { DPRINT1("Callback failure!\n"); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Oct 11 10:58:33 2010 @@ -1966,14 +1966,13 @@ Cs->style = Window->style; /* HCBT_CREATEWND needs the real window style */ CbtCreate.lpcs = Cs; CbtCreate.hwndInsertAfter = HWND_TOP; - if (ISITHOOKED(WH_CBT)) - { - if (co_HOOK_CallHooks(WH_CBT, HCBT_CREATEWND, (WPARAM) hWnd, (LPARAM) &CbtCreate)) - { - DPRINT1("HCBT_CREATEWND hook failed!\n"); - RETURN( (PWND) NULL); - } - } + + if (co_HOOK_CallHooks(WH_CBT, HCBT_CREATEWND, (WPARAM) hWnd, (LPARAM) &CbtCreate)) + { + DPRINT1("HCBT_CREATEWND hook failed!\n"); + RETURN( (PWND) NULL); + } + Cs->style = dwStyle; /* NCCREATE and WM_NCCALCSIZE need the original values*/ /* Send the WM_GETMINMAXINFO message*/ @@ -2342,7 +2341,7 @@ } /* If window was created successfully and it is hooked */ - if ((Window->state2 & WNDS2_WMCREATEMSGPROCESSED) && (ISITHOOKED(WH_CBT))) + if ((Window->state2 & WNDS2_WMCREATEMSGPROCESSED)) { if (co_HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) hWnd, 0)) return FALSE; }

1 0

[fireball] 49113: [HEAP] - Fix DWORD -> ULONG in function definitions too.
by fireball＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: fireball Date: Mon Oct 11 10:29:41 2010 New Revision: 49113 URL: http://svn.reactos.org/svn/reactos?rev=49113&view=rev Log: [HEAP] - Fix DWORD -> ULONG in function definitions too. Modified: trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=49113&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Mon Oct 11 10:29:41 2010 @@ -1982,9 +1982,9 @@ NTSTATUS NTAPI RtlMultipleAllocateHeap(IN PVOID HeapHandle, - IN DWORD Flags, + IN ULONG Flags, IN SIZE_T Size, - IN DWORD Count, + IN ULONG Count, OUT PVOID *Array) { UNIMPLEMENTED; @@ -1994,8 +1994,8 @@ NTSTATUS NTAPI RtlMultipleFreeHeap(IN PVOID HeapHandle, - IN DWORD Flags, - IN DWORD Count, + IN ULONG Flags, + IN ULONG Count, OUT PVOID *Array) { UNIMPLEMENTED; Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Mon Oct 11 10:29:41 2010 @@ -3553,9 +3553,9 @@ NTSTATUS NTAPI RtlMultipleAllocateHeap(IN PVOID HeapHandle, - IN DWORD Flags, + IN ULONG Flags, IN SIZE_T Size, - IN DWORD Count, + IN ULONG Count, OUT PVOID *Array) { UNIMPLEMENTED; @@ -3565,8 +3565,8 @@ NTSTATUS NTAPI RtlMultipleFreeHeap(IN PVOID HeapHandle, - IN DWORD Flags, - IN DWORD Count, + IN ULONG Flags, + IN ULONG Count, OUT PVOID *Array) { UNIMPLEMENTED;

1 0

[pschweitzer] 49112: [NDK] Fixed build
by pschweitzer＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: pschweitzer Date: Mon Oct 11 10:20:40 2010 New Revision: 49112 URL: http://svn.reactos.org/svn/reactos?rev=49112&view=rev Log: [NDK] Fixed build Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Mon Oct 11 10:20:40 2010 @@ -761,9 +761,9 @@ NTAPI RtlMultipleAllocateHeap ( IN PVOID HeapHandle, - IN DWORD Flags, + IN ULONG Flags, IN SIZE_T Size, - IN DWORD Count, + IN ULONG Count, OUT PVOID * Array ); @@ -772,8 +772,8 @@ NTAPI RtlMultipleFreeHeap ( IN PVOID HeapHandle, - IN DWORD Flags, - IN DWORD Count, + IN ULONG Flags, + IN ULONG Count, OUT PVOID * Array ); Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Mon Oct 11 10:20:40 2010 @@ -367,6 +367,15 @@ } RTL_PATH_TYPE; #ifndef NTOS_MODE_USER + +// +// Heap Information Class +// +typedef enum _HEAP_INFORMATION_CLASS +{ + HeapCompatibilityInformation, + HeapEnableTerminationOnCorruption +} HEAP_INFORMATION_CLASS; // // Callback function for RTL Timers or Registered Waits

1 0

[fireball] 49111: [HEAP] - Fix RtlQuery/SetHeapInformation prototypes, move them to an appropriate place. - Implement RtlQuery/SetHeapInformation. - Implement in-place block growing. - Amount of wi...
by fireball＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: fireball Date: Mon Oct 11 08:39:04 2010 New Revision: 49111 URL: http://svn.reactos.org/svn/reactos?rev=49111&view=rev Log: [HEAP] - Fix RtlQuery/SetHeapInformation prototypes, move them to an appropriate place. - Implement RtlQuery/SetHeapInformation. - Implement in-place block growing. - Amount of winetest heap failures is down to 6 (3 exceptions still happen). Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Mon Oct 11 08:39:04 2010 @@ -708,6 +708,17 @@ ); NTSYSAPI +NTSTATUS +NTAPI +RtlQueryHeapInformation ( + IN PVOID HeapHandle, + IN HEAP_INFORMATION_CLASS HeapInformationClass, + OUT PVOID HeapInformation OPTIONAL, + IN SIZE_T HeapInformationLength OPTIONAL, + OUT PSIZE_T ReturnLength OPTIONAL + ); + +NTSYSAPI PWSTR NTAPI RtlQueryTagHeap( @@ -729,11 +740,42 @@ ); NTSYSAPI +NTSTATUS +NTAPI +RtlSetHeapInformation ( + IN PVOID HeapHandle, + IN HEAP_INFORMATION_CLASS HeapInformationClass, + IN PVOID HeapInformation OPTIONAL, + IN SIZE_T HeapInformationLength OPTIONAL + ); + +NTSYSAPI BOOLEAN NTAPI RtlLockHeap( IN HANDLE Heap ); + +NTSYSAPI +NTSTATUS +NTAPI +RtlMultipleAllocateHeap ( + IN PVOID HeapHandle, + IN DWORD Flags, + IN SIZE_T Size, + IN DWORD Count, + OUT PVOID * Array + ); + +NTSYSAPI +NTSTATUS +NTAPI +RtlMultipleFreeHeap ( + IN PVOID HeapHandle, + IN DWORD Flags, + IN DWORD Count, + OUT PVOID * Array + ); NTSYSAPI NTSTATUS Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Oct 11 08:39:04 2010 @@ -4958,50 +4958,6 @@ HeapEnableTerminationOnCorruption } HEAP_INFORMATION_CLASS; -NTSYSAPI -DWORD -NTAPI -RtlSetHeapInformation ( - IN PVOID HeapHandle, - IN HEAP_INFORMATION_CLASS HeapInformationClass, - IN PVOID HeapInformation OPTIONAL, - IN SIZE_T HeapInformationLength OPTIONAL - ); - -NTSYSAPI -DWORD -NTAPI -RtlQueryHeapInformation ( - IN PVOID HeapHandle, - IN HEAP_INFORMATION_CLASS HeapInformationClass, - OUT PVOID HeapInformation OPTIONAL, - IN SIZE_T HeapInformationLength OPTIONAL, - OUT PSIZE_T ReturnLength OPTIONAL - ); - -// -// Multiple alloc-free APIS -// - -DWORD -NTAPI -RtlMultipleAllocateHeap ( - IN PVOID HeapHandle, - IN DWORD Flags, - IN SIZE_T Size, - IN DWORD Count, - OUT PVOID * Array - ); - -DWORD -NTAPI -RtlMultipleFreeHeap ( - IN PVOID HeapHandle, - IN DWORD Flags, - IN DWORD Count, - OUT PVOID * Array - ); - typedef enum _PROCESSOR_CACHE_TYPE { CacheUnified, CacheInstruction, Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=49111&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Mon Oct 11 08:39:04 2010 @@ -1934,7 +1934,7 @@ return NULL; } -DWORD +NTSTATUS NTAPI RtlSetHeapInformation(IN HANDLE HeapHandle OPTIONAL, IN HEAP_INFORMATION_CLASS HeapInformationClass, @@ -1945,7 +1945,7 @@ return 0; } -DWORD +NTSTATUS NTAPI RtlQueryHeapInformation(HANDLE HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, @@ -1979,7 +1979,7 @@ } } -DWORD +NTSTATUS NTAPI RtlMultipleAllocateHeap(IN PVOID HeapHandle, IN DWORD Flags, @@ -1991,7 +1991,7 @@ return 0; } -DWORD +NTSTATUS NTAPI RtlMultipleFreeHeap(IN PVOID HeapHandle, IN DWORD Flags, Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Mon Oct 11 08:39:04 2010 @@ -955,32 +955,32 @@ Use classic, lernt from university times algorithm for removing an entry from a static array */ - Current = (PHEAP *)&Peb->ProcessHeaps[Heap->ProcessHeapsListIndex - 1]; - Next = Current + 1; - - /* How many items we need to shift to the left */ - Count = Peb->NumberOfHeaps - (Heap->ProcessHeapsListIndex - 1); - - /* Move them all in a loop */ - while (--Count) - { - /* Copy it and advance next pointer */ - *Current = *Next; - - /* Update its index */ - (*Current)->ProcessHeapsListIndex -= 1; - - /* Advance pointers */ - Current++; - Next++; - } - - /* Decrease total number of heaps */ - Peb->NumberOfHeaps--; - - /* Zero last unused item */ - Peb->ProcessHeaps[Peb->NumberOfHeaps] = NULL; - Heap->ProcessHeapsListIndex = 0; + Current = (PHEAP *)&Peb->ProcessHeaps[Heap->ProcessHeapsListIndex - 1]; + Next = Current + 1; + + /* How many items we need to shift to the left */ + Count = Peb->NumberOfHeaps - (Heap->ProcessHeapsListIndex - 1); + + /* Move them all in a loop */ + while (--Count) + { + /* Copy it and advance next pointer */ + *Current = *Next; + + /* Update its index */ + (*Current)->ProcessHeapsListIndex -= 1; + + /* Advance pointers */ + Current++; + Next++; + } + + /* Decrease total number of heaps */ + Peb->NumberOfHeaps--; + + /* Zero last unused item */ + Peb->ProcessHeaps[Peb->NumberOfHeaps] = NULL; + Heap->ProcessHeapsListIndex = 0; /* Release the lock */ RtlLeaveHeapLock(&RtlpProcessHeapsListLock); @@ -1977,6 +1977,8 @@ /* Release the lock */ if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + DPRINT1("HEAP: Allocation failed!\n"); + DPRINT1("Flags %x\n", Heap->Flags); return NULL; } @@ -2016,7 +2018,8 @@ if (Size >= 0x80000000) { RtlSetLastWin32ErrorAndNtStatusFromNtStatus(STATUS_NO_MEMORY); - return FALSE; + DPRINT1("HEAP: Allocation failed!\n"); + return NULL; } if (Flags & ( @@ -2167,6 +2170,7 @@ // Set STATUS! /* Release the lock */ if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + DPRINT1("HEAP: Allocation failed!\n"); return NULL; } @@ -2202,6 +2206,7 @@ /* Release the lock */ if (HeapLocked) RtlLeaveHeapLock(Heap->LockVariable); + DPRINT1("HEAP: Allocation failed!\n"); return NULL; } @@ -2277,7 +2282,8 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed releasing memory with Status 0x%08X\n", Status); + DPRINT1("HEAP: Failed releasing memory with Status 0x%08X. Heap %p, ptr %p, base address %p\n", + Status, Heap, Ptr, VirtualEntry); RtlSetLastWin32ErrorAndNtStatusFromNtStatus(Status); } } @@ -2351,8 +2357,225 @@ IN SIZE_T Size, IN SIZE_T Index) { - /* We always fail growing in place now */ - return FALSE; + UCHAR EntryFlags, RememberFlags; + PHEAP_FREE_ENTRY FreeEntry, UnusedEntry, FollowingEntry; + SIZE_T FreeSize, PrevSize, TailPart, AddedSize = 0; + PHEAP_ENTRY_EXTRA OldExtra, NewExtra; + + /* We can't grow beyond specified threshold */ + if (Index > Heap->VirtualMemoryThreshold) + return FALSE; + + /* Get entry flags */ + EntryFlags = InUseEntry->Flags; + + /* Get the next free entry */ + FreeEntry = (PHEAP_FREE_ENTRY)(InUseEntry + InUseEntry->Size); + + if (EntryFlags & HEAP_ENTRY_LAST_ENTRY) + { + /* There is no next block, just uncommitted space. Calculate how much is needed */ + FreeSize = (Index - InUseEntry->Size) << HEAP_ENTRY_SHIFT; + FreeSize = ROUND_UP(FreeSize, PAGE_SIZE); + + /* Find and commit those pages */ + FreeEntry = RtlpFindAndCommitPages(Heap, + Heap->Segments[InUseEntry->SegmentOffset], + &FreeSize, + FreeEntry); + + /* Fail if it failed... */ + if (!FreeEntry) return FALSE; + + /* It was successful, perform coalescing */ + FreeSize = FreeSize >> HEAP_ENTRY_SHIFT; + FreeEntry = RtlpCoalesceFreeBlocks(Heap, FreeEntry, &FreeSize, FALSE); + + /* Check if it's enough */ + if (FreeSize + InUseEntry->Size < Index) + { + /* Still not enough */ + RtlpInsertFreeBlock(Heap, FreeEntry, FreeSize); + Heap->TotalFreeSize += FreeSize; + return FALSE; + } + + /* Remember flags of this free entry */ + RememberFlags = FreeEntry->Flags; + + /* Sum up sizes */ + FreeSize += InUseEntry->Size; + } + else + { + /* The next block indeed exists. Check if it's free or in use */ + if (FreeEntry->Flags & HEAP_ENTRY_BUSY) return FALSE; + + /* Next entry is free, check if it can fit the block we need */ + FreeSize = InUseEntry->Size + FreeEntry->Size; + if (FreeSize < Index) return FALSE; + + /* Remember flags of this free entry */ + RememberFlags = FreeEntry->Flags; + + /* Remove this block from the free list */ + RtlpRemoveFreeBlock(Heap, FreeEntry, FALSE, FALSE); + Heap->TotalFreeSize -= FreeEntry->Size; + } + + PrevSize = (InUseEntry->Size << HEAP_ENTRY_SHIFT) - InUseEntry->UnusedBytes; + FreeSize -= Index; + + /* Don't produce too small blocks */ + if (FreeSize <= 2) + { + Index += FreeSize; + FreeSize = 0; + } + + /* Process extra stuff */ + if (RememberFlags & HEAP_ENTRY_EXTRA_PRESENT) + { + /* Calculate pointers */ + OldExtra = (PHEAP_ENTRY_EXTRA)(InUseEntry + InUseEntry->Size - 1); + NewExtra = (PHEAP_ENTRY_EXTRA)(InUseEntry + Index - 1); + + /* Copy contents */ + *NewExtra = *OldExtra; + + // FIXME Tagging + } + + /* Update sizes */ + InUseEntry->Size = Index; + InUseEntry->UnusedBytes = ((Index << HEAP_ENTRY_SHIFT) - Size); + + /* Check if there is a free space remaining after merging those blocks */ + if (!FreeSize) + { + /* Update flags and sizes */ + InUseEntry->Flags |= RememberFlags & HEAP_ENTRY_LAST_ENTRY; + + /* Either update previous size of the next entry or mark it as a last + entry in the segment*/ + if (RememberFlags & HEAP_ENTRY_LAST_ENTRY) + Heap->Segments[InUseEntry->SegmentOffset]->LastEntryInSegment = InUseEntry; + else + (InUseEntry + InUseEntry->Size)->PreviousSize = InUseEntry->Size; + } + else + { + /* Complex case, we need to split the block to give unused free space + back to the heap */ + UnusedEntry = (PHEAP_FREE_ENTRY)(InUseEntry + Index); + UnusedEntry->PreviousSize = Index; + UnusedEntry->SegmentOffset = InUseEntry->SegmentOffset; + + /* Update the following block or set the last entry in the segment */ + if (RememberFlags & HEAP_ENTRY_LAST_ENTRY) + { + /* Set last entry and set flags and size */ + Heap->Segments[InUseEntry->SegmentOffset]->LastEntryInSegment = InUseEntry; + UnusedEntry->Flags = RememberFlags; + UnusedEntry->Size = FreeSize; + + /* Insert it to the heap and update total size */ + RtlpInsertFreeBlockHelper(Heap, UnusedEntry, FreeSize, FALSE); + Heap->TotalFreeSize += FreeSize; + } + else + { + /* There is a block after this one */ + FollowingEntry = (PHEAP_FREE_ENTRY)((PHEAP_ENTRY)UnusedEntry + FreeSize); + + if (FollowingEntry->Flags & HEAP_ENTRY_BUSY) + { + /* Update flags and set size of the unused space entry */ + UnusedEntry->Flags = RememberFlags & (~HEAP_ENTRY_LAST_ENTRY); + UnusedEntry->Size = FreeSize; + + /* Update previous size of the following entry */ + FollowingEntry->PreviousSize = FreeSize; + + /* Insert it to the heap and update total free size */ + RtlpInsertFreeBlockHelper(Heap, UnusedEntry, FreeSize, FALSE); + Heap->TotalFreeSize += FreeSize; + } + else + { + /* That following entry is also free, what a fortune! */ + RememberFlags = FollowingEntry->Flags; + + /* Remove it */ + RtlpRemoveFreeBlock(Heap, FollowingEntry, FALSE, FALSE); + Heap->TotalFreeSize -= FollowingEntry->Size; + + /* And make up a new combined block */ + FreeSize += FollowingEntry->Size; + UnusedEntry->Flags = RememberFlags; + + /* Check where to put it */ + if (FreeSize <= HEAP_MAX_BLOCK_SIZE) + { + /* Fine for a dedicated list */ + UnusedEntry->Size = FreeSize; + + if (RememberFlags & HEAP_ENTRY_LAST_ENTRY) + Heap->Segments[UnusedEntry->SegmentOffset]->LastEntryInSegment = (PHEAP_ENTRY)UnusedEntry; + else + ((PHEAP_ENTRY)UnusedEntry + FreeSize)->PreviousSize = FreeSize; + + /* Insert it back and update total size */ + RtlpInsertFreeBlockHelper(Heap, UnusedEntry, FreeSize, FALSE); + Heap->TotalFreeSize += FreeSize; + } + else + { + /* The block is very large, leave all the hassle to the insertion routine */ + RtlpInsertFreeBlock(Heap, UnusedEntry, FreeSize); + } + } + } + } + + /* Copy user settable flags */ + InUseEntry->Flags &= ~HEAP_ENTRY_SETTABLE_FLAGS; + InUseEntry->Flags |= ((Flags & HEAP_SETTABLE_USER_FLAGS) >> 4); + + /* Properly "zero out" (and fill!) the space */ + if (Flags & HEAP_ZERO_MEMORY) + { + RtlZeroMemory((PCHAR)(InUseEntry + 1) + PrevSize, Size - PrevSize); + } + else if (Heap->Flags & HEAP_FREE_CHECKING_ENABLED) + { + /* Calculate tail part which we need to fill */ + TailPart = PrevSize & (sizeof(ULONG) - 1); + + /* "Invert" it as usual */ + if (TailPart) TailPart = 4 - TailPart; + + if (Size > (PrevSize + TailPart)) + AddedSize = (Size - (PrevSize + TailPart)) & ~(sizeof(ULONG) - 1); + + if (AddedSize) + { + RtlFillMemoryUlong((PCHAR)(InUseEntry + 1) + PrevSize + TailPart, + AddedSize, + ARENA_INUSE_FILLER); + } + } + + /* Fill the new tail */ + if (Heap->Flags & HEAP_TAIL_CHECKING_ENABLED) + { + RtlFillMemory((PCHAR)(InUseEntry + 1) + Size, + HEAP_ENTRY_SIZE, + HEAP_TAIL_FILL); + } + + /* Return success */ + return TRUE; } PHEAP_ENTRY_EXTRA NTAPI @@ -3270,18 +3493,34 @@ return NULL; } -DWORD +NTSTATUS NTAPI RtlSetHeapInformation(IN HANDLE HeapHandle OPTIONAL, IN HEAP_INFORMATION_CLASS HeapInformationClass, IN PVOID HeapInformation, IN SIZE_T HeapInformationLength) { - UNIMPLEMENTED; - return 0; -} - -DWORD + /* Setting heap information is not really supported except for enabling LFH */ + if (HeapInformationClass == 0) return STATUS_SUCCESS; + + /* Check buffer length */ + if (HeapInformationLength < sizeof(ULONG)) + { + /* The provided buffer is too small */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* Check for a special magic value for enabling LFH */ + if (*(PULONG)HeapInformation == 2) + { + DPRINT1("RtlSetHeapInformation() needs to enable LFH\n"); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS NTAPI RtlQueryHeapInformation(HANDLE HeapHandle, HEAP_INFORMATION_CLASS HeapInformationClass, @@ -3289,11 +3528,29 @@ SIZE_T HeapInformationLength OPTIONAL, PSIZE_T ReturnLength OPTIONAL) { - UNIMPLEMENTED; - return 0; -} - -DWORD + PHEAP Heap = (PHEAP)HeapHandle; + + /* Only HeapCompatibilityInformation is supported */ + if (HeapInformationClass != HeapCompatibilityInformation) + return STATUS_UNSUCCESSFUL; + + /* Set result length */ + if (ReturnLength) *ReturnLength = sizeof(ULONG); + + /* Check buffer length */ + if (HeapInformationLength < sizeof(ULONG)) + { + /* It's too small, return needed length */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* Return front end heap type */ + *(PULONG)HeapInformation = Heap->FrontEndHeapType; + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI RtlMultipleAllocateHeap(IN PVOID HeapHandle, IN DWORD Flags, @@ -3305,7 +3562,7 @@ return 0; } -DWORD +NTSTATUS NTAPI RtlMultipleFreeHeap(IN PVOID HeapHandle, IN DWORD Flags,

1 0

[fireball] 49110: [ADVAPI32] - Katayama Hirofumi: Use DataLength field in RegEnumValueW instead of DataOffset. - Roel Messiant: Test behaviour in Vista and apply same fix to RegEnumValueA. See issu...
by fireball＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: fireball Date: Mon Oct 11 07:47:52 2010 New Revision: 49110 URL: http://svn.reactos.org/svn/reactos?rev=49110&view=rev Log: [ADVAPI32] - Katayama Hirofumi: Use DataLength field in RegEnumValueW instead of DataOffset. - Roel Messiant: Test behaviour in Vista and apply same fix to RegEnumValueA. See issue #2492 for more details. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Mon Oct 11 07:47:52 2010 @@ -2793,14 +2793,14 @@ status = NtEnumerateValueKey( KeyHandle, index, KeyValueFullInformation, buffer, total_size, &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; + if (status && (status != STATUS_BUFFER_OVERFLOW) && (status != STATUS_BUFFER_TOO_SMALL)) goto done; /* we need to fetch the contents for a string type even if not requested, * because we need to compute the length of the ASCII string. */ if (value || data || is_string(info->Type)) { /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) + while ((status == STATUS_BUFFER_OVERFLOW) || (status == STATUS_BUFFER_TOO_SMALL)) { if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr ); if (!(buf_ptr = HeapAlloc( GetProcessHeap(), 0, total_size ))) @@ -2819,14 +2819,14 @@ { ULONG len; RtlUnicodeToMultiByteSize( &len, (WCHAR *)(buf_ptr + info->DataOffset), - total_size - info->DataOffset ); + info->DataLength ); if (data && len) { if (len > *count) status = STATUS_BUFFER_OVERFLOW; else { RtlUnicodeToMultiByteN( (PCHAR)data, len, NULL, (WCHAR *)(buf_ptr + info->DataOffset), - total_size - info->DataOffset ); + info->DataLength ); /* if the type is REG_SZ and data is not 0-terminated * and there is enough space in the buffer NT appends a \0 */ if (len < *count && data[len-1]) data[len] = 0; @@ -2836,8 +2836,8 @@ } else if (data) { - if (total_size - info->DataOffset > *count) status = STATUS_BUFFER_OVERFLOW; - else memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); + if (info->DataLength > *count) status = STATUS_BUFFER_OVERFLOW; + else memcpy( data, buf_ptr + info->DataOffset, info->DataLength ); } if (value && !status) @@ -2962,17 +2962,17 @@ if (data) { - if (total_size - info->DataOffset > *count) + if (info->DataLength > *count) { status = STATUS_BUFFER_OVERFLOW; goto overflow; } - memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); - if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) + memcpy( data, buf_ptr + info->DataOffset, info->DataLength ); + if (is_string(info->Type) && info->DataLength <= *count - sizeof(WCHAR)) { /* if the type is REG_SZ and data is not 0-terminated * and there is enough space in the buffer NT appends a \0 */ - WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); + WCHAR *ptr = (WCHAR *)(data + info->DataLength); if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; } }

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