Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 54010: [user32_apitest] - Add some message tests for DeferWindowPos
by gadamopoulos＠svn.reactos.org 05 Oct '11

05 Oct '11

Author: gadamopoulos Date: Wed Oct 5 14:44:45 2011 New Revision: 54010 URL: http://svn.reactos.org/svn/reactos?rev=54010&view=rev Log: [user32_apitest] - Add some message tests for DeferWindowPos Modified: trunk/rostests/apitests/user32/DeferWindowPos.c Modified: trunk/rostests/apitests/user32/DeferWindowPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DeferWind… ============================================================================== --- trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] Wed Oct 5 14:44:45 2011 @@ -8,6 +8,59 @@ #include <stdio.h> #include <wine/test.h> #include <windows.h> +#include "helper.h" +#include <undocuser.h> + +HWND hWnd1, hWnd2; + +/* FIXME: test for HWND_TOP, etc...*/ +static int get_iwnd(HWND hWnd) +{ + if(hWnd == hWnd1) return 1; + else if(hWnd == hWnd2) return 2; + else return 0; +} + +LRESULT CALLBACK DWPTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + int iwnd = get_iwnd(hWnd); + + if(message > WM_USER || !iwnd || IsDWmMsg(message) || IseKeyMsg(message)) + return DefWindowProc(hWnd, message, wParam, lParam); + + switch(message) + { + case WM_IME_SETCONTEXT: + case WM_IME_NOTIFY : + case WM_GETICON : + case WM_GETTEXT: + break; + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS* pwp = (WINDOWPOS*)lParam; + ok(wParam==0,"expected wParam=0\n"); + record_message(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + break; + } + default: + record_message(iwnd, message, SENT, 0,0); + } + return DefWindowProc(hWnd, message, wParam, lParam); +} + +static void FlushMessages() +{ + MSG msg; + + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + int iwnd = get_iwnd(msg.hwnd); + if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + record_message(iwnd, msg.message, POST,0,0); + DispatchMessageA( &msg ); + } +} #define ok_windowpos(hwnd, x, y, w, h, wnd) do { RECT rt; GetWindowRect(hwnd, &rt); \ ok(rt.left == (x) && rt.top == (y) && rt.right == (x)+(w) && rt.bottom == (y)+(h), \ @@ -15,7 +68,7 @@ #define ok_lasterr(err, s) ok(GetLastError() == (err), "%s error = %lu\n", s, GetLastError()) -static void Test_DeferWindowPos(HWND hWnd, HWND hWnd2) +static void Test_DWP_Error(HWND hWnd, HWND hWnd2) { HDWP hDwp; BOOL ret; @@ -150,21 +203,116 @@ ok_lasterr(ERROR_SUCCESS, "EndDeferWindowPos"); ok_windowpos(hWnd, 50, 60, 230, 240, "Window 1"); ok_windowpos(hWnd2, 70, 80, 250, 260, "Window 2"); + + FlushMessages(); + empty_message_cache(); +} + +MSG_ENTRY move1_chain[]={ + {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE}, + {1,WM_GETMINMAXINFO}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOCLIENTSIZE}, + {1,WM_MOVE}, + {0,0}}; + +MSG_ENTRY resize1_chain[]={ + {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE}, + {1,WM_GETMINMAXINFO}, + {1,WM_NCCALCSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCLIENTMOVE}, + {1,WM_SIZE}, + {1,WM_NCCALCSIZE}, + {0,0}}; + +MSG_ENTRY move1_2_chain[]={ + {1,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE}, + {1,WM_GETMINMAXINFO}, + {2,WM_WINDOWPOSCHANGING, SENT, 0, SWP_NOACTIVATE}, + {2,WM_GETMINMAXINFO}, + {1,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCLIENTSIZE}, + {1,WM_MOVE}, + {2,WM_WINDOWPOSCHANGED, SENT, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOCLIENTSIZE}, + {2,WM_MOVE}, + {0,0}}; + +static void Test_DWP_SimpleMsg(HWND hWnd1, HWND hWnd2) +{ + HDWP hdwp; + BOOL ret; + + /* move hWnd1 */ + hdwp = BeginDeferWindowPos(1); + ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(empty_chain); + hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 20, 30, 100, 100, SWP_NOACTIVATE); + ok(hdwp != NULL, "DeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(empty_chain); + ret = EndDeferWindowPos(hdwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(move1_chain); + + /* resize hWnd1 */ + hdwp = BeginDeferWindowPos(1); + ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(empty_chain); + hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 20, 30, 110, 110, SWP_NOACTIVATE); + ok(hdwp != NULL, "DeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(empty_chain); + ret = EndDeferWindowPos(hdwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(resize1_chain); + + + /* move both windows */ + hdwp = BeginDeferWindowPos(1); + ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(empty_chain); + hdwp = DeferWindowPos(hdwp, hWnd1, HWND_TOP, 30, 40, 110, 110, SWP_NOACTIVATE); + ok(hdwp != NULL, "DeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(empty_chain); + hdwp = DeferWindowPos(hdwp, hWnd2, HWND_TOP, 30, 40, 100, 100, SWP_NOACTIVATE); + ok(hdwp != NULL, "DeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(empty_chain); + ret = EndDeferWindowPos(hdwp); + ok(ret != 0, "EndDeferWindowPos failed\n"); + FlushMessages(); + COMPARE_CACHE(move1_2_chain); } START_TEST(DeferWindowPos) { - HWND hWnd = CreateWindowExW(0, L"EDIT", L"abc", 0, 10, 20, - 200, 210, NULL, NULL, GetModuleHandle(NULL), NULL); - HWND hWnd2 = CreateWindowExW(0, L"EDIT", L"def", 0, 30, 40, - 220, 230, NULL, NULL, GetModuleHandle(NULL), NULL); - ok(hWnd != NULL, "CreateWindow failed\n"); + RegisterSimpleClass(DWPTestProc, L"ownertest"); + hWnd1 = CreateWindowExW(0, L"ownertest", L"abc", 0, 10, 20, + 200, 210, NULL, NULL, 0, NULL); + hWnd2 = CreateWindowExW(0, L"ownertest", L"def", 0, 30, 40, + 220, 230, NULL, NULL, 0, NULL); + ok(hWnd1 != NULL, "CreateWindow failed\n"); ok(hWnd2 != NULL, "CreateWindow failed\n"); - ok_windowpos(hWnd, 10, 20, 200, 210, "Window 1"); + ShowWindow(hWnd1, SW_SHOW); + ShowWindow(hWnd2, SW_SHOW); + ok_windowpos(hWnd1, 10, 20, 200, 210, "Window 1"); ok_windowpos(hWnd2, 30, 40, 220, 230, "Window 2"); - - Test_DeferWindowPos(hWnd, hWnd2); + FlushMessages(); + empty_message_cache(); + + Test_DWP_Error(hWnd1, hWnd2); + + SetWindowPos(hWnd1, 0, 10,20,100,100,0); + SetWindowPos(hWnd2, 0, 10,20,100,100,0); + FlushMessages(); + empty_message_cache(); + + Test_DWP_SimpleMsg(hWnd1, hWnd2); DestroyWindow(hWnd2); - DestroyWindow(hWnd); -} + DestroyWindow(hWnd1); + }

1 0

[rharabien] 54009: - Fix build
by rharabien＠svn.reactos.org 05 Oct '11

05 Oct '11

Author: rharabien Date: Wed Oct 5 14:17:21 2011 New Revision: 54009 URL: http://svn.reactos.org/svn/reactos?rev=54009&view=rev Log: - Fix build Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Wed Oct 5 14:17:21 2011 @@ -11,6 +11,8 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserTimer); +WORD FASTCALL UserGetMouseButtonsState(VOID); + /* GLOBALS *******************************************************************/ static LIST_ENTRY TimersListHead; @@ -322,7 +324,7 @@ { if (pDesk->htEx == HTCLIENT) // In a client area. { - wParam = get_key_state(); + wParam = UserGetMouseButtonsState(); Msg = WM_MOUSEHOVER; if (pWnd->ExStyle & WS_EX_LAYOUTRTL)

1 0

[cgutman] 54008: [NTOSKRNL] - Wait to reinitialize drivers until all drivers have loaded
by cgutman＠svn.reactos.org 05 Oct '11

05 Oct '11

Author: cgutman Date: Wed Oct 5 14:13:22 2011 New Revision: 54008 URL: http://svn.reactos.org/svn/reactos?rev=54008&view=rev Log: [NTOSKRNL] - Wait to reinitialize drivers until all drivers have loaded Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Wed Oct 5 14:13:22 2011 @@ -32,7 +32,6 @@ #define TAG_RTLREGISTRY 'vrqR' extern BOOLEAN ExpInTextModeSetup; -extern BOOLEAN PnpSystemInit; USHORT IopGroupIndex; PLIST_ENTRY IopGroupTable; @@ -516,8 +515,6 @@ /* Set the driver as initialized */ IopReadyDeviceObjects(Driver); - - if (PnpSystemInit) IopReinitializeDrivers(); return STATUS_SUCCESS; }

1 0

[rharabien] 54007: [I8042PRT] - Do not treat all extended keys as power keys in HandlePowerKeys. Fixes WM_KEYDOWN not being send right after extended key has been pressed. See issue #3212 for more ...
by rharabien＠svn.reactos.org 05 Oct '11

05 Oct '11

Author: rharabien Date: Wed Oct 5 14:13:00 2011 New Revision: 54007 URL: http://svn.reactos.org/svn/reactos?rev=54007&view=rev Log: [I8042PRT] - Do not treat all extended keys as power keys in HandlePowerKeys. Fixes WM_KEYDOWN not being send right after extended key has been pressed. See issue #3212 for more details. Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c [iso-8859-1] Wed Oct 5 14:13:00 2011 @@ -279,24 +279,24 @@ if (!(InputData->Flags & KEY_E0)) return FALSE; - if (InputData->Flags & KEY_BREAK) + switch (InputData->MakeCode) + { + case KEYBOARD_POWER_CODE: + KeyPress = SYS_BUTTON_POWER; + break; + case KEYBOARD_SLEEP_CODE: + KeyPress = SYS_BUTTON_SLEEP; + break; + case KEYBOARD_WAKE_CODE: + KeyPress = SYS_BUTTON_WAKE; + break; + default: + return FALSE; + } + + if (InputData->Flags & KEY_BREAK) /* We already took care of the key press */ return TRUE; - - switch (InputData->MakeCode) - { - case KEYBOARD_POWER_CODE: - KeyPress = SYS_BUTTON_POWER; - break; - case KEYBOARD_SLEEP_CODE: - KeyPress = SYS_BUTTON_SLEEP; - break; - case KEYBOARD_WAKE_CODE: - KeyPress = SYS_BUTTON_WAKE; - break; - default: - return FALSE; - } /* Our work can only be done at passive level, so use a workitem */ DeviceExtension->NewCaps |= KeyPress;

1 0

[rharabien] 54006: [WIN32K] - Rewrite keyboard input processing to match windows behavior - Deduplicate code, add comments, mark functions static - Support keyboard LEDs in SendInput API - Set last...
by rharabien＠svn.reactos.org 05 Oct '11

05 Oct '11

Author: rharabien Date: Wed Oct 5 14:09:51 2011 New Revision: 54006 URL: http://svn.reactos.org/svn/reactos?rev=54006&view=rev Log: [WIN32K] - Rewrite keyboard input processing to match windows behavior - Deduplicate code, add comments, mark functions static - Support keyboard LEDs in SendInput API - Set last error in more places - Make keyboard layouts compatible with Windows - Add some defines from keyboard layouts to kbd.h and use names from MS file - Move kbd.h from ntoskrnl to NDK as it has nothing to do with kernel - More fixes which I don't remember - Please test CAPSLOCK key with AltGr characters (RALT+X) for layouts which support it. If something fails, report it to me on IRC Added: trunk/reactos/include/ndk/kbd.h - copied, changed from r53930, trunk/reactos/ntoskrnl/include/internal/kbd.h Removed: trunk/reactos/ntoskrnl/include/internal/kbd.h Modified: trunk/reactos/dll/keyboard/kbda1/kbda1.c trunk/reactos/dll/keyboard/kbda2/kbda2.c trunk/reactos/dll/keyboard/kbda3/kbda3.c trunk/reactos/dll/keyboard/kbdal/kbdal.c trunk/reactos/dll/keyboard/kbdarme/kbdarme.c trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c trunk/reactos/dll/keyboard/kbdaze/kbdaze.c trunk/reactos/dll/keyboard/kbdazel/kbdazel.c trunk/reactos/dll/keyboard/kbdbe/kbdbe.c trunk/reactos/dll/keyboard/kbdbga/kbdbga.c trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c trunk/reactos/dll/keyboard/kbdblr/kbdblr.c trunk/reactos/dll/keyboard/kbdbr/kbdbr.c trunk/reactos/dll/keyboard/kbdbur/kbdbur.c trunk/reactos/dll/keyboard/kbdcan/kbdcan.c trunk/reactos/dll/keyboard/kbdcr/kbdcr.c trunk/reactos/dll/keyboard/kbdcz/kbdcz.c trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c trunk/reactos/dll/keyboard/kbdda/kbdda.c trunk/reactos/dll/keyboard/kbddv/kbddv.c trunk/reactos/dll/keyboard/kbdes/kbdes.c trunk/reactos/dll/keyboard/kbdest/kbdest.c trunk/reactos/dll/keyboard/kbdfc/kbdfc.c trunk/reactos/dll/keyboard/kbdfi/kbdfi.c trunk/reactos/dll/keyboard/kbdfr/kbdfr.c trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.c trunk/reactos/dll/keyboard/kbdgerg/kbdgerg.c trunk/reactos/dll/keyboard/kbdgneo/kbdgneo.c trunk/reactos/dll/keyboard/kbdgr/kbdgr.c trunk/reactos/dll/keyboard/kbdgrist/kbdgrist.c trunk/reactos/dll/keyboard/kbdhe/kbdhe.c trunk/reactos/dll/keyboard/kbdheb/kbdheb.c trunk/reactos/dll/keyboard/kbdhu/kbdhu.c trunk/reactos/dll/keyboard/kbdic/kbdic.c trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c trunk/reactos/dll/keyboard/kbdinben/kbdinben.c trunk/reactos/dll/keyboard/kbdindev/kbdindev.c trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c trunk/reactos/dll/keyboard/kbdir/kbdir.c trunk/reactos/dll/keyboard/kbdit/kbdit.c trunk/reactos/dll/keyboard/kbdja/kbdja.c trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.c trunk/reactos/dll/keyboard/kbdko/kbdko.c trunk/reactos/dll/keyboard/kbdla/kbdla.c trunk/reactos/dll/keyboard/kbdlt1/kbdlt1.c trunk/reactos/dll/keyboard/kbdlv/kbdlv.c trunk/reactos/dll/keyboard/kbdmac/kbdmac.c trunk/reactos/dll/keyboard/kbdne/kbdne.c trunk/reactos/dll/keyboard/kbdno/kbdno.c trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.c trunk/reactos/dll/keyboard/kbdpo/kbdpo.c trunk/reactos/dll/keyboard/kbdro/kbdro.c trunk/reactos/dll/keyboard/kbdru/kbdru.c trunk/reactos/dll/keyboard/kbdru1/kbdru1.c trunk/reactos/dll/keyboard/kbdsg/kbdsg.c trunk/reactos/dll/keyboard/kbdsk/kbdsk.c trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c trunk/reactos/dll/keyboard/kbdsw/kbdsw.c trunk/reactos/dll/keyboard/kbdtat/kbdtat.c trunk/reactos/dll/keyboard/kbdth0/kbdth0.c trunk/reactos/dll/keyboard/kbdth1/kbdth1.c trunk/reactos/dll/keyboard/kbdth2/kbdth2.c trunk/reactos/dll/keyboard/kbdth3/kbdth3.c trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c trunk/reactos/dll/keyboard/kbduk/kbduk.c trunk/reactos/dll/keyboard/kbdur/kbdur.c trunk/reactos/dll/keyboard/kbdurs/kbdurs.c trunk/reactos/dll/keyboard/kbdus/kbdus.c trunk/reactos/dll/keyboard/kbdusa/kbdusa.c trunk/reactos/dll/keyboard/kbdusl/kbdusl.c trunk/reactos/dll/keyboard/kbdusr/kbdusr.c trunk/reactos/dll/keyboard/kbdusx/kbdusx.c trunk/reactos/dll/keyboard/kbduzb/kbduzb.c trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c trunk/reactos/dll/keyboard/kbdycc/kbdycc.c trunk/reactos/dll/keyboard/kbdycl/kbdycl.c trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/keyboard/kbda1/kbda1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda1/kbda1.c… Modified: trunk/reactos/dll/keyboard/kbda2/kbda2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda2/kbda2.c… Modified: trunk/reactos/dll/keyboard/kbda3/kbda3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbda3/kbda3.c… Modified: trunk/reactos/dll/keyboard/kbdal/kbdal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdal/kbdal.c… Modified: trunk/reactos/dll/keyboard/kbdarme/kbdarme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarme/kbdar… Modified: trunk/reactos/dll/keyboard/kbdarmw/kbdarmw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdarmw/kbdar… Modified: trunk/reactos/dll/keyboard/kbdaze/kbdaze.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdaze/kbdaze… Modified: trunk/reactos/dll/keyboard/kbdazel/kbdazel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdazel/kbdaz… Modified: trunk/reactos/dll/keyboard/kbdbe/kbdbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbe/kbdbe.c… Modified: trunk/reactos/dll/keyboard/kbdbga/kbdbga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbga/kbdbga… Modified: trunk/reactos/dll/keyboard/kbdbgm/kbdbgm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgm/kbdbgm… Modified: trunk/reactos/dll/keyboard/kbdbgt/kbdbgt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbgt/kbdbgt… Modified: trunk/reactos/dll/keyboard/kbdblr/kbdblr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdblr/kbdblr… Modified: trunk/reactos/dll/keyboard/kbdbr/kbdbr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbr/kbdbr.c… Modified: trunk/reactos/dll/keyboard/kbdbur/kbdbur.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdbur/kbdbur… Modified: trunk/reactos/dll/keyboard/kbdcan/kbdcan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcan/kbdcan… Modified: trunk/reactos/dll/keyboard/kbdcr/kbdcr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcr/kbdcr.c… Modified: trunk/reactos/dll/keyboard/kbdcz/kbdcz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz/kbdcz.c… Modified: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1… Modified: trunk/reactos/dll/keyboard/kbdda/kbdda.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdda/kbdda.c… Modified: trunk/reactos/dll/keyboard/kbddv/kbddv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbddv/kbddv.c… Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/kbdes.c… Modified: trunk/reactos/dll/keyboard/kbdest/kbdest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdest/kbdest… Modified: trunk/reactos/dll/keyboard/kbdfc/kbdfc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfc/kbdfc.c… Modified: trunk/reactos/dll/keyboard/kbdfi/kbdfi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfi/kbdfi.c… Modified: trunk/reactos/dll/keyboard/kbdfr/kbdfr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdfr/kbdfr.c… Modified: trunk/reactos/dll/keyboard/kbdgeo/kbdgeo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgeo/kbdgeo… Modified: trunk/reactos/dll/keyboard/kbdgerg/kbdgerg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgerg/kbdge… Modified: trunk/reactos/dll/keyboard/kbdgneo/kbdgneo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgneo/kbdgn… Modified: trunk/reactos/dll/keyboard/kbdgr/kbdgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgr/kbdgr.c… Modified: trunk/reactos/dll/keyboard/kbdgrist/kbdgrist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdgrist/kbdg… Modified: trunk/reactos/dll/keyboard/kbdhe/kbdhe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhe/kbdhe.c… Modified: trunk/reactos/dll/keyboard/kbdheb/kbdheb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdheb/kbdheb… Modified: trunk/reactos/dll/keyboard/kbdhu/kbdhu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdhu/kbdhu.c… Modified: trunk/reactos/dll/keyboard/kbdic/kbdic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdic/kbdic.c… Modified: trunk/reactos/dll/keyboard/kbdinasa/kbdinasa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinasa/kbdi… Modified: trunk/reactos/dll/keyboard/kbdinben/kbdinben.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinben/kbdi… Modified: trunk/reactos/dll/keyboard/kbdindev/kbdindev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdindev/kbdi… Modified: trunk/reactos/dll/keyboard/kbdinguj/kbdinguj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinguj/kbdi… Modified: trunk/reactos/dll/keyboard/kbdinmal/kbdinmal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdinmal/kbdi… Modified: trunk/reactos/dll/keyboard/kbdir/kbdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdir/kbdir.c… Modified: trunk/reactos/dll/keyboard/kbdit/kbdit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdit/kbdit.c… Modified: trunk/reactos/dll/keyboard/kbdja/kbdja.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdja/kbdja.c… Modified: trunk/reactos/dll/keyboard/kbdkaz/kbdkaz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdkaz/kbdkaz… Modified: trunk/reactos/dll/keyboard/kbdko/kbdko.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdko/kbdko.c… Modified: trunk/reactos/dll/keyboard/kbdla/kbdla.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdla/kbdla.c… Modified: trunk/reactos/dll/keyboard/kbdlt1/kbdlt1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlt1/kbdlt1… Modified: trunk/reactos/dll/keyboard/kbdlv/kbdlv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlv/kbdlv.c… Modified: trunk/reactos/dll/keyboard/kbdmac/kbdmac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdmac/kbdmac… Modified: trunk/reactos/dll/keyboard/kbdne/kbdne.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdne/kbdne.c… Modified: trunk/reactos/dll/keyboard/kbdno/kbdno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.c… Modified: trunk/reactos/dll/keyboard/kbdpl1/kbdpl1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpl1/kbdpl1… Modified: trunk/reactos/dll/keyboard/kbdpo/kbdpo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdpo/kbdpo.c… Modified: trunk/reactos/dll/keyboard/kbdro/kbdro.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdro/kbdro.c… Modified: trunk/reactos/dll/keyboard/kbdru/kbdru.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru/kbdru.c… Modified: trunk/reactos/dll/keyboard/kbdru1/kbdru1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdru1/kbdru1… Modified: trunk/reactos/dll/keyboard/kbdsg/kbdsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsg/kbdsg.c… Modified: trunk/reactos/dll/keyboard/kbdsk/kbdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk/kbdsk.c… Modified: trunk/reactos/dll/keyboard/kbdsk1/kbdsk1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsk1/kbdsk1… Modified: trunk/reactos/dll/keyboard/kbdsw/kbdsw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdsw/kbdsw.c… Modified: trunk/reactos/dll/keyboard/kbdtat/kbdtat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtat/kbdtat… Modified: trunk/reactos/dll/keyboard/kbdth0/kbdth0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth0/kbdth0… Modified: trunk/reactos/dll/keyboard/kbdth1/kbdth1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth1/kbdth1… Modified: trunk/reactos/dll/keyboard/kbdth2/kbdth2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth2/kbdth2… Modified: trunk/reactos/dll/keyboard/kbdth3/kbdth3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdth3/kbdth3… Modified: trunk/reactos/dll/keyboard/kbdtuf/kbdtuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuf/kbdtuf… Modified: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuq/kbdtuq… Modified: trunk/reactos/dll/keyboard/kbduk/kbduk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduk/kbduk.c… Modified: trunk/reactos/dll/keyboard/kbdur/kbdur.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdur/kbdur.c… Modified: trunk/reactos/dll/keyboard/kbdurs/kbdurs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdurs/kbdurs… Modified: trunk/reactos/dll/keyboard/kbdus/kbdus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdus/kbdus.c… Modified: trunk/reactos/dll/keyboard/kbdusa/kbdusa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusa/kbdusa… Modified: trunk/reactos/dll/keyboard/kbdusl/kbdusl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusl/kbdusl… Modified: trunk/reactos/dll/keyboard/kbdusr/kbdusr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusr/kbdusr… Modified: trunk/reactos/dll/keyboard/kbdusx/kbdusx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdusx/kbdusx… Modified: trunk/reactos/dll/keyboard/kbduzb/kbduzb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbduzb/kbduzb… Modified: trunk/reactos/dll/keyboard/kbdvntc/kbdvntc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdvntc/kbdvn… Modified: trunk/reactos/dll/keyboard/kbdycc/kbdycc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycc/kbdycc… Modified: trunk/reactos/dll/keyboard/kbdycl/kbdycl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdycl/kbdycl… Copied: trunk/reactos/include/ndk/kbd.h (from r53930, trunk/reactos/ntoskrnl/include/internal/kbd.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kbd.h?p2=trunk… Removed: trunk/reactos/ntoskrnl/include/internal/kbd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…

1 0

[tkreuzer] 54005: [FREELDR] Fix a bug, spotted by Brian Palmer
by tkreuzer＠svn.reactos.org 05 Oct '11

05 Oct '11

Author: tkreuzer Date: Wed Oct 5 13:41:50 2011 New Revision: 54005 URL: http://svn.reactos.org/svn/reactos?rev=54005&view=rev Log: [FREELDR] Fix a bug, spotted by Brian Palmer Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Wed Oct 5 13:41:50 2011 @@ -340,7 +340,6 @@ 1024 * 1024 / PAGE_SIZE, ExtendedMemorySizeAtOneMB * 1024 / PAGE_SIZE, LoaderFree); - EntryCount++; if (ExtendedMemorySizeAtSixteenMB != 0) {

1 0

[tfaber] 54004: [GDI32_WINETEST][KERNEL32_WINETEST] - Fix MSVC build. Sent and applied upstream.
by tfaber＠svn.reactos.org 05 Oct '11

05 Oct '11

Author: tfaber Date: Wed Oct 5 09:35:25 2011 New Revision: 54004 URL: http://svn.reactos.org/svn/reactos?rev=54004&view=rev Log: [GDI32_WINETEST][KERNEL32_WINETEST] - Fix MSVC build. Sent and applied upstream. Modified: trunk/rostests/winetests/gdi32/bitmap.c trunk/rostests/winetests/gdi32/icm.c trunk/rostests/winetests/kernel32/console.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/pipe.c Modified: trunk/rostests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?… ============================================================================== --- trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] Wed Oct 5 09:35:25 2011 @@ -816,8 +816,7 @@ static void test_dib_formats(void) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256])]; - BITMAPINFO *bi = (BITMAPINFO *)buffer; + BITMAPINFO *bi; char data[256]; void *bits; //int planes, bpp, compr; @@ -826,6 +825,7 @@ UINT ret; //BOOL expect_ok, todo; + bi = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); hdc = GetDC( 0 ); memdc = CreateCompatibleDC( 0 ); hbmp = CreateCompatibleBitmap( hdc, 10, 10 ); @@ -1125,6 +1125,7 @@ DeleteDC( memdc ); DeleteObject( hbmp ); ReleaseDC( 0, hdc ); + HeapFree( GetProcessHeap(), 0, bi ); } static void test_mono_dibsection(void) @@ -1450,10 +1451,8 @@ static void test_GetDIBits_selected_DIB(UINT bpp) { HBITMAP dib; - char bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - char bmibuf2[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)bmibuf; - BITMAPINFO *info2 = (BITMAPINFO *)bmibuf2; + BITMAPINFO *info; + BITMAPINFO *info2; void * bits; void * bits2; UINT dib_size, dib32_size; @@ -1462,6 +1461,9 @@ HBITMAP old_bmp; UINT i; int res; + + info = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); + info2 = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); /* Create a DIB section with a color table */ @@ -1551,15 +1553,15 @@ SelectObject(dib_dc, old_bmp); DeleteDC(dib_dc); DeleteObject(dib); + HeapFree(GetProcessHeap(), 0, info2); + HeapFree(GetProcessHeap(), 0, info); } static void test_GetDIBits_selected_DDB(BOOL monochrome) { HBITMAP ddb; - char bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - char bmibuf2[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; - BITMAPINFO *info = (BITMAPINFO *)bmibuf; - BITMAPINFO *info2 = (BITMAPINFO *)bmibuf2; + BITMAPINFO *info; + BITMAPINFO *info2; void * bits; void * bits2; HDC ddb_dc, dc; @@ -1568,6 +1570,9 @@ UINT bpp; UINT i, j; int res; + + info = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); + info2 = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); width = height = 16; @@ -1661,6 +1666,8 @@ SelectObject(ddb_dc, old_bmp); DeleteDC(ddb_dc); DeleteObject(ddb); + HeapFree(GetProcessHeap(), 0, info2); + HeapFree(GetProcessHeap(), 0, info); } static void test_GetDIBits(void) @@ -3539,15 +3546,14 @@ static void test_GetDIBits_scanlines(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); HBITMAP dib; DWORD data[128], inverted_bits[64]; int i, ret; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -3852,20 +3858,20 @@ DeleteObject( dib ); ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBits(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); DWORD data[128], inverted_data[128]; HBITMAP dib; int i, ret; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4028,12 +4034,12 @@ DeleteObject( dib ); ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBits_RLE4(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); BYTE rle4_data[26] = { 0x03, 0x52, 0x07, 0x68, 0x00, 0x00, /* 5, 2, 5, 6, 8, 6, 8, 6, (8, 6,) <eol> */ @@ -4052,7 +4058,7 @@ 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa }; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4083,12 +4089,12 @@ DeleteObject( dib ); ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBits_RLE8(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = GetDC( NULL ); BYTE rle8_data[20] = { 0x03, 0x02, 0x04, 0xf0, 0x00, 0x00, /* 2, 2, 2, f0, f0, f0, f0, <eol> */ @@ -4114,7 +4120,7 @@ 0x00040404, 0x00050505, 0x00060606, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0x00020202, 0x00020202, 0x00020202, 0x00f0f0f0, 0x00f0f0f0, 0x00f0f0f0, 0x00f0f0f0, 0xaaaaaaaa }; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4232,21 +4238,20 @@ memset( dib_bits, 0xaa, 64 * 4 ); DeleteObject( dib ); - ReleaseDC( NULL, hdc ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBitsToDevice(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = CreateCompatibleDC( 0 ); DWORD data[128], inverted_data[128]; HBITMAP dib; int i, ret; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4599,12 +4604,12 @@ DeleteDC( hdc ); DeleteObject( dib ); + HeapFree( GetProcessHeap(), 0, info ); } static void test_SetDIBitsToDevice_RLE8(void) { - char bmi_buf[ FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ]; - BITMAPINFO *info = (BITMAPINFO *)bmi_buf; + BITMAPINFO *info; DWORD *dib_bits; HDC hdc = CreateCompatibleDC( 0 ); BYTE rle8_data[20] = { 0x04, 0x02, 0x03, 0xf0, 0x00, 0x00, /* 2, 2, 2, 2, f0, f0, f0, <eol> */ @@ -4630,7 +4635,7 @@ 0x00040404, 0x00050505, 0x00060606, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0xaaaaaaaa, 0x00020202, 0x00020202, 0x00020202, 0x00020202, 0x00f0f0f0, 0x00f0f0f0, 0x00f0f0f0, 0xaaaaaaaa }; - memset( info, 0, sizeof(bmi_buf) ); + info = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 8; @@ -4820,6 +4825,7 @@ DeleteDC( hdc ); DeleteObject( dib ); + HeapFree( GetProcessHeap(), 0, info ); } START_TEST(bitmap) Modified: trunk/rostests/winetests/gdi32/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/icm.c?rev… ============================================================================== --- trunk/rostests/winetests/gdi32/icm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/icm.c [iso-8859-1] Wed Oct 5 09:35:25 2011 @@ -170,7 +170,7 @@ DeleteDC( dc ); } -static CALLBACK INT enum_profiles_callbackA( LPSTR filename, LPARAM lparam ) +static INT CALLBACK enum_profiles_callbackA( LPSTR filename, LPARAM lparam ) { trace("%s\n", filename); return 1; @@ -191,7 +191,7 @@ ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); } -static CALLBACK INT enum_profiles_callbackW( LPWSTR filename, LPARAM lparam ) +static INT CALLBACK enum_profiles_callbackW( LPWSTR filename, LPARAM lparam ) { return 1; } Modified: trunk/rostests/winetests/kernel32/console.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/consol… ============================================================================== --- trunk/rostests/winetests/kernel32/console.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/console.c [iso-8859-1] Wed Oct 5 09:35:25 2011 @@ -1759,27 +1759,27 @@ int win7_crash; } invalid_table[] = { - {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, output, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, output, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, output, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, output, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, output, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, output, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, output, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, output, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, output, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, output, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, output, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, output, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, output, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, output, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, output, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, output, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, output, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, output, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, output, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, output, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, }; for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) @@ -1843,27 +1843,27 @@ int win7_crash; } invalid_table[] = { - {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, outputW, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, outputW, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, outputW, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, outputW, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, outputW, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, outputW, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, outputW, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, outputW, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, outputW, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, outputW, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, outputW, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, outputW, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, outputW, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, outputW, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, outputW, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, outputW, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, outputW, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, outputW, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, outputW, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, outputW, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, }; for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) @@ -1926,27 +1926,27 @@ int win7_crash; } invalid_table[] = { - {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, &attr, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, &attr, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, &attr, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, &attr, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &attr, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &attr, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, &attr, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &attr, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &attr, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &attr, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, &attr, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &attr, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, &attr, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, &attr, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, }; for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) @@ -2008,16 +2008,16 @@ int win7_crash; } invalid_table[] = { - {NULL, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, 'a', 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, 'a', 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, 'a', 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, 'a', 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {output_handle, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, 'a', 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, 'a', 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, 'a', 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, 'a', 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, 'a', 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, 'a', 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, 'a', 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, 'a', 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, 'a', 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, 'a', 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, }; for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) @@ -2074,16 +2074,16 @@ int win7_crash; } invalid_table[] = { - {NULL, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, 'a', 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, 'a', 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, 'a', 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, 'a', 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {output_handle, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, 'a', 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, 'a', 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, 'a', 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, 'a', 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, 'a', 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, 'a', 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, 'a', 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, 'a', 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, 'a', 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, 'a', 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, }; for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) @@ -2140,16 +2140,16 @@ int win7_crash; } invalid_table[] = { - {NULL, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, FOREGROUND_BLUE, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, FOREGROUND_BLUE, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {output_handle, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, FOREGROUND_BLUE, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, FOREGROUND_BLUE, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, FOREGROUND_BLUE, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, FOREGROUND_BLUE, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, FOREGROUND_BLUE, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, FOREGROUND_BLUE, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, }; for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) @@ -2212,28 +2212,28 @@ int win7_crash; } invalid_table[] = { - {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1}, - {NULL, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, &read, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, &read, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1}, - {INVALID_HANDLE_VALUE, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, &read, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, &read, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, &count, 1, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 10, origin, &count, 10, ERROR_INVALID_ACCESS, 1}, - {output_handle, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1}, + {NULL, &read, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &read, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, &read, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &read, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1}, + {INVALID_HANDLE_VALUE, &read, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &read, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, &read, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &read, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, &count, 1, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 10, {0, 0}, &count, 10, ERROR_INVALID_ACCESS, 1}, + {output_handle, &read, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, &read, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, }; for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) @@ -2296,28 +2296,28 @@ int win7_crash; } invalid_table[] = { - {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1}, - {NULL, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, &read, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, &read, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1}, - {INVALID_HANDLE_VALUE, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, &read, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, &read, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, &count, 1, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 10, origin, &count, 10, ERROR_INVALID_ACCESS, 1}, - {output_handle, &read, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, &read, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1}, + {NULL, &read, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &read, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, &read, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &read, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1}, + {INVALID_HANDLE_VALUE, &read, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &read, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, &read, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &read, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, &count, 1, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 10, {0, 0}, &count, 10, ERROR_INVALID_ACCESS, 1}, + {output_handle, &read, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, &read, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, }; for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) @@ -2380,27 +2380,27 @@ int win7_crash; } invalid_table[] = { - {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1}, - {NULL, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, &attr, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {NULL, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {NULL, &attr, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0, ERROR_INVALID_HANDLE, 1}, - {INVALID_HANDLE_VALUE, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, &attr, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, - {INVALID_HANDLE_VALUE, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {INVALID_HANDLE_VALUE, &attr, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, - {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, NULL, 1, origin, &count, 1, ERROR_INVALID_ACCESS, 1}, - {output_handle, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, - {output_handle, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1}, + {NULL, &attr, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &attr, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, &attr, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &attr, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE, 1}, + {INVALID_HANDLE_VALUE, &attr, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &attr, 0, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, &attr, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &attr, 1, {0, 0}, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, NULL, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, {0, 0}, &count, 1, ERROR_INVALID_ACCESS, 1}, + {output_handle, &attr, 0, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, &attr, 1, {0, 0}, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, }; for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… ============================================================================== --- trunk/rostests/winetests/kernel32/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/file.c [iso-8859-1] Wed Oct 5 09:35:25 2011 @@ -38,7 +38,7 @@ static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID); static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT); static BOOL (WINAPI *pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); -static DWORD WINAPI (*pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); +static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… ============================================================================== --- trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/pipe.c [iso-8859-1] Wed Oct 5 09:35:25 2011 @@ -37,7 +37,7 @@ static HANDLE alarm_event; static BOOL (WINAPI *pDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); -static DWORD WINAPI (*pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); +static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param)

1 0

[tfaber] 54003: [KERNEL32_WINETEST] - Restore a ros-diff lost during wine sync. Should fix kernel32:volume crash - Better mark ros diffs in testlist.c and also bring it somewhat into sync
by tfaber＠svn.reactos.org 05 Oct '11

05 Oct '11

Author: tfaber Date: Wed Oct 5 09:29:32 2011 New Revision: 54003 URL: http://svn.reactos.org/svn/reactos?rev=54003&view=rev Log: [KERNEL32_WINETEST] - Restore a ros-diff lost during wine sync. Should fix kernel32:volume crash - Better mark ros diffs in testlist.c and also bring it somewhat into sync Modified: trunk/rostests/winetests/kernel32/testlist.c trunk/rostests/winetests/kernel32/volume.c Modified: trunk/rostests/winetests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/testli… ============================================================================== --- trunk/rostests/winetests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/testlist.c [iso-8859-1] Wed Oct 5 09:29:32 2011 @@ -1,14 +1,10 @@ /* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> #define STANDALONE #include "wine/test.h" - -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include "windef.h" -#include "winbase.h" -#include <windows.h> extern void func_actctx(void); extern void func_alloc(void); @@ -17,18 +13,19 @@ extern void func_codepage(void); extern void func_comm(void); extern void func_console(void); +extern void func_debugger(void); extern void func_directory(void); extern void func_drive(void); extern void func_environ(void); extern void func_fiber(void); extern void func_file(void); extern void func_format_msg(void); +extern void func_generated(void); extern void func_heap(void); -extern void func_interlck(void); +extern void func_loader(void); extern void func_locale(void); -extern void func_loader(void); +extern void func_mailslot(void); extern void func_module(void); -extern void func_mailslot(void); extern void func_path(void); extern void func_pipe(void); extern void func_process(void); @@ -39,10 +36,12 @@ extern void func_time(void); extern void func_timer(void); extern void func_toolhelp(void); +extern void func_version(void); extern void func_virtual(void); -extern void func_version(void); extern void func_volume(void); +/* ReactOS */ extern void func_dosdev(void); +extern void func_interlck(void); const struct test winetest_testlist[] = { @@ -53,19 +52,21 @@ { "codepage", func_codepage }, { "comm", func_comm }, { "console", func_console }, - //{ "debbuger", func_debbuger }, + /* ReactOS */ + //{ "debugger", func_debugger }, { "directory", func_directory }, { "drive", func_drive }, { "environ", func_environ }, - { "fiber", func_fiber }, + { "fiber", func_fiber }, { "file", func_file }, { "format_msg", func_format_msg }, + /* ReactOS */ + //{ "generated", func_generated }, { "heap", func_heap }, - { "interlck", func_interlck }, { "loader", func_loader }, { "locale", func_locale }, + { "mailslot", func_mailslot }, { "module", func_module }, - { "mailslot", func_mailslot }, { "path", func_path }, { "pipe", func_pipe }, { "process", func_process }, @@ -76,11 +77,11 @@ { "time", func_time }, { "timer", func_timer }, { "toolhelp", func_toolhelp }, + { "version", func_version }, { "virtual", func_virtual }, - { "version", func_version }, { "volume", func_volume }, + /* ReactOS */ { "dosdev", func_dosdev }, + { "interlck", func_interlck }, { 0, 0 } }; - - Modified: trunk/rostests/winetests/kernel32/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/volume… ============================================================================== --- trunk/rostests/winetests/kernel32/volume.c [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/volume.c [iso-8859-1] Wed Oct 5 09:29:32 2011 @@ -519,7 +519,8 @@ hFind = pFindFirstVolumeA( Volume_2, MAX_PATH ); ok(hFind != INVALID_HANDLE_VALUE, "FindFirstVolume failed, err=%u\n", GetLastError()); - + /* ReactOS */ + if (hFind != INVALID_HANDLE_VALUE) { do { /* validate correct length of unique volume name */ @@ -532,6 +533,7 @@ } while (pFindNextVolumeA( hFind, Volume_2, MAX_PATH )); ok(found, "volume name %s not found by Find[First/Next]Volume\n", Volume_1); pFindVolumeClose( hFind ); + } } static void test_disk_extents(void)

1 0

[osiejka] 54002: [TRANSLATION] - rasdlg romanian translation, patch by Stefan Fulea; See issue #6499 for more details.
by osiejka＠svn.reactos.org 05 Oct '11

05 Oct '11

Author: osiejka Date: Wed Oct 5 08:54:51 2011 New Revision: 54002 URL: http://svn.reactos.org/svn/reactos?rev=54002&view=rev Log: [TRANSLATION] - rasdlg romanian translation, patch by Stefan Fulea; See issue #6499 for more details. Added: trunk/reactos/dll/win32/rasdlg/lang/ro-RO.rc (with props) Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/rasdlg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/ro-R… Modified: trunk/reactos/dll/win32/rasdlg/rasdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/rasdlg.rc…

1 0

[tkreuzer] 54001: Merge commit 'bac0f132bfc6b05187701ded5273b9819d8585bb'
by tkreuzer＠svn.reactos.org 05 Oct '11

05 Oct '11

Author: tkreuzer Date: Wed Oct 5 08:44:13 2011 New Revision: 54001 URL: http://svn.reactos.org/svn/reactos?rev=54001&view=rev Log: Merge commit 'bac0f132bfc6b05187701ded5273b9819d8585bb' Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] Wed Oct 5 08:44:13 2011 @@ -28,22 +28,17 @@ PVOID FrLdrDefaultHeap; PVOID FrLdrTempHeap; -typedef struct _BLOCK_HEADER +typedef struct _BLOCK_DATA +{ + ULONG Flink; + ULONG Blink; +} BLOCK_DATA, *PBLOCK_DATA; + +typedef struct _HEAP_BLOCK { USHORT Size; USHORT PreviousSize; ULONG Tag; -} BLOCK_HEADER, *PBLOCK_HEADER; - -typedef struct _BLOCK_DATA -{ - ULONG Flink; - ULONG Blink; -} BLOCK_DATA, *PBLOCK_DATA; - -typedef struct _HEAP_BLOCK -{ - BLOCK_HEADER; BLOCK_DATA Data[]; } HEAP_BLOCK, *PHEAP_BLOCK; @@ -369,7 +364,6 @@ { PHEAP Heap = HeapHandle; PHEAP_BLOCK Block, PrevBlock, NextBlock; - USHORT PreviousSize = 0; ULONGLONG Time = __rdtsc(); TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer); ASSERT(Tag != 'dnE#');

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