Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 43091: See? This is the reason for Beta Versions. - Fixed the "GCC not found" bug in AMD64 Build Processes. - Fixed something cosmetical in the look on startup of rosbe.
by dreimer＠svn.reactos.org 20 Sep '09

20 Sep '09

Author: dreimer Date: Sun Sep 20 03:10:23 2009 New Revision: 43091 URL: http://svn.reactos.org/svn/reactos?rev=43091&view=rev Log: See? This is the reason for Beta Versions. - Fixed the "GCC not found" bug in AMD64 Build Processes. - Fixed something cosmetical in the look on startup of rosbe. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Sun Sep 20 03:10:23 2009 @@ -20,7 +20,7 @@ $global:_ROSBE_PREFIX = $null } -$ENV:PATH = "$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" +$ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" $TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc" & $TARGETGCC -v 2> gcctvers.tmp $global:_ROSBE_TARGET_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1' Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sun Sep 20 03:10:23 2009 @@ -87,7 +87,7 @@ cls echo ******************************************************************************* echo * * -echo * ReactOS Build Environment %_ROSBE_VERSION% * +echo * ReactOS Build Environment %_ROSBE_VERSION% * echo * * echo ******************************************************************************* echo. Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sun Sep 20 03:10:23 2009 @@ -27,7 +27,7 @@ set _ROSBE_PREFIX=%ROS_PREFIX%- ) -set PATH=%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% +set PATH=%_ROSBE_HOST_MINGWPATH%\bin;%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% for /f "usebackq tokens=3" %%i in (`"%_ROSBE_PREFIX%gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_TARGET_GCCVERSION=%%i for /f "usebackq tokens=2" %%i in (`"%_ROSBE_PREFIX%gcc -v 2>&1 | find "Target""`) do set _ROSBE_TARGET_GCCTARGET=%%i

1 0

[jimtabor] 43090: - Update Edit wine tests.
by jimtabor＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: jimtabor Date: Sun Sep 20 01:37:32 2009 New Revision: 43090 URL: http://svn.reactos.org/svn/reactos?rev=43090&view=rev Log: - Update Edit wine tests. Modified: trunk/rostests/winetests/user32/edit.c Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… ============================================================================== --- trunk/rostests/winetests/user32/edit.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/edit.c [iso-8859-1] Sun Sep 20 01:37:32 2009 @@ -28,6 +28,7 @@ #define ES_COMBO 0x200 #endif +#define ID_EDITTESTDBUTTON 0x123 #define ID_EDITTEST2 99 #define MAXLEN 200 @@ -1817,9 +1818,9 @@ /* more tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); @@ -1841,9 +1842,9 @@ /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); ok(444 == r, "Expected %d, got %d\n", 444, r); @@ -1891,7 +1892,7 @@ /* tests for WM_KEYDOWN + WM_CHAR */ r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 6); - todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 7); ok(444 == r, "Expected %d, got %d\n", 444, r); r = DialogBoxParam(hinst, "EDIT_WANTRETURN_DIALOG", NULL, (DLGPROC)edit_wantreturn_dialog_proc, 8); @@ -2079,6 +2080,184 @@ DestroyWindow (hwEdit); DeleteObject(hfont); +} + +struct dialog_mode_messages +{ + int wm_getdefid, wm_close, wm_command, wm_nextdlgctl; +}; + +static struct dialog_mode_messages dm_messages; + +static void zero_dm_messages(void) +{ + dm_messages.wm_command = 0; + dm_messages.wm_close = 0; + dm_messages.wm_getdefid = 0; + dm_messages.wm_nextdlgctl = 0; +} + +#define test_dm_messages(wmcommand, wmclose, wmgetdefid, wmnextdlgctl) \ + ok(dm_messages.wm_command == wmcommand, "expected %d WM_COMMAND messages, " \ + "got %d\n", wmcommand, dm_messages.wm_command); \ + ok(dm_messages.wm_close == wmclose, "expected %d WM_CLOSE messages, " \ + "got %d\n", wmclose, dm_messages.wm_close); \ + ok(dm_messages.wm_getdefid == wmgetdefid, "expected %d WM_GETDIFID messages, " \ + "got %d\n", wmgetdefid, dm_messages.wm_getdefid);\ + ok(dm_messages.wm_nextdlgctl == wmnextdlgctl, "expected %d WM_NEXTDLGCTL messages, " \ + "got %d\n", wmnextdlgctl, dm_messages.wm_nextdlgctl) + +static LRESULT CALLBACK dialog_mode_wnd_proc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) +{ + switch (iMsg) + { + case WM_COMMAND: + dm_messages.wm_command++; + break; + case DM_GETDEFID: + dm_messages.wm_getdefid++; + return MAKELONG(ID_EDITTESTDBUTTON, DC_HASDEFID); + case WM_NEXTDLGCTL: + dm_messages.wm_nextdlgctl++; + break; + case WM_CLOSE: + dm_messages.wm_close++; + break; + } + + return DefWindowProc(hwnd, iMsg, wParam, lParam); +} + +static void test_dialogmode(void) +{ + HWND hwEdit, hwParent, hwButton; + MSG msg= {0}; + int len, r; + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + r = SendMessage(hwEdit, WM_GETDLGCODE, (WPARAM)NULL, (LPARAM)NULL); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessage(hwEdit, WM_GETDLGCODE, (WPARAM)NULL, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(13 == len, "expected 13, got %d\n", len); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_editcontrol(ES_MULTILINE, 0); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_BACK; + msg.lParam = 0xe0001; + r = SendMessage(hwEdit, WM_GETDLGCODE, VK_BACK, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + + r = SendMessage(hwEdit, WM_CHAR, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + len = SendMessage(hwEdit, WM_GETTEXTLENGTH, 0, 0); + ok(11 == len, "expected 11, got %d\n", len); + + DestroyWindow(hwEdit); + + hwEdit = create_child_editcontrol(0, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtr(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + zero_dm_messages(); + r = SendMessage(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_TAB; + msg.lParam = 0xf0001; + r = SendMessage(hwEdit, WM_GETDLGCODE, VK_TAB, (LPARAM)&msg); + ok(0x89 == r, "expected 0x89, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + destroy_child_editcontrol(hwEdit); + + hwEdit = create_child_editcontrol(ES_MULTILINE, 0); + hwParent = GetParent(hwEdit); + SetWindowLongPtr(hwParent, GWLP_WNDPROC, (LONG_PTR)dialog_mode_wnd_proc); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + msg.hwnd = hwEdit; + msg.message = WM_KEYDOWN; + msg.wParam = VK_ESCAPE; + msg.lParam = 0x10001; + r = SendMessage(hwEdit, WM_GETDLGCODE, VK_ESCAPE, (LPARAM)&msg); + ok(0x8d == r, "expected 0x8d, got 0x%x\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 0); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_TAB, 0xf0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 0, 1); + zero_dm_messages(); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 0); + zero_dm_messages(); + + hwButton = CreateWindow("BUTTON", "OK", WS_VISIBLE|WS_CHILD|BS_PUSHBUTTON, + 100, 100, 50, 20, hwParent, (HMENU)ID_EDITTESTDBUTTON, hinst, NULL); + ok(hwButton!=NULL, "CreateWindow failed with error code %d\n", GetLastError()); + + r = SendMessage(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + ok(1 == r, "expected 1, got %d\n", r); + test_dm_messages(0, 0, 1, 1); + zero_dm_messages(); + + DestroyWindow(hwButton); + destroy_child_editcontrol(hwEdit); } START_TEST(edit) @@ -2105,6 +2284,7 @@ test_singleline_wantreturn_edit_dialog(); test_child_edit_wmkeydown(); test_fontsize(); + test_dialogmode(); UnregisterWindowClasses(); }

1 0

[jimtabor] 43089: - Wine sync up to 1.1.29 Edit controls.
by jimtabor＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: jimtabor Date: Sun Sep 20 01:31:17 2009 New Revision: 43089 URL: http://svn.reactos.org/svn/reactos?rev=43089&view=rev Log: - Wine sync up to 1.1.29 Edit controls. Modified: trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sun Sep 20 01:31:17 2009 @@ -68,6 +68,8 @@ #define EF_USE_SOFTBRK 0x0100 /* Enable soft breaks in text. */ #define EF_APP_HAS_HANDLE 0x0200 /* Set when an app sends EM_[G|S]ETHANDLE. We are in sole control of the text buffer if this is clear. */ +#define EF_DIALOGMODE 0x0400 /* Indicates that we are inside a dialog window */ + typedef enum { END_0 = 0, /* line ends with terminating '\0' character */ @@ -3201,29 +3203,7 @@ */ static BOOL EDIT_IsInsideDialog(EDITSTATE *es) { -#ifdef __REACTOS__ - if (es->hwndParent && es->hwndParent != GetDesktopWindow()) - { - if (GetClassLongPtrW (es->hwndParent, GCW_ATOM) == (DWORD)MAKEINTATOM(32770)) - return TRUE; - } - return FALSE; -#else - WND *pParent; - BOOL r = FALSE; - - if (es->hwndParent) - { - pParent = WIN_GetPtr(es->hwndParent); - if (pParent && pParent != WND_OTHER_PROCESS && pParent != WND_DESKTOP) - { - if (pParent->flags & WIN_ISDIALOG) - r = TRUE; - WIN_ReleasePtr(pParent); - } - } - return r; -#endif + return (es->flags & EF_DIALOGMODE); } @@ -3679,32 +3659,32 @@ /* If the edit doesn't want the return send a message to the default object */ if(!(es->style & ES_MULTILINE) || !(es->style & ES_WANTRETURN)) { - HWND hwndParent; DWORD dw; - if (!EDIT_IsInsideDialog(es)) return 1; + if (!EDIT_IsInsideDialog(es)) break; if (control) break; - hwndParent = GetParent(es->hwndSelf); - dw = SendMessageW( hwndParent, DM_GETDEFID, 0, 0 ); - if (HIWORD(dw) == DC_HASDEFID) - { - SendMessageW( hwndParent, WM_COMMAND, - MAKEWPARAM( LOWORD(dw), BN_CLICKED ), - (LPARAM)GetDlgItem( hwndParent, LOWORD(dw) ) ); - } - else - SendMessageW( hwndParent, WM_COMMAND, IDOK, (LPARAM)GetDlgItem( hwndParent, IDOK ) ); + dw = SendMessageW( es->hwndParent, DM_GETDEFID, 0, 0 ); + if (HIWORD(dw) == DC_HASDEFID) + { + HWND hwDefCtrl = GetDlgItem(es->hwndParent, LOWORD(dw)); + if (hwDefCtrl) + { + SendMessageW(es->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, (LPARAM)TRUE); + PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); + } + } } break; case VK_ESCAPE: - if (!(es->style & ES_MULTILINE)) - SendMessageW(GetParent(es->hwndSelf), WM_COMMAND, IDCANCEL, (LPARAM)GetDlgItem( GetParent(es->hwndSelf), IDCANCEL ) ); + if (!(es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) + PostMessageW(es->hwndParent, WM_CLOSE, 0, 0); break; case VK_TAB: - SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); + if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) + SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); break; } - return 0; + return TRUE; } @@ -5232,27 +5212,21 @@ if (es->style & ES_MULTILINE) result |= DLGC_WANTALLKEYS; - if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN)) - { - int vk = (int)((LPMSG)lParam)->wParam; - - if (es->hwndListBox) - { - if (vk == VK_RETURN || vk == VK_ESCAPE) - if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) - result |= DLGC_WANTMESSAGE; - } - else - { - switch (vk) - { - case VK_ESCAPE: - SendMessageW(GetParent(hwnd), WM_CLOSE, 0, 0); - break; - default: - break; - } - } + if (lParam) + { + es->flags|=EF_DIALOGMODE; + + if (((LPMSG)lParam)->message == WM_KEYDOWN) + { + int vk = (int)((LPMSG)lParam)->wParam; + + if (es->hwndListBox) + { + if (vk == VK_RETURN || vk == VK_ESCAPE) + if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) + result |= DLGC_WANTMESSAGE; + } + } } break; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 20 01:31:17 2009 @@ -231,7 +231,7 @@ User32 - reactos/dll/win32/user32/controls/button.c # Synced to Wine-1_1_22 reactos/dll/win32/user32/controls/combo.c # Synced to Wine-1_1_22 - reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_22 + reactos/dll/win32/user32/controls/edit.c # Synced to Wine-1_1_29 reactos/dll/win32/user32/controls/icontitle.c # Synced to Wine-1_1_13 reactos/dll/win32/user32/controls/listbox.c # Synced to Wine-1_1_22 reactos/dll/win32/user32/controls/scrollbar.c # Forked

1 0

[jimtabor] 43088: - Header cleanup +1.
by jimtabor＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: jimtabor Date: Sun Sep 20 00:21:12 2009 New Revision: 43088 URL: http://svn.reactos.org/svn/reactos?rev=43088&view=rev Log: - Header cleanup +1. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Sun Sep 20 00:21:12 2009 @@ -1,23 +1,4 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Window painting function

1 0

[jimtabor] 43087: - Header cleanup.
by jimtabor＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: jimtabor Date: Sun Sep 20 00:20:43 2009 New Revision: 43087 URL: http://svn.reactos.org/svn/reactos?rev=43087&view=rev Log: - Header cleanup. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Sun Sep 20 00:20:43 2009 @@ -1,23 +1,4 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Scrollbars

1 0

[jimtabor] 43086: - Two bugs found by Michael Martin.
by jimtabor＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: jimtabor Date: Sun Sep 20 00:17:25 2009 New Revision: 43086 URL: http://svn.reactos.org/svn/reactos?rev=43086&view=rev Log: - Two bugs found by Michael Martin. Modified: trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Sep 20 00:17:25 2009 @@ -3967,7 +3967,7 @@ Common = (PLOADMENU_CALLBACK_ARGUMENTS) Arguments; - Result = (LRESULT)LoadMenuW(Common->hModule, (LPCWSTR)&Common->MenuName); + Result = (LRESULT)LoadMenuW(Common->hModule, IS_INTRESOURCE(Common->MenuName) ? Common->MenuName : (LPCWSTR)&Common->MenuName); return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS); } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun Sep 20 00:17:25 2009 @@ -386,7 +386,7 @@ CaptionText = (LPSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CaptionSize); RtlCopyMemory(CaptionText, MessageA.Buffer+1, CaptionSize-1); - CaptionSize += 3; // "}\r\n" - 3 + CaptionSize += 2; // "}\r\n" - 3 szxCaptionText = (LPWSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(wchar_t)*CaptionSize+ClientFileNameU.MaximumLength+128); if( ClientFileNameU.Buffer ) {

1 0

[tkreuzer] 43085: Merge from amd64 branch: 35746 sserapion Convert crtdll to WINE's spec file. 35789 sserapion re-add missing api, remove unneded file 36614 sserapion convert d3d8 to spec 36930 sserapion Fix more rbuild files and fix up gdi32 and glu32 spec files. 38148 tkreuzer convert d3d8thk to spec 38151 tkreuzer convert ddraw to spec 38265 sserapion devcpux:- Fix ProcessorDlgProc definition - Convert to spec. slayer:- Convert to spec. 38268 sserapion devcpux:- Fix ProcessorDlgProc definitio
by tkreuzer＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: tkreuzer Date: Sun Sep 20 00:16:27 2009 New Revision: 43085 URL: http://svn.reactos.org/svn/reactos?rev=43085&view=rev Log: Merge from amd64 branch: 35746 sserapion Convert crtdll to WINE's spec file. 35789 sserapion re-add missing api, remove unneded file 36614 sserapion convert d3d8 to spec 36930 sserapion Fix more rbuild files and fix up gdi32 and glu32 spec files. 38148 tkreuzer convert d3d8thk to spec 38151 tkreuzer convert ddraw to spec 38265 sserapion devcpux:- Fix ProcessorDlgProc definition - Convert to spec. slayer:- Convert to spec. 38268 sserapion devcpux:- Fix ProcessorDlgProc definition 39333 tkreuzer hid: convert to spec (taken from wine) 39345 tkreuzer ksuser: convert to spec, don't allow warnings 40991 tkreuzer msafd: convert to spec / fix 64bit build 41000 tkreuzer mswsock: convert to spec, taken from wine 41050 tkreuzer sndblast: convert to spec 43080 tkreuzer winsta: convert to spec and fix duplicate definition 41082 tkreuzer twaain_32: convert to spec 41083 tkreuzer uext: convert to spec 41084 tkreuzer ufat: convert to spec 41085 tkreuzer ufatx: convert to spec 41086 tkreuzer untfs: convert to spec 41549 tkreuzer winfax: covert to spec Added: trunk/reactos/dll/directx/d3d8/d3d8.spec (props changed) - copied unchanged from r36614, branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec trunk/reactos/dll/directx/d3d8thk/d3d8thk.spec - copied unchanged from r38148, branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.spec trunk/reactos/dll/directx/ddraw/ddraw.spec - copied unchanged from r38151, branches/ros-amd64-bringup/reactos/dll/directx/ddraw/ddraw.spec trunk/reactos/dll/directx/ksuser/ksuser.spec - copied unchanged from r39345, branches/ros-amd64-bringup/reactos/dll/directx/ksuser/ksuser.spec trunk/reactos/dll/shellext/devcpux/devcpux.spec (props changed) - copied unchanged from r38265, branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec trunk/reactos/dll/shellext/slayer/slayer.spec (props changed) - copied unchanged from r38265, branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec trunk/reactos/dll/win32/crtdll/crtdll.spec - copied, changed from r35746, branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.spec trunk/reactos/dll/win32/hid/hid.spec - copied unchanged from r39333, branches/ros-amd64-bringup/reactos/dll/win32/hid/hid.spec trunk/reactos/dll/win32/msafd/msafd.spec - copied unchanged from r40991, branches/ros-amd64-bringup/reactos/dll/win32/msafd/msafd.spec trunk/reactos/dll/win32/mswsock/mswsock.spec - copied unchanged from r41000, branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.spec trunk/reactos/dll/win32/sndblst/sndblst.spec - copied unchanged from r41050, branches/ros-amd64-bringup/reactos/dll/win32/sndblst/sndblst.spec trunk/reactos/dll/win32/twain_32/twain_32.spec - copied unchanged from r41086, branches/ros-amd64-bringup/reactos/dll/win32/twain_32/twain_32.spec trunk/reactos/dll/win32/uext2/uext2.spec - copied unchanged from r41086, branches/ros-amd64-bringup/reactos/dll/win32/uext2/uext2.spec trunk/reactos/dll/win32/ufat/ufat.spec - copied unchanged from r41086, branches/ros-amd64-bringup/reactos/dll/win32/ufat/ufat.spec trunk/reactos/dll/win32/ufatx/ufatx.spec - copied unchanged from r41086, branches/ros-amd64-bringup/reactos/dll/win32/ufatx/ufatx.spec trunk/reactos/dll/win32/untfs/untfs.spec - copied unchanged from r41086, branches/ros-amd64-bringup/reactos/dll/win32/untfs/untfs.spec trunk/reactos/dll/win32/winfax/winfax.spec - copied unchanged from r41549, branches/ros-amd64-bringup/reactos/dll/win32/winfax/winfax.spec trunk/reactos/dll/win32/winsta/winsta.spec - copied, changed from r43080, branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec Removed: trunk/reactos/dll/directx/d3d8/d3d8.def trunk/reactos/dll/directx/d3d8thk/d3d8thk.def trunk/reactos/dll/directx/ddraw/ddraw.def trunk/reactos/dll/directx/ksuser/ksuser.def trunk/reactos/dll/shellext/devcpux/devcpux.def trunk/reactos/dll/shellext/slayer/slayer.def trunk/reactos/dll/win32/crtdll/crtdll.def trunk/reactos/dll/win32/msafd/msafd.def trunk/reactos/dll/win32/sndblst/sndblst.def trunk/reactos/dll/win32/twain_32/twain_32.def trunk/reactos/dll/win32/uext2/uext2.def trunk/reactos/dll/win32/ufat/ufat.def trunk/reactos/dll/win32/ufatx/ufatx.def trunk/reactos/dll/win32/untfs/untfs.def trunk/reactos/dll/win32/winfax/winfax.def trunk/reactos/dll/win32/winsta/winsta.def Modified: trunk/reactos/ (props changed) trunk/reactos/dll/directx/d3d8/d3d8.c trunk/reactos/dll/directx/d3d8/d3d8.rbuild trunk/reactos/dll/directx/d3d8thk/d3d8thk.rbuild trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ksuser/ksuser.rbuild trunk/reactos/dll/shellext/devcpux/devcpux.rbuild trunk/reactos/dll/shellext/devcpux/processor.c trunk/reactos/dll/shellext/slayer/slayer.rbuild trunk/reactos/dll/win32/crtdll/crtdll.rbuild trunk/reactos/dll/win32/hid/hid.rbuild trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/msafd.rbuild trunk/reactos/dll/win32/mswsock/mswsock.rbuild trunk/reactos/dll/win32/sndblst/sndblst.rbuild trunk/reactos/dll/win32/twain_32/twain_32.rbuild trunk/reactos/dll/win32/uext2/uext2.rbuild trunk/reactos/dll/win32/ufat/ufat.rbuild trunk/reactos/dll/win32/ufatx/ufatx.rbuild trunk/reactos/dll/win32/untfs/untfs.rbuild trunk/reactos/dll/win32/winfax/winfax.rbuild trunk/reactos/dll/win32/winsta/winsta.rbuild trunk/reactos/dll/win32/winsta/ws.c trunk/reactos/dll/win32/ws2help/ (props changed) trunk/reactos/lib/sdk/crt/time/ (props changed) trunk/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) trunk/reactos/tools/rsym/log2lines.c (props changed) trunk/reactos/tools/rsym/log2lines.mak (props changed) trunk/reactos/tools/rsym/rsym.c (props changed) trunk/reactos/tools/rsym/rsym.h (props changed) trunk/reactos/tools/rsym/rsym.mak (props changed) trunk/reactos/tools/rsym/rsym_common.c (props changed) Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 Modified: trunk/reactos/dll/directx/d3d8/d3d8.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8/d3d8.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d8/d3d8.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d8/d3d8.c [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -3,24 +3,31 @@ #include <debug.h> -HRESULT DLLAPI ValidatePixelShader(void) +HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto) { UNIMPLEMENTED return 0; } -HRESULT DLLAPI ValidateVertexShader(void) -{ - UNIMPLEMENTED - return 0; -} -HRESULT DLLAPI DebugSetMute(DWORD dw1) +HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) { UNIMPLEMENTED return 0; } -DWORD DLLAPI Direct3DCreate8( UINT SDKVersion ) +HRESULT WINAPI D3D8GetSWInfo(void) +{ + UNIMPLEMENTED + return 0; +} + +HRESULT WINAPI DebugSetMute(void) +{ + UNIMPLEMENTED + return 0; +} + +DWORD WINAPI Direct3DCreate8( UINT SDKVersion ) { UNIMPLEMENTED return 0; Removed: trunk/reactos/dll/directx/d3d8/d3d8.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8/d3d8.def?… ============================================================================== --- trunk/reactos/dll/directx/d3d8/d3d8.def [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d8/d3d8.def (removed) @@ -1,6 +1,0 @@ -LIBRARY d3d8 -EXPORTS - ValidatePixelShader - ValidateVertexShader - DebugSetMute - Direct3DCreate8 Modified: trunk/reactos/dll/directx/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8/d3d8.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d8/d3d8.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d8/d3d8.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,7 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="d3d8" type="win32dll" entrypoint="0" installbase="system32" installname="d3d8.dll"> - <importlibrary definition="d3d8.def" /> + <importlibrary definition="d3d8.spec.def" /> <file>d3d8.c</file> <file>d3d8.rc</file> + <file>d3d8.spec</file> </module> Propchange: trunk/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: trunk/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 Removed: trunk/reactos/dll/directx/d3d8thk/d3d8thk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8thk/d3d8th… ============================================================================== --- trunk/reactos/dll/directx/d3d8thk/d3d8thk.def [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d8thk/d3d8thk.def (removed) @@ -1,58 +1,0 @@ -LIBRARY d3d8thk -EXPORTS - OsThunkD3dContextCreate@16 = DdEntry1@16 - OsThunkD3dContextDestroy@4 = DdEntry2@4 - OsThunkD3dContextDestroyAll@4 = DdEntry3@4 - OsThunkD3dDrawPrimitives2@28 = DdEntry5@28 - OsThunkD3dValidateTextureStageState@4 = DdEntry4@4 - OsThunkDdAddAttachedSurface@12 = DdEntry7@12 - OsThunkDdAlphaBlt@12 = DdEntry8@12 - OsThunkDdAttachSurface@8 = DdEntry9@8 - OsThunkDdBeginMoCompFrame@8 = DdEntry10@8 - OsThunkDdBlt@12 = DdEntry11@12 - OsThunkDdCanCreateD3DBuffer@8 = DdEntry13@8 - OsThunkDdCanCreateSurface@8 = DdEntry12@8 - OsThunkDdColorControl@8 = DdEntry14@8 - OsThunkDdCreateD3DBuffer@32 = DdEntry17@32 - OsThunkDdCreateDirectDrawObject@4 = DdEntry15@4 - OsThunkDdCreateMoComp@8 = DdEntry18@8 - OsThunkDdCreateSurface@32 = DdEntry16@32 - OsThunkDdCreateSurfaceEx@12 = DdEntry50@12 - OsThunkDdCreateSurfaceObject@24 = DdEntry19@24 - OsThunkDdDeleteDirectDrawObject@4 = DdEntry20@4 - OsThunkDdDeleteSurfaceObject@4 = DdEntry21@4 - OsThunkDdDestroyD3DBuffer@4 = DdEntry24@4 - OsThunkDdDestroyMoComp@8 = DdEntry22@8 - OsThunkDdDestroySurface@8 = DdEntry23@8 - OsThunkDdEndMoCompFrame@8 = DdEntry25@8 - OsThunkDdFlip@20 = DdEntry26@20 - OsThunkDdFlipToGDISurface@8 = DdEntry27@8 - OsThunkDdGetAvailDriverMemory@8 = DdEntry28@8 - OsThunkDdGetBltStatus@8 = DdEntry29@8 - OsThunkDdGetDC@8 = DdEntry30@8 - OsThunkDdGetDriverInfo@8 = DdEntry31@8 - OsThunkDdGetDriverState@4 = DdEntry6@4 - OsThunkDdGetDxHandle@12 = DdEntry32@12 - OsThunkDdGetFlipStatus@8 = DdEntry33@8 - OsThunkDdGetInternalMoCompInfo@8 = DdEntry34@8 - OsThunkDdGetMoCompBuffInfo@8 = DdEntry35@8 - OsThunkDdGetMoCompFormats@8 = DdEntry37@8 - OsThunkDdGetMoCompGuids@8 = DdEntry36@8 - OsThunkDdGetScanLine@8 = DdEntry38@8 - OsThunkDdLock@12 = DdEntry39@12 - OsThunkDdLockD3D@8 = DdEntry40@8 - OsThunkDdQueryDirectDrawObject@44 = DdEntry41@44 - OsThunkDdQueryMoCompStatus@8 = DdEntry42@8 - OsThunkDdReenableDirectDrawObject@8 = DdEntry43@8 - OsThunkDdReleaseDC@4 = DdEntry44@4 - OsThunkDdRenderMoComp@8 = DdEntry45@8 - OsThunkDdResetVisrgn@8 = DdEntry46@8 - OsThunkDdSetColorKey@8 = DdEntry47@8 - OsThunkDdSetExclusiveMode@8 = DdEntry48@8 - OsThunkDdSetGammaRamp@12 = DdEntry49@12 - OsThunkDdSetOverlayPosition@12 = DdEntry51@12 - OsThunkDdUnattachSurface@8 = DdEntry52@8 - OsThunkDdUnlock@8 = DdEntry53@8 - OsThunkDdUnlockD3D@8 = DdEntry54@8 - OsThunkDdUpdateOverlay@12 = DdEntry55@12 - OsThunkDdWaitForVerticalBlank@8 = DdEntry56@8 Modified: trunk/reactos/dll/directx/d3d8thk/d3d8thk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d8thk/d3d8th… ============================================================================== --- trunk/reactos/dll/directx/d3d8thk/d3d8thk.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d8thk/d3d8thk.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="d3d8thk" type="win32dll" entrypoint="0" installbase="system32" installname="d3d8thk.dll"> - <importlibrary definition="d3d8thk.def" /> + <importlibrary definition="d3d8thk.spec" /> <library>gdi32</library> <file>d3d8thk.rc</file> </module> Removed: trunk/reactos/dll/directx/ddraw/ddraw.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.de… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.def [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.def (removed) @@ -1,23 +1,0 @@ -EXPORTS -AcquireDDThreadLock@0 -D3DParseUnknownCommand@8 -ReleaseDDThreadLock@0 - -;CompleteCreateSysmemSurface -;DDGetAttachedSurfaceLcl@12 -;DDInternalLock@8 -;DDInternalUnlock@4 -;DSoundHelp@12 -DirectDrawCreate@12 -DirectDrawCreateClipper@12 -DirectDrawCreateEx@16 -DirectDrawEnumerateA@8 -DirectDrawEnumerateW@8 -DirectDrawEnumerateExA@12 -DirectDrawEnumerateExW@12 -;DllCanUnloadNow -;DllGetClassObject -;GetDDSurfaceLocal@12 -;GetOLEThunkData -;GetSurfaceFromDC@12 -;RegisterSpecialCase Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" unicode="yes" crt="msvcrt"> - <importlibrary definition="ddraw.def" /> + <importlibrary definition="ddraw.spec" /> <include base="ddraw">.</include> <library>kernel32</library> <library>user32</library> Removed: trunk/reactos/dll/directx/ksuser/ksuser.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.def [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.def (removed) @@ -1,6 +1,0 @@ -LIBRARY ksuser.dll -EXPORTS - KsCreateAllocator@12 - KsCreateClock@12 - KsCreatePin@16 - KsCreateTopologyNode@16 Modified: trunk/reactos/dll/directx/ksuser/ksuser.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="ksuser" type="win32dll" baseaddress="${BASEADDRESS_KSUSER}" installbase="system32" installname="ksuser.dll"> - <importlibrary definition="ksuser.def" /> + <importlibrary definition="ksuser.spec" /> <include base="ksuser">.</include> <library>advapi32</library> <library>kernel32</library> Removed: trunk/reactos/dll/shellext/devcpux/devcpux.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/devcpux/devcp… ============================================================================== --- trunk/reactos/dll/shellext/devcpux/devcpux.def [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/devcpux/devcpux.def (removed) @@ -1,7 +1,0 @@ -LIBRARY devcpux.dll - -EXPORTS - -PropSheetExtProc@12 - -; EOF Modified: trunk/reactos/dll/shellext/devcpux/devcpux.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/devcpux/devcp… ============================================================================== --- trunk/reactos/dll/shellext/devcpux/devcpux.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/devcpux/devcpux.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="devcpux" type="win32dll" installbase="system32" installname="devcpux.dll" unicode="yes"> - <importlibrary definition="devcpux.def" /> + <importlibrary definition="devcpux.spec" /> <include base="devcpux">.</include> <include base="ReactOS">include/reactos/wine</include> <library>kernel32</library> Propchange: trunk/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 Modified: trunk/reactos/dll/shellext/devcpux/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/devcpux/proce… ============================================================================== --- trunk/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/devcpux/processor.c [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -14,7 +14,7 @@ #include "resource.h" HINSTANCE g_hInstance = NULL; -int APIENTRY ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam); BOOL APIENTRY @@ -74,8 +74,8 @@ wcscat(szFeatures, Feature); } -int -APIENTRY +INT_PTR +CALLBACK ProcessorDlgProc (HWND hDlg, UINT uMessage, WPARAM wParam, LPARAM lParam) { switch (uMessage) { Removed: trunk/reactos/dll/shellext/slayer/slayer.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/slayer… ============================================================================== --- trunk/reactos/dll/shellext/slayer/slayer.def [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/slayer.def (removed) @@ -1,9 +1,0 @@ -LIBRARY slayer.dll - -EXPORTS -DllCanUnloadNow@0 -DllGetClassObject@12 -DllRegisterServer@0 -DllUnregisterServer@0 - -; EOF Modified: trunk/reactos/dll/shellext/slayer/slayer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/slayer… ============================================================================== --- trunk/reactos/dll/shellext/slayer/slayer.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/slayer.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="slayer" type="win32dll" baseaddress="${BASEADDRESS_SLAYER}" installbase="system32" installname="slayer.dll" unicode="yes"> - <importlibrary definition="slayer.def" /> + <importlibrary definition="slayer.spec" /> <include base="slayer">.</include> <library>kernel32</library> <library>user32</library> Propchange: trunk/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: trunk/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 Removed: trunk/reactos/dll/win32/crtdll/crtdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.de… ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.def (removed) @@ -1,571 +1,0 @@ -; -; crtdll.def -; -; Exports from crtdll.dll from Windows 95 SYSTEM directory. Hopefully this -; should also work with the crtdll provided with Windows NT. -; Exports from crtdll.dll from Windows NT Server 4.0. -; -; Contributors: -; Created by Colin Peters <colin(a)bird.fu.is.saga-u.ac.jp> -; Modified by Adhi P. Yoedo <adhi(a)primatama.co.id> -; -; THIS SOFTWARE IS NOT COPYRIGHTED -; -; This source code is offered for use in the public domain. You may -; use, modify or distribute it freely. -; -; This code is distributed in the hope that it will be useful but -; WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY -; DISCLAMED. This includes but is not limited to warrenties of -; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -; -; $Revision: 1.19 $ -; $Author$ -; $Date$ -; -; These three functions appear to be name mangled in some way, so GCC is -; probably not going to be able to use them in any case. -; -; ??2@YAPAXI@Z -; ??3@YAXPAX@Z -; ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z -; -; Added functional equivalent placeholders: -; -; __builtin_new -; __builtin_delete -; _set_new_handler__FPFUi_i -; I commented out these, cause i dont get why they were added. -Gunnar -; -LIBRARY CRTDLL.DLL -EXPORTS -;__builtin_new -;__builtin_delete -??2@YAPAXI@Z=MSVCRT_operator_new -??3@YAXPAX@Z=MSVCRT_operator_delete -?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z=MSVCRT__set_new_handler -;_set_new_handler__FPFUi_i -_CIacos -_CIasin -_CIatan -_CIatan2 -_CIcos -_CIcosh -_CIexp -_CIfmod -_CIlog -_CIlog10 -_CIpow -_CIsin -_CIsinh -_CIsqrt -_CItan -_CItanh -_HUGE_dll=_HUGE DATA -_XcptFilter -__GetMainArgs -__argc_dll=__argc DATA -__argv_dll=__argv DATA -__dllonexit -__doserrno -__fpecode -__isascii=NTDLL.__isascii -__iscsym=NTDLL.__iscsym -__iscsymf=NTDLL.__iscsymf -__mb_cur_max_dll=__mb_cur_max DATA -__pxcptinfoptrs -__threadhandle -__threadid -__toascii=NTDLL.__toascii -_abnormal_termination -_access -_acmdln_dll=_acmdln DATA -_aexit_rtn_dll=_aexit_rtn DATA -_amsg_exit -_assert -_basemajor_dll=CRTDLL__basemajor_dll DATA -_baseminor_dll=CRTDLL__baseminor_dll DATA -_baseversion_dll=CRTDLL__baseversion_dll DATA -_beep -_beginthread -_c_exit -_cabs -_cexit -_cgets -_chdir -_chdrive -_chgsign -_chmod -_chsize -_clearfp -_close -_commit -_commode_dll=_commode DATA -_control87 -_controlfp -_copysign -_cprintf -_cpumode_dll=_cpumode DATA ;fixme: wine has CRTDLL__cpumode_dll -_cputs -_creat -_cscanf -_ctype DATA -_cwait -_daylight_dll=_daylight DATA -_dup -_dup2 -_ecvt -_endthread -_environ_dll=_environ DATA -_eof -_errno -_except_handler2 -_execl -_execle -_execlp -_execlpe -_execv -_execve -_execvp -_execvpe -_exit -_expand -_fcloseall -_fcvt -_fdopen -_fgetchar -_fgetwchar -_filbuf -;_fileinfo_dll=_fileinfo DATA -_filelength -_fileno DATA -_findclose -_findfirst -_findnext -_finite -_flsbuf -_flushall -_fmode_dll=_fmode DATA -_fpclass -_fpieee_flt -_fpreset -_fputchar -_fputwchar -_fsopen -_fstat=CRTDLL__fstat -_ftime -_ftol=NTDLL._ftol -_fullpath -_futime -_gcvt -_get_osfhandle -_getch -_getche -_getcwd -_getdcwd -_getdiskfree -_getdllprocaddr -_getdrive -_getdrives -_getpid -_getsystime -_getw -_global_unwind2 -_heapchk -_heapmin -_heapset -_heapwalk -_hypot -_initterm -_iob DATA -_isatty -_isctype -_ismbbalnum -_ismbbalpha -_ismbbgraph -_ismbbkalnum -_ismbbkana -_ismbbkpunct -_ismbblead -_ismbbprint -_ismbbpunct -_ismbbtrail -_ismbcalpha -_ismbcdigit -_ismbchira -_ismbckata -_ismbcl0 -_ismbcl1 -_ismbcl2 -_ismbclegal -_ismbclower -_ismbcprint -_ismbcspace -_ismbcsymbol -_ismbcupper -_ismbslead -_ismbstrail -_isnan -_itoa=NTDLL._itoa -_itow=NTDLL._itow -_j0 -_j1 -_jn -_kbhit -_lfind -_loaddll -_local_unwind2 -_locking -_logb -_lrotl -_lrotr -_lsearch -_lseek -_ltoa=NTDLL._ltoa -_ltow=NTDLL._ltow -_makepath -_matherr -_mbbtombc -_mbbtype -_mbccpy -_mbcjistojms -_mbcjmstojis -_mbclen -_mbctohira -_mbctokata -_mbctolower -_mbctombb -_mbctoupper -_mbctype DATA -_mbsbtype -_mbscat -_mbschr -_mbscmp -_mbscpy -_mbscspn -_mbsdec -_mbsdup -_mbsicmp -_mbsinc -_mbslen -_mbslwr -_mbsnbcat -_mbsnbcmp -_mbsnbcnt -_mbsnbcpy -_mbsnbicmp -_mbsnbset -_mbsncat -_mbsnccnt -_mbsncmp -_mbsncpy -_mbsnextc -_mbsnicmp -_mbsninc -_mbsnset -_mbspbrk -_mbsrchr -_mbsrev -_mbsset -_mbsspn -_mbsspnp -_mbsstr -_mbstok -_mbstrlen -_mbsupr -_memccpy -_memicmp=NTDLL._memicmp -_mkdir -_mktemp -_msize -_nextafter -_onexit -_open -_open_osfhandle -_osmajor_dll=CRTDLL__osmajor_dll DATA -_osminor_dll=CRTDLL__osminor_dll DATA -_osmode_dll=CRTDLL__osmode_dll DATA -_osver_dll=_osver DATA -_osversion_dll=CRTDLL__osversion_dll DATA -_pclose -_pctype_dll=_pctype DATA -_pgmptr_dll=_pgmptr DATA -_pipe -_popen -_purecall -_putch -_putenv -_putw -_pwctype_dll=_pwctype DATA -_read -_rmdir -_rmtmp -_rotl -_rotr -_scalb -_searchenv -_seterrormode -_setjmp -_setmode -_setsystime -_sleep -_snprintf -_snwprintf -_sopen -_spawnl -_spawnle -_spawnlp -_spawnlpe -_spawnv -_spawnve -_spawnvp -_spawnvpe -_splitpath=NTDLL._splitpath -_stat=CRTDLL__stat -_statusfp -_strcmpi=NTDLL._strcmpi -_strdate -_strdec -_strdup -_strerror -_stricmp=NTDLL._stricmp -_stricoll -_strinc -_strlwr=NTDLL._strlwr -_strncnt -_strnextc -_strnicmp=NTDLL._strnicmp -_strninc -_strnset -_strrev -_strset -_strspnp -_strtime -_strupr=NTDLL._strupr -_swab -_sys_errlist DATA -_sys_nerr_dll=_sys_nerr DATA -_tell -_tempnam -_timezone_dll=_timezone -_tolower=NTDLL._tolower -_toupper=NTDLL._toupper -_tzname DATA -_tzset -_ultoa=NTDLL._ultoa -_ultow=NTDLL._ultow -_umask -_ungetch -_unlink -_unloaddll -_utime -_vsnprintf -_vsnwprintf -_wcsdup -_wcsicmp -_wcsicoll -_wcslwr -_wcsnicmp=NTDLL._wcsnicmp -_wcsnset -_wcsrev -_wcsset -_wcsupr -_winmajor_dll=_winmajor DATA -_winminor_dll=_winminor DATA -_winver_dll=_winver DATA -_write -_wtoi=NTDLL._wtoi -_wtol=NTDLL._wtol -_y0 -_y1 -_yn -abort -abs=NTDLL.abs -acos -asctime -asin -atan=NTDLL.atan -atan2 -atexit -atof -atoi=NTDLL.atoi -atol=NTDLL.atol -bsearch=NTDLL.bsearch -calloc -ceil=NTDLL.ceil -clearerr -clock -cos=NTDLL.cos -cosh -ctime -difftime -div -exit -exp -fabs=NTDLL.fabs -fclose -feof -ferror -fflush -fgetc -fgetpos -fgets -fgetwc -floor=NTDLL.floor -fmod -fopen -fprintf -fputc -fputs -fputwc -fread -free -freopen -frexp -fscanf -fseek -fsetpos -ftell -fwprintf -fwrite -fwscanf -getc -getchar -getenv -gets -gmtime -is_wctype -isalnum=NTDLL.isalnum -isalpha=NTDLL.isalpha -iscntrl=NTDLL.iscntrl -isdigit=NTDLL.isdigit -isgraph=NTDLL.isgraph -isleadbyte -islower=NTDLL.islower -isprint=NTDLL.isprint -ispunct=NTDLL.ispunct -isspace=NTDLL.isspace -isupper=NTDLL.isupper -iswalnum -iswalpha=NTDLL.iswalpha -iswascii -iswcntrl -iswctype=NTDLL.iswctype -iswdigit=NTDLL.iswdigit -iswgraph -iswlower=NTDLL.iswlower -iswprint -iswpunct -iswspace=NTDLL.iswspace -iswupper -iswxdigit=NTDLL.iswxdigit -isxdigit=NTDLL.isxdigit -labs=NTDLL.labs -ldexp -ldiv -localeconv -localtime -log=NTDLL.log -log10 -longjmp -malloc -mblen -mbstowcs=NTDLL.mbstowcs -mbtowc -memchr=NTDLL.memchr -memcmp=NTDLL.memcmp -memcpy=NTDLL.memcpy -memmove=NTDLL.memmove -memset -mktime -modf -perror -pow -printf -putc -putchar -puts -qsort=NTDLL.qsort -raise -rand -realloc -remove -rename -rewind -scanf -setbuf -setlocale -setvbuf -signal -sin=NTDLL.sin -sinh -sprintf -sqrt=NTDLL.sqrt -srand -sscanf -strcat -strchr -strcmp=NTDLL.strcmp -strcoll -strcpy -strcspn -strerror -strftime -strlen -strncat -strncmp -strncpy -strpbrk=NTDLL.strpbrk -strrchr -strspn -strstr=NTDLL.strstr -strtod -strtok -strtol=NTDLL.strtol -strtoul -strtoull -strxfrm -swprintf -swscanf -system -tan=NTDLL.tan -tanh -time -tmpfile -tmpnam -tolower=NTDLL.tolower -toupper=NTDLL.toupper -towlower=NTDLL.towlower -towupper=NTDLL.towupper -ungetc -ungetwc -vfprintf -vfwprintf -vprintf -vsprintf -vswprintf -vwprintf -wcscat -wcschr -wcscmp -wcscoll -wcscpy -wcscspn -wcsftime -wcslen -wcsncat -wcsncmp -wcsncpy -wcspbrk -wcsrchr -wcsspn -wcsstr -wcstod -wcstok -wcstol=NTDLL.wcstol -wcstombs -wcstoul=NTDLL.wcstoul -wcsxfrm -wctomb -wprintf -wscanf Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rb… ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="crtdll" type="win32dll" baseaddress="${BASEADDRESS_CRTDLL}" mangledsymbols="true" installbase="system32" installname="crtdll.dll" iscrt="true"> - <importlibrary definition="crtdll.def" /> + <importlibrary definition="crtdll.spec" /> <include base="crtdll">.</include> <include base="crt">include</include> <define name="USE_MSVCRT_PREFIX" /> Copied: trunk/reactos/dll/win32/crtdll/crtdll.spec (from r35746, branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.spec) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.sp… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.spec [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -311,6 +311,7 @@ @ extern _tzname msvcrt._tzname @ cdecl _tzset() msvcrt._tzset @ cdecl _ultoa(long ptr long) msvcrt._ultoa + @ cdecl _ultow(long ptr long) msvcrt._ultow @ cdecl _umask(long) msvcrt._umask @ cdecl _ungetch(long) msvcrt._ungetch @ cdecl _unlink(str) msvcrt._unlink Modified: trunk/reactos/dll/win32/hid/hid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/hid/hid.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/hid.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="hid" type="win32dll" baseaddress="${BASEADDRESS_HID}" installbase="system32" installname="hid.dll" unicode="yes"> - <importlibrary definition="hid.def" /> + <importlibrary definition="hid.spec" /> <include base="hid">.</include> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -936,7 +936,7 @@ struct sockaddr *SocketAddress, int *SocketAddressLength, LPCONDITIONPROC lpfnCondition, - DWORD_PTR dwCallbackData, + DWORD dwCallbackData, LPINT lpErrno) { IO_STATUS_BLOCK IOSB; Removed: trunk/reactos/dll/win32/msafd/msafd.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.def?… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.def (removed) @@ -1,8 +1,0 @@ -; MSAFD.DLL - Ancillary Function Driver DLL - -LIBRARY msafd.dll - -EXPORTS -WSPStartup@76 - -; EOF Modified: trunk/reactos/dll/win32/msafd/msafd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.rbui… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll" unicode="yes"> - <importlibrary definition="msafd.def" /> + <importlibrary definition="msafd.spec" /> <include base="msafd">.</include> <include base="msafd">include</include> <include base="ReactOS">include/reactos/drivers</include> Modified: trunk/reactos/dll/win32/mswsock/mswsock.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswsock.… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswsock.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/mswsock.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll" unicode="yes"> - <importlibrary definition="mswsock.def" /> + <importlibrary definition="mswsock.spec" /> <define name="LE" /> <library>kernel32</library> <library>ws2_32</library> Removed: trunk/reactos/dll/win32/sndblst/sndblst.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sndblst/sndblst.… ============================================================================== --- trunk/reactos/dll/win32/sndblst/sndblst.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sndblst/sndblst.def (removed) @@ -1,15 +1,0 @@ -; $Id: sndblst.def 34299 2008-07-05 02:43:17Z silverblade $ -; -; sndblst.def -; -; ReactOS Operating System -; -LIBRARY sndblst.dll -EXPORTS -DriverProc@20 -widMessage@20 -wodMessage@20 -midMessage@20 -modMessage@20 -mxdMessage@20 -auxMessage@20 Modified: trunk/reactos/dll/win32/sndblst/sndblst.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sndblst/sndblst.… ============================================================================== --- trunk/reactos/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sndblst/sndblst.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,7 +1,7 @@  <module name="sndblst" type="win32dll" installbase="system32" installname="sndblst.dll" unicode="yes"> - <importlibrary definition="sndblst.def" /> + <importlibrary definition="sndblst.spec" /> <include base="ReactOS">include/reactos/libs/sound</include> <include base="sndblst">.</include> <define name="DEBUG_NT4" /> Removed: trunk/reactos/dll/win32/twain_32/twain_32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain_3… ============================================================================== --- trunk/reactos/dll/win32/twain_32/twain_32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/twain_32/twain_32.def (removed) @@ -1,6 +1,0 @@ -; File generated automatically from twain/twain_32.spec; do not edit! - -LIBRARY twain_32.dll - -EXPORTS -DSM_Entry@24 Modified: trunk/reactos/dll/win32/twain_32/twain_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/twain_3… ============================================================================== --- trunk/reactos/dll/win32/twain_32/twain_32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/twain_32/twain_32.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="twain_32" type="win32dll" baseaddress="${BASEADDRESS_TWAIN_32}" installbase="system32" installname="twain_32.dll" allowwarnings="true" crt="msvcrt"> - <importlibrary definition="twain_32.def" /> + <importlibrary definition="twain_32.spec" /> <include base="twain_32">.</include> <library>wine</library> <library>ntdll</library> Removed: trunk/reactos/dll/win32/uext2/uext2.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.def?… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uext2/uext2.def (removed) @@ -1,4 +1,0 @@ -LIBRARY UEXT2.DLL -EXPORTS -ChkdskEx=Ext2Chkdsk@24 -FormatEx=Ext2Format@24 Modified: trunk/reactos/dll/win32/uext2/uext2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.rbui… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uext2/uext2.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="uext2" type="win32dll" baseaddress="${BASEADDRESS_UEXT2}" installbase="system32" installname="uext2.dll"> - <importlibrary definition="uext2.def" /> + <importlibrary definition="uext2.spec" /> <include base="uext2">.</include> <library>ext2lib</library> <library>ntdll</library> Removed: trunk/reactos/dll/win32/ufat/ufat.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/ufat.def?re… ============================================================================== --- trunk/reactos/dll/win32/ufat/ufat.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufat/ufat.def (removed) @@ -1,4 +1,0 @@ -LIBRARY UFAT.DLL -EXPORTS -ChkdskEx=VfatChkdsk@24 -FormatEx=VfatFormat@24 Modified: trunk/reactos/dll/win32/ufat/ufat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufat/ufat.rbuild… ============================================================================== --- trunk/reactos/dll/win32/ufat/ufat.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufat/ufat.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="ufat" type="win32dll" baseaddress="${BASEADDRESS_UFAT}" installbase="system32" installname="ufat.dll"> - <importlibrary definition="ufat.def" /> + <importlibrary definition="ufat.spec" /> <include base="ufat">.</include> <library>vfatlib</library> <library>ntdll</library> Removed: trunk/reactos/dll/win32/ufatx/ufatx.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.def?… ============================================================================== --- trunk/reactos/dll/win32/ufatx/ufatx.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufatx/ufatx.def (removed) @@ -1,3 +1,0 @@ -LIBRARY UFATX.DLL -EXPORTS -FormatEx=VfatxFormat@24 Modified: trunk/reactos/dll/win32/ufatx/ufatx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/ufatx.rbui… ============================================================================== --- trunk/reactos/dll/win32/ufatx/ufatx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ufatx/ufatx.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="ufatx" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_UFAT}" installbase="system32" installname="ufatx.dll"> - <importlibrary definition="ufatx.def" /> + <importlibrary definition="ufatx.spec" /> <include base="ufatx">.</include> <library>vfatxlib</library> <library>ntdll</library> Removed: trunk/reactos/dll/win32/untfs/untfs.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.def?… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/untfs/untfs.def (removed) @@ -1,4 +1,0 @@ -LIBRARY UNTFS.DLL -EXPORTS -ChkdskEx=NtfsChkdsk@24 -FormatEx=NtfsFormat@24 Modified: trunk/reactos/dll/win32/untfs/untfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.rbui… ============================================================================== --- trunk/reactos/dll/win32/untfs/untfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/untfs/untfs.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="untfs" type="win32dll" baseaddress="${BASEADDRESS_UNTFS}" installbase="system32" installname="untfs.dll"> - <importlibrary definition="untfs.def" /> + <importlibrary definition="untfs.spec" /> <include base="untfs">.</include> <library>ntfslib</library> <library>ntdll</library> Removed: trunk/reactos/dll/win32/winfax/winfax.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winfax/winfax.de… ============================================================================== --- trunk/reactos/dll/win32/winfax/winfax.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winfax/winfax.def (removed) @@ -1,60 +1,0 @@ -LIBRARY winfax.dll - -EXPORTS -FaxAbort@8 @1 -FaxAccessCheck@8 @2 -FaxClose@4 @3 -FaxCompleteJobParamsA@8 @4 -FaxCompleteJobParamsW@8 @5 -FaxConnectFaxServerA@8 @6 -FaxConnectFaxServerW@8 @7 -FaxEnableRoutingMethodA@12 @8 -FaxEnableRoutingMethodW@12 @9 -FaxEnumGlobalRoutingInfoA@12 @10 -FaxEnumGlobalRoutingInfoW@12 @11 -FaxEnumJobsA@12 @12 -FaxEnumJobsW@12 @13 -FaxEnumPortsA@12 @14 -FaxEnumPortsW@12 @15 -FaxEnumRoutingMethodsA@12 @16 -FaxEnumRoutingMethodsW@12 @17 -FaxFreeBuffer@4 @18 -FaxGetConfigurationA@8 @19 -FaxGetConfigurationW@8 @20 -FaxGetDeviceStatusA@8 @21 -FaxGetDeviceStatusW@8 @22 -FaxGetJobA@12 @23 -FaxGetJobW@12 @24 -FaxGetLoggingCategoriesA@12 @25 -FaxGetLoggingCategoriesW@12 @26 -FaxGetPageData@24 @27 -FaxGetPortA@8 @28 -FaxGetPortW@8 @29 -FaxGetRoutingInfoA@16 @30 -FaxGetRoutingInfoW@16 @31 -FaxInitializeEventQueue@20 @32 -FaxOpenPort@16 @33 -FaxPrintCoverPageA@8 @34 -FaxPrintCoverPageW@8 @35 -FaxRegisterRoutingExtensionW@24 @36 -FaxRegisterServiceProviderW@16 @37 -FaxSendDocumentA@20 @38 -FaxSendDocumentForBroadcastA@20 @39 -FaxSendDocumentForBroadcastW@20 @40 -FaxSendDocumentW@20 @41 -FaxSetConfigurationA@8 @42 -FaxSetConfigurationW@8 @43 -FaxSetGlobalRoutingInfoA@8 @44 -FaxSetGlobalRoutingInfoW@8 @45 -FaxSetJobA@16 @46 -FaxSetJobW@16 @47 -FaxSetLoggingCategoriesA@12 @48 -FaxSetLoggingCategoriesW@12 @49 -FaxSetPortA@8 @50 -FaxSetPortW@8 @51 -FaxSetRoutingInfoA@16 @52 -FaxSetRoutingInfoW@16 @53 -FaxStartPrintJobA@16 @54 -FaxStartPrintJobW@16 @55 - -; EOF Modified: trunk/reactos/dll/win32/winfax/winfax.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winfax/winfax.rb… ============================================================================== --- trunk/reactos/dll/win32/winfax/winfax.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winfax/winfax.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="winfax" type="win32dll" baseaddress="${BASEADDRESS_WINFAX}" installbase="system32" installname="winfax.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="winfax.def" /> + <importlibrary definition="winfax.spec" /> <include base="winfax">.</include> <library>kernel32</library> <library>ntdll</library> Removed: trunk/reactos/dll/win32/winsta/winsta.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/winsta.de… ============================================================================== --- trunk/reactos/dll/win32/winsta/winsta.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winsta/winsta.def (removed) @@ -1,123 +1,0 @@ -LIBRARY winsta.dll -EXPORTS -LogonIdFromWinStationNameA@12 -LogonIdFromWinStationNameW@12 -RemoteAssistancePrepareSystemRestore@4 -ServerGetInternetConnectorStatus@12 -ServerLicensingClose@4 -ServerLicensingDeactivateCurrentPolicy@4 -ServerLicensingFreePolicyInformation@4 -ServerLicensingGetAvailablePolicyIds@12 -ServerLicensingGetPolicy@8 -ServerLicensingGetPolicyInformationA@16 -ServerLicensingGetPolicyInformationW@16 -ServerLicensingLoadPolicy@8 -ServerLicensingOpenA@4 -ServerLicensingOpenW@4 -ServerLicensingSetPolicy@12 -ServerLicensingUnloadPolicy@8 -ServerQueryInetConnectorInformationA@16 -ServerQueryInetConnectorInformationW@16 -ServerSetInternetConnectorStatus@12 -WinStationActivateLicense@16 -WinStationAutoReconnect@4 -WinStationBroadcastSystemMessage@40 -WinStationCheckAccess@12 -WinStationCheckLoopBack@16 -WinStationCloseServer@16 -WinStationConnectA@4 -WinStationConnectCallback@20 -WinStationConnectEx@8 -WinStationConnectW@20 -WinStationDisconnect@12 -WinStationDynVirtualChanRead@20 -WinStationDynVirtualChanWrite@16 -WinStationEnumerateA@12 -WinStationEnumerateLicenses@12 -WinStationEnumerateProcesses@8 -WinStationEnumerateW@12 -WinStationEnumerate_IndexedA@20 -WinStationEnumerate_IndexedW@20 -WinStationFreeGAPMemory@12 -WinStationFreeMemory@4 -WinStationFreeUserCertificates@4 -WinStationFreeUserCredentials@4 -WinStationGenerateLicense@16 -WinStationGetAllProcesses@16 -WinStationGetConnectionProperty@12 -WinStationGetInitialApplication@20 -WinStationGetLanAdapterNameA@24 -WinStationGetLanAdapterNameW@24 -WinStationGetLoggedOnCount@8 -WinStationGetMachinePolicy@8 -WinStationGetProcessSid@24 -WinStationGetTermSrvCountersValue@12 -WinStationGetUserCertificates@4 -WinStationGetUserCredentials@4 -WinStationGetUserProfile@16 -WinStationInstallLicense@12 -WinStationIsHelpAssistantSession@8 -WinStationIsSessionPermitted@0 -WinStationNameFromLogonIdA@12 -WinStationNameFromLogonIdW@12 -WinStationNtsdDebug@20 -WinStationOpenServerA@4 -WinStationOpenServerW@4 -WinStationQueryAllowConcurrentConnections@0 -WinStationQueryEnforcementCore@24 -WinStationQueryInformationA@24 -WinStationQueryInformationW@24 -WinStationQueryLicense@12 -WinStationQueryLogonCredentialsW@4 -WinStationQueryUpdateRequired@8 -WinStationRegisterConsoleNotification@12 -WinStationRegisterConsoleNotificationEx@16 -WinStationRegisterNotificationEvent@16 -WinStationRemoveLicense@12 -WinStationRenameA@12 -WinStationRenameW@12 -WinStationRequestSessionsList@12 -WinStationReset@12 -WinStationSendMessageA@40 -WinStationSendMessageW@40 -WinStationSendWindowMessage@32 -WinStationServerPing@4 -WinStationSetInformationA@20 -WinStationSetInformationW@20 -WinStationSetPoolCount@12 -WinStationShadow@20 -WinStationShadowStop@12 -WinStationShutdownSystem@8 -WinStationSwitchToServicesSession@0 -WinStationSystemShutdownStarted@0 -WinStationSystemShutdownWait@8 -WinStationTerminateProcess@12 -WinStationUnRegisterConsoleNotification@8 -WinStationUnRegisterNotificationEvent@4 -WinStationUserLoginAccessCheck@16 -WinStationVirtualOpen@12 -WinStationVirtualOpenEx@16 -WinStationWaitSystemEvent@12 -_NWLogonQueryAdmin@12 -_NWLogonSetAdmin@12 -_WinStationAnnoyancePopup@8 -_WinStationBeepOpen@12 -_WinStationBreakPoint@12 -_WinStationCallback@12 -_WinStationCheckForApplicationName@48 -_WinStationFUSCanRemoteUserDisconnect@12 -_WinStationGetApplicationInfo@16 -_WinStationNotifyDisconnectPipe@0 -_WinStationNotifyLogoff@0 -_WinStationNotifyLogon@32 -_WinStationNotifyNewSession@8 -_WinStationReInitializeSecurity@4 -_WinStationReadRegistry@4 -_WinStationSessionInitialized@0 -_WinStationShadowTarget@40 -_WinStationShadowTargetSetup@8 -_WinStationUpdateClientCachedCredentials@28 -_WinStationUpdateSettings@12 -_WinStationUpdateUserConfig@4 -_WinStationWaitForConnect@0 -; EOF Modified: trunk/reactos/dll/win32/winsta/winsta.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/winsta.rb… ============================================================================== --- trunk/reactos/dll/win32/winsta/winsta.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winsta/winsta.rbuild [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -1,5 +1,5 @@ <module name="winsta" type="win32dll" baseaddress="${BASEADDRESS_WINSTA}" installbase="system32" installname="winsta.dll"> - <importlibrary definition="winsta.def" /> + <importlibrary definition="winsta.spec" /> <include base="winsta">.</include> <library>wine</library> <library>kernel32</library> Copied: trunk/reactos/dll/win32/winsta/winsta.spec (from r43080, branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/winsta.sp… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winsta/winsta.spec [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -103,7 +103,7 @@ @ stdcall _WinStationBeepOpen(ptr ptr ptr) @ stdcall _WinStationBreakPoint(ptr ptr ptr) @ stdcall _WinStationCallback(ptr ptr ptr) -@ stdcall _WinStationCheckForApplicationName(ptr) +@ stdcall _WinStationCheckForApplicationName(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall _WinStationFUSCanRemoteUserDisconnect(ptr ptr ptr) @ stdcall _WinStationGetApplicationInfo(ptr ptr ptr ptr) @ stdcall _WinStationNotifyDisconnectPipe() Modified: trunk/reactos/dll/win32/winsta/ws.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winsta/ws.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/winsta/ws.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winsta/ws.c [iso-8859-1] Sun Sep 20 00:16:27 2009 @@ -89,18 +89,6 @@ WINSTAAPI WinStationFreeGAPMemory(PVOID A, PVOID B, PVOID C) -{ - UNIMPLEMENTED; -} - -VOID -WINSTAAPI WinStationGetProcessSid(PVOID A, - PVOID B, - PVOID C, - PVOID D, - PVOID E, - PVOID F, - PVOID G) { UNIMPLEMENTED; } Propchange: trunk/reactos/dll/win32/ws2help/ ------------------------------------------------------------------------------ (empty) Propchange: trunk/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,2 +1,3 @@ +/branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:38268,41028 /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 /trunk/reactos/lib/sdk/crt/time_new:39350-42241 Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,1 +1,1 @@ -/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:40095 +/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:38268,40095,41028 Propchange: trunk/reactos/tools/rsym/log2lines.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c:38268,41028 Propchange: trunk/reactos/tools/rsym/log2lines.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.mak:38268,41028 Propchange: trunk/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,1 +1,1 @@ -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 Propchange: trunk/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,1 +1,1 @@ -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 Propchange: trunk/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,1 +1,1 @@ -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028 Propchange: trunk/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 20 00:16:27 2009 @@ -1,1 +1,1 @@ -/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 +/branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38268,38330-38331,38341,38947,38973,39072,39114,39121,40605,41028

1 0

[tkreuzer] 43084: winsta: fix spec file
by tkreuzer＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: tkreuzer Date: Sat Sep 19 23:21:08 2009 New Revision: 43084 URL: http://svn.reactos.org/svn/reactos?rev=43084&view=rev Log: winsta: fix spec file Modified: branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec Modified: branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winsta/winsta.spec [iso-8859-1] Sat Sep 19 23:21:08 2009 @@ -103,7 +103,7 @@ @ stdcall _WinStationBeepOpen(ptr ptr ptr) @ stdcall _WinStationBreakPoint(ptr ptr ptr) @ stdcall _WinStationCallback(ptr ptr ptr) -@ stdcall _WinStationCheckForApplicationName(ptr) +@ stdcall _WinStationCheckForApplicationName(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall _WinStationFUSCanRemoteUserDisconnect(ptr ptr ptr) @ stdcall _WinStationGetApplicationInfo(ptr ptr ptr ptr) @ stdcall _WinStationNotifyDisconnectPipe()

1 0

[tkreuzer] 43083: update syssetup.spec from trunk
by tkreuzer＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: tkreuzer Date: Sat Sep 19 22:25:10 2009 New Revision: 43083 URL: http://svn.reactos.org/svn/reactos?rev=43083&view=rev Log: update syssetup.spec from trunk Modified: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec Modified: branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/syssetup/syssetup.spec [iso-8859-1] Sat Sep 19 22:25:10 2009 @@ -1,28 +1,32 @@ -#@ stdcall ApplyAcls -#@ stdcall DevInstallW -#@ stdcall GenerateScsiHwIdList +@ stub ApplyAcls +@ stub AsrAddSifEntryW +@ stub AsrCreateStateFileW +@ stub AsrFreeContext +@ stub AsrRestorePlugPlayRegistryData +@ stub DevInstallW +@ stub GenerateScsiHwIdList @ stdcall InitializeSetupActionLog(long) @ stdcall InstallLiveCD(ptr) @ stdcall InstallReactOS(ptr) @ stdcall KeyboardClassInstaller(long ptr ptr) -#@ stdcall LogItem@8 -#@ stdcall LogItem0 -#@ stdcall LogItem1 -#@ stdcall LogItem2 -#@ stdcall LogItem3 -#@ stdcall LogItemN +@ stub LogItem@8 +@ stub LogItem0 +@ stub LogItem1 +@ stub LogItem2 +@ stub LogItem3 +@ stub LogItemN @ stdcall MouseClassInstaller(long ptr ptr) -#@ stdcall PnPInitializationThread -#@ stdcall RepairStartMenuItems -#@ stdcall ReportError -#@ stdcall ScsiClassInstaller -@ stdcall SetupChangeFontSize(ptr ptr) +@ stub PnPInitializationThread +@ stub RepairStartMenuItems +@ stub ReportError +@ stub ScsiClassInstaller +@ stdcall SetupChangeFontSize(ptr wstr) @ stdcall SetupChangeLocale(ptr long) -@ stdcall SetupChangeLocaleEx(ptr long ptr long long long) -#@ stdcall SetupCreateOptionalComponentsPage -#@ stdcall SetupInfObjectInstallActionW -#@ stdcall SetupSetLargeDialogFont -#@ stdcall TapeClassInstaller +@ stdcall SetupChangeLocaleEx(ptr long wstr str long long) +@ stub SetupCreateOptionalComponentsPage +@ stub SetupInfObjectInstallActionW +@ stub SetupSetLargeDialogFont +@ stub TapeClassInstaller @ stdcall TerminateSetupActionLog() -#@ stdcall UpgradePrinters -#@ stdcall ViewSetupActionLog +@ stub UpgradePrinters +@ stub ViewSetupActionLog

1 0

[tkreuzer] 43082: merge from amd-64 branch: r40992: msconfig: don't use inline functions as case labels [[Timo Kreuzer]]
by tkreuzer＠svn.reactos.org 19 Sep '09

19 Sep '09

Author: tkreuzer Date: Sat Sep 19 18:13:34 2009 New Revision: 43082 URL: http://svn.reactos.org/svn/reactos?rev=43082&view=rev Log: merge from amd-64 branch: r40992: msconfig: don't use inline functions as case labels [[Timo Kreuzer]] Modified: trunk/reactos/base/applications/msconfig/startuppage.c Modified: trunk/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] Sat Sep 19 18:13:34 2009 @@ -185,10 +185,10 @@ switch (PtrToLong(hRootKey)) { - case PtrToLong(HKEY_LOCAL_MACHINE): + case (ULONG_PTR)HKEY_LOCAL_MACHINE: _tcscpy(Path, _T("HKLM\\\0")); break; - case PtrToLong(HKEY_CURRENT_USER): + case (ULONG_PTR)HKEY_CURRENT_USER: _tcscpy(Path, _T("HKCU\\\0")); break; default:

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