Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[hpoussin] 34788: Revert incorrect fix committed in r34077 by cfinck, and replace it by a better one.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Jul 25 13:45:54 2008 New Revision: 34788 URL: http://svn.reactos.org/svn/reactos?rev=34788&view=rev Log: Revert incorrect fix committed in r34077 by cfinck, and replace it by a better one. Modified: trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.h Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Fri Jul 25 13:45:54 2008 @@ -51,11 +51,7 @@ if (msg->pTitle) SetWindowTextW(hwndDlg, msg->pTitle); SetDlgItemTextW(hwndDlg, IDC_STATUSLABEL, msg->pMessage); - if (!msg->Context->SignaledStatusWindowCreated) - { - msg->Context->SignaledStatusWindowCreated = TRUE; - SetEvent(msg->StartupEvent); - } + SetEvent(msg->StartupEvent); return TRUE; } } @@ -140,7 +136,7 @@ return FALSE; } - if(pTitle) + if (pTitle) SetWindowTextW(pgContext->hStatusWindow, pTitle); SetDlgItemTextW(pgContext->hStatusWindow, IDC_STATUSLABEL, pMessage); @@ -155,8 +151,7 @@ if (pgContext->hStatusWindow) { EndDialog(pgContext->hStatusWindow, 0); - pgContext->hStatusWindow = 0; - pgContext->SignaledStatusWindowCreated = FALSE; + pgContext->hStatusWindow = NULL; } return TRUE; Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Fri Jul 25 13:45:54 2008 @@ -18,7 +18,6 @@ PWLX_DISPATCH_VERSION_1_3 pWlxFuncs; HANDLE hDllInstance; HWND hStatusWindow; - BOOL SignaledStatusWindowCreated; DWORD AutoLogonState; /* Informations to be filled during logon */

16 years, 1 month

[sserapion] 34787: Fix Warnings

by sserapion＠svn.reactos.org

Author: sserapion Date: Fri Jul 25 11:49:23 2008 New Revision: 34787 URL: http://svn.reactos.org/svn/reactos?rev=34787&view=rev Log: Fix Warnings Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -626,7 +626,7 @@ MoveDragCardTo(hdc, ix, iy); - if(attarget || ix == idestx && iy == idesty) + if(attarget || (ix == idestx && iy == idesty)) break; oldx = (int)x; Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -198,7 +198,7 @@ } -BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { @@ -356,7 +356,7 @@ } -BOOL CALLBACK CardBackDlgProc(HWND hDlg, +INT_PTR CALLBACK CardBackDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -183,7 +183,7 @@ SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } - switch (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff) + switch (PtrToLong(hRootKey)) { case (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff): _tcscpy(Path, _T("HKLM\\\0")); Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -9,7 +9,7 @@ #include "precomp.h" -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { HWND hLicenseEditWnd; Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -34,7 +34,7 @@ } MAIN_WND_INFO, *PMAIN_WND_INFO; -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); /* devmgmt.c */ Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -9,7 +9,7 @@ #include "precomp.h" -BOOL CALLBACK +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -164,7 +164,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK CreateHelpDialogProc(HWND hDlg, UINT message, WPARAM wParam, @@ -221,7 +221,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -56,7 +56,7 @@ } -BOOL CALLBACK +INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -43,10 +43,10 @@ } MAIN_WND_INFO, *PMAIN_WND_INFO; -BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); /* servman.c */ Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -56,7 +56,7 @@ } } -BOOL CALLBACK +INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, Modified: branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -1021,7 +1021,7 @@ } -static BOOL CALLBACK +static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT Message, WPARAM wParam, Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="ping" type="win32cui" installbase="system32" installname="ping.exe"> +<module name="ping" type="win32cui" installbase="system32" installname="ping.exe" allowwarnings="true"> <include base="ping">.</include> <define name="__USE_W32_SOCKETS" /> <define name="_WIN32_IE">0x600</define> Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -842,7 +842,7 @@ dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) : DC_NOMSG; WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name); if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0); - if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD)Callbacks, 0); + if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS, (DWORD_PTR)Callbacks, 0); } else WINE_WARN("OOM\n"); } Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Fri Jul 25 11:49:23 2008 @@ -27,6 +27,7 @@ #include <ctype.h> #include <stdio.h> #include <assert.h> +#include <tchar.h> #include <windows.h> #include <richedit.h> @@ -583,7 +584,7 @@ fontinfo.lfPitchAndFamily = 0; EnumFontFamiliesExW(hdc, &fontinfo, enum_font_proc, - (LPARAM)hListWnd, 0); + (LPARAM)(UINT_PTR)hListWnd, 0); ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); @@ -1115,7 +1116,7 @@ } if (opt_print) - MessageBox(hMainWnd, "Printing not implemented", "WordPad", MB_OK); + MessageBox(hMainWnd, _T("Printing not implemented"), _T("WordPad"), MB_OK); } static LRESULT handle_findmsg(LPFINDREPLACEW pFr) @@ -1279,7 +1280,7 @@ ZeroMemory(&cbItem, sizeof(cbItem)); cbItem.mask = CBEIF_TEXT; cbItem.iItem = idx; - cbItem.pszText = szBuffer; + cbItem.pszText = (ULONG_PTR)szBuffer; cbItem.cchTextMax = bufferLength-1; result = SendMessage(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem); if (!result) @@ -1795,7 +1796,7 @@ if (!hEditorWnd) { - fprintf(stderr, "Error code %u\n", GetLastError()); + fprintf(stderr, _T("Error code %d\n"), GetLastError()); return -1; } assert(hEditorWnd); @@ -1987,7 +1988,7 @@ mi.cbSize = sizeof(MENUITEMINFOW); mi.fMask = MIIM_DATA; if(GetMenuItemInfoW(hMenu, LOWORD(wParam), FALSE, &mi)) - DoOpenFile((LPWSTR)mi.dwItemData); + DoOpenFile((LPWSTR)(ULONG_PTR)mi.dwItemData); } break;

16 years, 1 month

[sserapion] 34786: Fix broken DLGPROC definition. Fix previous, unneeded, fixes.

by sserapion＠svn.reactos.org

Author: sserapion Date: Fri Jul 25 11:00:47 2008 New Revision: 34786 URL: http://svn.reactos.org/svn/reactos?rev=34786&view=rev Log: Fix broken DLGPROC definition. Fix previous, unneeded, fixes. Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c branches/ros-amd64-bringup/reactos/base/applications/charmap/charmap.c branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/mainwnd.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/mainwnd.c branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c branches/ros-amd64-bringup/reactos/base/applications/notepad/main.c branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lex.yy.c branches/ros-amd64-bringup/reactos/include/psdk/winuser.h Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -1303,7 +1303,7 @@ SetFocus(GetDlgItem(hWnd, IDC_BUTTON_FOCUS)); switch (LOWORD(wp)) { case IDM_HELP_ABOUT: - DialogBox(calc.hInstance,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWnd,(DLGPROC) AboutDlgProc); + DialogBox(calc.hInstance,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWnd, AboutDlgProc); return TRUE; case IDM_HELP_HELP: #ifndef DISABLE_HTMLHELP_SUPPORT @@ -1626,7 +1626,7 @@ if (IsWindow(calc.hStatWnd)) break; calc.hStatWnd = CreateDialog(calc.hInstance, - MAKEINTRESOURCE(IDD_DIALOG_STAT), hWnd, (DLGPROC)DlgStatProc); + MAKEINTRESOURCE(IDD_DIALOG_STAT), hWnd, DlgStatProc); if (calc.hStatWnd != NULL) { enable_allowed_controls(hWnd, calc.base); SendMessage(calc.hStatWnd, WM_SETFOCUS, 0, 0); @@ -1715,7 +1715,7 @@ else dwLayout = IDD_DIALOG_STANDARD; - CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, (DLGPROC)DlgMainProc); + CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, DlgMainProc); while (GetMessage(&msg, NULL, 0, 0)) { #ifndef USE_KEYBOARD_HOOK Modified: branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -79,5 +79,5 @@ DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_ABOUTBOX), hWndParent, - (DLGPROC)AboutDialogProc); + AboutDialogProc); } Modified: branches/ros-amd64-bringup/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/charmap/charmap.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -182,7 +182,7 @@ } -static BOOL CALLBACK +static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT Message, WPARAM wParam, @@ -351,7 +351,7 @@ Ret = DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_CHARMAP), NULL, - (DLGPROC)DlgProc) >= 0; + DlgProc) >= 0; UnregisterMapClasses(hInstance); } Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -338,7 +338,7 @@ break; pContext->hDisplayWnd = hDlgs; - hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, (DLGPROC)DisplayPageWndProc, (LPARAM)pContext); + hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG), pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pContext); if (!hwndDlg) break; Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -119,11 +119,11 @@ pContext->hTabCtrl = hTabCtrlWnd; /* create the dialogs */ - pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), hTabCtrlWnd, (DLGPROC)SystemPageWndProc, (LPARAM)pContext); - pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), hTabCtrlWnd, (DLGPROC)MusicPageWndProc, (LPARAM)pContext); - pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), hTabCtrlWnd, (DLGPROC)InputPageWndProc, (LPARAM)pContext); - pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), hTabCtrlWnd, (DLGPROC)NetworkPageWndProc, (LPARAM)pContext); - pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), hTabCtrlWnd, (DLGPROC)HelpPageWndProc, (LPARAM)pContext); + pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), hTabCtrlWnd, SystemPageWndProc, (LPARAM)pContext); + pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), hTabCtrlWnd, MusicPageWndProc, (LPARAM)pContext); + pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), hTabCtrlWnd, InputPageWndProc, (LPARAM)pContext); + pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), hTabCtrlWnd, NetworkPageWndProc, (LPARAM)pContext); + pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), hTabCtrlWnd, HelpPageWndProc, (LPARAM)pContext); /* insert tab ctrl items */ @@ -238,7 +238,7 @@ hInst = hInstance; - DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, (DLGPROC) DxDiagWndProc); + DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc); return 0; } Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -209,7 +209,7 @@ return FALSE; pContext->hSoundWnd = hDlgs; - hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hMainDialog, (DLGPROC)SoundPageWndProc, (LPARAM)pContext); + hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hMainDialog, SoundPageWndProc, (LPARAM)pContext); if (!hwndDlg) return FALSE; Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -21,12 +21,12 @@ TCITEM item; hTabWnd = GetDlgItem(hWnd, IDC_TAB); - hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, (DLGPROC) GeneralPageWndProc); - hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, (DLGPROC) SystemPageWndProc); - hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, (DLGPROC) FreeLdrPageWndProc); - hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, (DLGPROC) ServicesPageWndProc); - hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, (DLGPROC) StartupPageWndProc); - hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, (DLGPROC) ToolsPageWndProc); + hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc); + hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, SystemPageWndProc); + hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc); + hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); + hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc); + hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); LoadString(hInst, IDS_MSCONFIG, szTemp, 256); SetWindowText(hWnd, szTemp); @@ -222,7 +222,7 @@ hInst = hInstance; - DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, (DLGPROC) MsConfigWndProc); + DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc); return 0; } Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/mainwnd.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -464,7 +464,7 @@ DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), Info->hMainWnd, - (DLGPROC)AboutDialogProc); + AboutDialogProc); SetFocus(Info->hTreeView); } Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -302,7 +302,7 @@ hHelp = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DLG_HELP_OPTIONS), hDlg, - (DLGPROC)CreateHelpDialogProc); + CreateHelpDialogProc); if(hHelp != NULL) { bHelpOpen = TRUE; Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -432,7 +432,7 @@ ret = DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DLG_CREATE), Info->hMainWnd, - (DLGPROC)CreateDialogProc, + CreateDialogProc, (LPARAM)Info); if (ret == IDOK) RefreshServiceList(Info); @@ -448,7 +448,7 @@ DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_DLG_DELETE), Info->hMainWnd, - (DLGPROC)DeleteDialogProc, + DeleteDialogProc, (LPARAM)Info); } else @@ -569,7 +569,7 @@ DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), Info->hMainWnd, - (DLGPROC)AboutDialogProc); + AboutDialogProc); SetFocus(Info->hListView); break; Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -113,7 +113,7 @@ hProgDlg = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_DLG_PROGRESS), hParent, - (DLGPROC)ProgressDialogProc); + ProgressDialogProc); if (hProgDlg != NULL) { /* write the info to the progress dialog */ Modified: branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -986,7 +986,7 @@ if (CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_GENERAL), pInfo->hTab, - (DLGPROC)GeneralDlgProc, + GeneralDlgProc, (LPARAM)pInfo)) { WCHAR str[256]; @@ -1001,7 +1001,7 @@ if (CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY), pInfo->hTab, - (DLGPROC)DisplayDlgProc, + DisplayDlgProc, (LPARAM)pInfo)) { WCHAR str[256]; @@ -1233,6 +1233,6 @@ return (DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_CONNECTDIALOG), NULL, - (DLGPROC)DlgProc, + DlgProc, (LPARAM)pRdpSettings) == IDOK); } Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -851,7 +851,7 @@ } nLine = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(DIALOG_GOTO), - Globals.hMainWnd, (DLGPROC)DIALOG_GoTo_DialogProc, nLine); + Globals.hMainWnd, DIALOG_GoTo_DialogProc, nLine); if (nLine >= 1) { @@ -981,7 +981,7 @@ VOID DIALOG_FilePageSetup(void) { DialogBox(Globals.hInstance, MAKEINTRESOURCE(DIALOG_PAGESETUP), - Globals.hMainWnd, (DLGPROC)DIALOG_PAGESETUP_DlgProc); + Globals.hMainWnd, DIALOG_PAGESETUP_DlgProc); } Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/notepad/main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/notepad/main.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -91,7 +91,7 @@ case CMD_ABOUT: DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_ABOUTBOX), Globals.hMainWnd, - (DLGPROC) AboutDialogProc); + AboutDialogProc); break; case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lex.yy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -1662,7 +1662,7 @@ void macro_test(void) { WNDPROC lpfnDlg = MakeProcInstance(MACRO_TestDialogProc, Globals.hInstance); - DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd, (DLGPROC)lpfnDlg); + DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd, lpfnDlg); FreeProcInstance(lpfnDlg); macro = szTestMacro; } Modified: branches/ros-amd64-bringup/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] Fri Jul 25 11:00:47 2008 @@ -2691,7 +2691,7 @@ #define STATE_SYSTEM_VALID 0x1fffffff #ifndef RC_INVOKED -typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); +typedef INT_PTR(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM); typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD); typedef BOOL(CALLBACK *GRAYSTRINGPROC)(HDC,LPARAM,int); typedef LRESULT(CALLBACK *HOOKPROC)(int,WPARAM,LPARAM);

16 years, 1 month

[sserapion] 34785: Fix all 64 bit warnings. Switch over to spec file, taken from WINE.

by sserapion＠svn.reactos.org

Author: sserapion Date: Fri Jul 25 09:13:04 2008 New Revision: 34785 URL: http://svn.reactos.org/svn/reactos?rev=34785&view=rev Log: Fix all 64 bit warnings. Switch over to spec file, taken from WINE. Added: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec (with props) Removed: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.rbuild branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/scm.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c Removed: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.def (removed) @@ -1,707 +1,0 @@ -; $Id$ -; -; advapi32.def -; -; ReactOS Operating System -; -LIBRARY advapi32.dll -EXPORTS -A_SHAFinal@8 -A_SHAInit@4 -A_SHAUpdate@12 -AbortSystemShutdownA@4 -AbortSystemShutdownW@4 -AccessCheck@32 -AccessCheckAndAuditAlarmA@44 -AccessCheckAndAuditAlarmW@44 -;AccessCheckByType -AccessCheckByTypeAndAuditAlarmA@64 -AccessCheckByTypeAndAuditAlarmW@64 -;AccessCheckByTypeResultList@44 -AccessCheckByTypeResultListAndAuditAlarmA@64 -AccessCheckByTypeResultListAndAuditAlarmByHandleA@68 -AccessCheckByTypeResultListAndAuditAlarmByHandleW@68 -AccessCheckByTypeResultListAndAuditAlarmW@64 -AddAccessAllowedAce@16 -AddAccessAllowedAceEx@20 -AddAccessAllowedObjectAce@28 -AddAccessDeniedAce@16 -AddAccessDeniedAceEx@20 -AddAccessDeniedObjectAce@28 -AddAce@20 -AddAuditAccessAce@24 -AddAuditAccessAceEx@28 -AddAuditAccessObjectAce@36 -AddMandatoryAce@20 -AddUsersToEncryptedFile@8 -AdjustTokenGroups@24 -AdjustTokenPrivileges@24 -AllocateAndInitializeSid@44 -AllocateLocallyUniqueId@4 -AreAllAccessesGranted@8 -AreAnyAccessesGranted@8 -BackupEventLogA@8 -BackupEventLogW@8 -BuildExplicitAccessWithNameA@20 -BuildExplicitAccessWithNameW@20 -BuildImpersonateExplicitAccessWithNameA@24 -BuildImpersonateExplicitAccessWithNameW@24 -BuildImpersonateTrusteeA@8 -BuildImpersonateTrusteeW@8 -BuildSecurityDescriptorA@36 -BuildSecurityDescriptorW@36 -BuildTrusteeWithNameA@8 -BuildTrusteeWithNameW@8 -BuildTrusteeWithObjectsAndNameA@24 -BuildTrusteeWithObjectsAndNameW@24 -BuildTrusteeWithObjectsAndSidA@20 -BuildTrusteeWithObjectsAndSidW@20 -BuildTrusteeWithSidA@8 -BuildTrusteeWithSidW@8 -;CancelOverlappedAccess@4 -ChangeServiceConfig2A@12 -ChangeServiceConfig2W@12 -ChangeServiceConfigA@44 -ChangeServiceConfigW@44 -CheckTokenMembership@12 -ClearEventLogA@8 -ClearEventLogW@8 -;CloseCodeAuthzLevel@4 -;CloseEncryptedFileRaw -CloseEventLog@4 -CloseServiceHandle@4 -;CloseTrace@8 -CommandLineFromMsiDescriptor@12 -;ComputeAccessTokenFromCodeAuthzLevel@20 -ControlService@12 -ControlServiceEx@16 -;ControlTraceA@12 -;ControlTraceW@12 -;ConvertAccessToSecurityDescriptorA@20 -;ConvertAccessToSecurityDescriptorW@20 -;ConvertSDToStringSDRootDomainA@24 -;ConvertSDToStringSDRootDomainW@24 -;ConvertSecurityDescriptorToAccessA@28 -;ConvertSecurityDescriptorToAccessNamedA=ConvertSecurityDescriptorToAccessA@28 -;ConvertSecurityDescriptorToAccessNamedW=ConvertSecurityDescriptorToAccessW@28 -;ConvertSecurityDescriptorToAccessW@28 -ConvertSecurityDescriptorToStringSecurityDescriptorA@20 -ConvertSecurityDescriptorToStringSecurityDescriptorW@20 -ConvertSidToStringSidA@8 -ConvertSidToStringSidW@8 -;ConvertStringSDToSDDomainA@24 -;ConvertStringSDToSDDomainW@24 -;ConvertStringSDToSDRootDomainA@20 -;ConvertStringSDToSDRootDomainW@20 -ConvertStringSecurityDescriptorToSecurityDescriptorA@16 -ConvertStringSecurityDescriptorToSecurityDescriptorW@16 -ConvertStringSidToSidA@8 -ConvertStringSidToSidW@8 -ConvertToAutoInheritPrivateObjectSecurity@24 -CopySid@12 -;CreateCodeAuthzLevel@20 -CreatePrivateObjectSecurity@24 -CreatePrivateObjectSecurityEx@32 -CreatePrivateObjectSecurityWithMultipleInheritance@36 -CreateProcessAsUserA@44 -;CreateProcessAsUserSecure -CreateProcessAsUserW@44 -;CreateProcessWithLogonW -CreateRestrictedToken@36 -CreateServiceA@52 -CreateServiceW@52 -;CreateTraceInstanceId@8 -CreateWellKnownSid@16 -;CredDeleteA@12 -;CredDeleteW@12 -;CredEnumerateA@16 -;CredEnumerateW@16 -;CredFree@4 -;CredGetSessionTypes@8 -;CredGetTargetInfoA@12 -;CredGetTargetInfoW@12 -;CredIsMarshaledCredentialA@4 -;CredIsMarshaledCredentialW@4 -;CredMarshalCredentialA@12 -;CredMarshalCredentialW@12 -;CredProfileLoaded -;CredReadA -;CredReadDomainCredentialsA -;CredReadDomainCredentialsW -;CredReadW -;CredRenameA -;CredRenameW -;CredUnmarshalCredentialA -;CredUnmarshalCredentialW -;CredWriteA -;CredWriteDomainCredentialsA -;CredWriteDomainCredentialsW -;CredWriteW -;CredpConvertCredential -;CredpConvertTargetInfo -;CredpDecodeCredential -;CredpEncodeCredential -CryptAcquireContextA@20 -CryptAcquireContextW@20 -CryptContextAddRef@12 -CryptCreateHash@20 -CryptDecrypt@24 -CryptDeriveKey@20 -CryptDestroyHash@4 -CryptDestroyKey@4 -CryptDuplicateHash@16 -CryptDuplicateKey@16 -CryptEncrypt@28 -CryptEnumProviderTypesA@24 -CryptEnumProviderTypesW@24 -CryptEnumProvidersA@24 -CryptEnumProvidersW@24 -CryptExportKey@24 -CryptGenKey@16 -CryptGenRandom@12 -CryptGetDefaultProviderA@20 -CryptGetDefaultProviderW@20 -CryptGetHashParam@20 -CryptGetKeyParam@20 -CryptGetProvParam@20 -CryptGetUserKey@12 -CryptHashData@16 -CryptHashSessionKey@12 -CryptImportKey@24 -CryptReleaseContext@8 -CryptSetHashParam@16 -CryptSetKeyParam@16 -CryptSetProvParam@16 -CryptSetProviderA@8 -CryptSetProviderExA@16 -CryptSetProviderExW@16 -CryptSetProviderW@8 -CryptSignHashA@24 -CryptSignHashW@24 -CryptVerifySignatureA@24 -CryptVerifySignatureW@24 -DecryptFileA@8 -DecryptFileW@8 -DeleteAce@8 -DeleteService@4 -DeregisterEventSource@4 -DestroyPrivateObjectSecurity@4 -;DuplicateEncryptionInfoFile -DuplicateToken@12 -DuplicateTokenEx@24 -;ElfBackupEventLogFileA@8 -;ElfBackupEventLogFileW@8 -;ElfChangeNotify@8 -;ElfClearEventLogFileA@8 -;ElfClearEventLogFileW@8 -;ElfCloseEventLog@4 -;ElfDeregisterEventSource@4 -;ElfNumberOfRecords@8 -;ElfOldestRecord@8 -;ElfOpenBackupEventLogA@12 -;ElfOpenBackupEventLogW@12 -;ElfOpenEventLogA@12 -;ElfOpenEventLogW@12 -;ElfReadEventLogA@28 -;ElfReadEventLogW@28 -;ElfRegisterEventSourceA@12 -;ElfRegisterEventSourceW@12 -;ElfReportEventA@48 -;ElfReportEventW@48 -;EnableTrace -EncryptFileA@4 -EncryptFileW@4 -;EncryptedFileKeyInfo -EncryptionDisable@8 -EnumDependentServicesA@24 -EnumDependentServicesW@24 -EnumServiceGroupW@36 -EnumServicesStatusA@32 -EnumServicesStatusExA@40 -EnumServicesStatusExW@40 -EnumServicesStatusW@32 -;EnumerateTraceGuids -EqualDomainSid@12 -EqualPrefixSid@8 -EqualSid@8 -FileEncryptionStatusA@8 -FileEncryptionStatusW@8 -FindFirstFreeAce@8 -;FlushTraceA -;FlushTraceW -;FreeEncryptedFileKeyInfo -FreeEncryptionCertificateHashList@4 -FreeInheritedFromArray@12 -FreeSid@4 -;GetAccessPermissionsForObjectA -;GetAccessPermissionsForObjectW -GetAce@12 -GetAclInformation@16 -GetAuditedPermissionsFromAclA@16 -GetAuditedPermissionsFromAclW@16 -GetCurrentHwProfileA@4 -GetCurrentHwProfileW@4 -GetEffectiveRightsFromAclA@12 -GetEffectiveRightsFromAclW@12 -;GetEventLogInformation -GetExplicitEntriesFromAclA(a)12=ADVAPI32.GetExplicitEntriesFromAclW -GetExplicitEntriesFromAclW@12 -GetFileSecurityA@20 -GetFileSecurityW@20 -;GetInformationCodeAuthzLevelW -;GetInformationCodeAuthzPolicyW -GetInheritanceSourceA@40 -GetInheritanceSourceW@40 -GetKernelObjectSecurity@20 -GetLengthSid@4 -;GetLocalManagedApplicationData -;GetLocalManagedApplications -;GetManagedApplicationCategories -;GetManagedApplications -GetMultipleTrusteeA@4 -GetMultipleTrusteeOperationA@4 -GetMultipleTrusteeOperationW@4 -GetMultipleTrusteeW@4 -GetNamedSecurityInfoA@32 -;GetNamedSecurityInfoExA -;GetNamedSecurityInfoExW -GetNamedSecurityInfoW@32 -GetNumberOfEventLogRecords@8 -GetOldestEventLogRecord@8 -;GetOverlappedAccessResults -GetPrivateObjectSecurity@20 -GetSecurityDescriptorControl@12 -GetSecurityDescriptorDacl@16 -GetSecurityDescriptorGroup@12 -GetSecurityDescriptorLength(a)4=NTDLL.RtlLengthSecurityDescriptor -GetSecurityDescriptorOwner@12 -GetSecurityDescriptorRMControl@8 -GetSecurityDescriptorSacl@16 -GetSecurityInfo@32 -GetSecurityInfoExA@36 -GetSecurityInfoExW@36 -GetServiceDisplayNameA@16 -GetServiceDisplayNameW@16 -GetServiceKeyNameA@16 -GetServiceKeyNameW@16 -GetSidIdentifierAuthority@4 -GetSidLengthRequired@4 -GetSidSubAuthority@8 -GetSidSubAuthorityCount@4 -GetSiteSidFromToken@4 -GetTokenInformation@20 -GetTraceEnableFlags@8 -GetTraceEnableLevel@8 -GetTraceLoggerHandle@4 -GetTrusteeFormA@4 -GetTrusteeFormW@4 -GetTrusteeNameA@4 -GetTrusteeNameW@4 -GetTrusteeTypeA@4 -GetTrusteeTypeW@4 -GetUserNameA@8 -GetUserNameW@8 -GetWindowsAccountDomainSid@12 -;I_ScGetCurrentGroupStateW@12 -;I_ScIsSecurityProcess -;I_ScPnPGetServiceName -;I_ScSendTSMessage -;I_ScSetServiceBitsA@20 -;I_ScSetServiceBitsW@20 -;IdentifyCodeAuthzLevelW -ImpersonateAnonymousToken@4 -ImpersonateLoggedOnUser@4 -ImpersonateNamedPipeClient@4 -ImpersonateSelf@4 -InitializeAcl@12 -InitializeSecurityDescriptor@8 -InitializeSid@12 -InitiateSystemShutdownA@20 -;InitiateSystemShutdownExA@24 -InitiateSystemShutdownExW@24 -InitiateSystemShutdownW@20 -;InstallApplication -IsTextUnicode(a)12=NTDLL.RtlIsTextUnicode -IsTokenRestricted@4 -;IsTokenUntrusted -IsValidAcl@4 -IsValidSecurityDescriptor@4 -IsValidSid@4 -IsWellKnownSid@8 -LockServiceDatabase@4 -LogonUserA@24 -;LogonUserExA -;LogonUserExW -LogonUserW@24 -LookupAccountNameA@28 -LookupAccountNameW@28 -LookupAccountSidA@28 -LookupAccountSidW@28 -LookupPrivilegeDisplayNameA@20 -LookupPrivilegeDisplayNameW@20 -LookupPrivilegeNameA@16 -LookupPrivilegeNameW@16 -LookupPrivilegeValueA@12 -LookupPrivilegeValueW@12 -;LookupSecurityDescriptorPartsA@28 -;LookupSecurityDescriptorPartsW@28 -LsaAddAccountRights@16 -;LsaAddPrivilegesToAccount@8 -;LsaClearAuditLog@4 -LsaClose@4 -;LsaCreateAccount@16 -;LsaCreateSecret@16 -;LsaCreateTrustedDomain@16 -;LsaCreateTrustedDomainEx -LsaDelete@4 -;LsaDeleteTrustedDomain@8 -LsaEnumerateAccountRights@16 -;LsaEnumerateAccounts@20 -LsaEnumerateAccountsWithUserRight@16 -;LsaEnumeratePrivileges@20 -;LsaEnumeratePrivilegesOfAccount@8 -LsaEnumerateTrustedDomains@20 -;LsaEnumerateTrustedDomainsEx -LsaFreeMemory@4 -;LsaGetQuotasForAccount@8 -;LsaGetRemoteUserName -;LsaGetSystemAccessAccount@8 -LsaGetUserName@8 -;LsaICLookupNames@32 -;LsaICLookupNamesWithCreds -;LsaICLookupSids@32 -;LsaICLookupSidsWithCreds -;LsaLookupNames@20 -LsaLookupNames2@24 -;LsaLookupPrivilegeDisplayName@16 -;LsaLookupPrivilegeName@12 -;LsaLookupPrivilegeValue@12 -LsaLookupSids@20 -LsaNtStatusToWinError@4 -;LsaOpenAccount@16 -LsaOpenPolicy@16 -;LsaOpenPolicySce -;LsaOpenSecret@16 -;LsaOpenTrustedDomain@16 -;LsaOpenTrustedDomainByName -;LsaQueryDomainInformationPolicy -;LsaQueryForestTrustInformation -LsaQueryInfoTrustedDomain@12 -LsaQueryInformationPolicy@12 -;LsaQuerySecret@20 -;LsaQuerySecurityObject@12 -;LsaQueryTrustedDomainInfo@16 -;LsaQueryTrustedDomainInfoByName -LsaRemoveAccountRights@20 -;LsaRemovePrivilegesFromAccount@12 -LsaRetrievePrivateData@12 -LsaSetInformationPolicy@12 -;LsaSetForestTrustInformation -;LsaSetInformationPolicy -;LsaSetInformationTrustedDomain@12 -;LsaSetQuotasForAccount@8 -;LsaSetSecret@12 -;LsaSetSecurityObject@12 -;LsaSetSystemAccessAccount@8 -;LsaSetTrustedDomainInfoByName -;LsaSetTrustedDomainInformation@16 -LsaStorePrivateData@12 -MD4Final@4 -MD4Init@4 -MD4Update@12 -MD5Final@4 -MD5Init@4 -MD5Update@12 -;MSChapSrvChangePassword -;MSChapSrvChangePassword2 -MakeAbsoluteSD@44 -MakeAbsoluteSD2@8 -MakeSelfRelativeSD@12 -MapGenericMask(a)8=NTDLL.RtlMapGenericMask -NotifyBootConfigStatus@4 -NotifyChangeEventLog@8 -ObjectCloseAuditAlarmA@12 -ObjectCloseAuditAlarmW@12 -ObjectDeleteAuditAlarmA@12 -ObjectDeleteAuditAlarmW@12 -ObjectOpenAuditAlarmA@48 -ObjectOpenAuditAlarmW@48 -ObjectPrivilegeAuditAlarmA@24 -ObjectPrivilegeAuditAlarmW@24 -OpenBackupEventLogA@8 -OpenBackupEventLogW@8 -;OpenEncryptedFileRawA -;OpenEncryptedFileRawW -OpenEventLogA@8 -OpenEventLogW@8 -OpenProcessToken@12 -OpenSCManagerA@12 -OpenSCManagerW@12 -OpenServiceA@12 -OpenServiceW@12 -OpenThreadToken@16 -;OpenTraceA -;OpenTraceW -PrivilegeCheck@12 -PrivilegedServiceAuditAlarmA@20 -PrivilegedServiceAuditAlarmW@20 -;ProcessIdleTasks -;ProcessTrace -;ProvAccessRightsToNTAccessMask ; ? -;QueryAllTracesA -;QueryAllTracesW -QueryRecoveryAgentsOnEncryptedFile@8 -QuerySecurityAccessMask@8 -QueryServiceConfig2A@20 -QueryServiceConfig2W@20 -QueryServiceConfigA@16 -QueryServiceConfigW@16 -QueryServiceLockStatusA@16 -QueryServiceLockStatusW@16 -QueryServiceObjectSecurity@20 -QueryServiceStatus@8 -QueryServiceStatusEx@20 -;QueryTraceA -;QueryTraceW -QueryUsersOnEncryptedFile@8 -;QueryWindows31FilesMigration@4 -;ReadEncryptedFileRaw -ReadEventLogA@28 -ReadEventLogW@28 -RegCloseKey@4 -RegConnectRegistryA@12 -RegConnectRegistryW@12 -RegCopyTreeA@12 -RegCopyTreeW@12 -RegCreateKeyA@12 -RegCreateKeyExA@36 -RegCreateKeyExW@36 -RegCreateKeyW@12 -RegDeleteKeyA@8 -RegDeleteKeyW@8 -RegDeleteKeyExA@16 -RegDeleteKeyExW@16 -RegDeleteKeyValueA@12 -RegDeleteKeyValueW@12 -RegDeleteTreeA@8 -RegDeleteTreeW@8 -RegDeleteValueA@8 -RegDeleteValueW@8 -RegDisablePredefinedCache@0 -RegDisablePredefinedCacheEx@0 -RegDisableReflectionKey@4 -RegEnableReflectionKey@4 -RegEnumKeyA@16 -RegEnumKeyExA@32 -RegEnumKeyExW@32 -RegEnumKeyW@16 -RegEnumValueA@32 -RegEnumValueW@32 -RegFlushKey@4 -RegGetKeySecurity@16 -RegGetValueA@28 -RegGetValueW@28 -RegLoadKeyA@12 -RegLoadKeyW@12 -RegLoadMUIStringA@28 -RegLoadMUIStringW@28 -RegNotifyChangeKeyValue@20 -RegOpenCurrentUser@8 -RegOpenKeyA@12 -RegOpenKeyExA@20 -RegOpenKeyExW@20 -RegOpenKeyW@12 -RegOpenUserClassesRoot@16 -RegOverridePredefKey@8 -RegQueryInfoKeyA@48 -RegQueryInfoKeyW@48 -RegQueryMultipleValuesA@20 -RegQueryMultipleValuesW@20 -RegQueryReflectionKey@8 -RegQueryValueA@16 -RegQueryValueExA@24 -RegQueryValueExW@24 -RegQueryValueW@16 -RegReplaceKeyA@16 -RegReplaceKeyW@16 -RegRestoreKeyA@12 -RegRestoreKeyW@12 -RegSaveKeyA@12 -;RegSaveKeyExA -;RegSaveKeyExW -RegSaveKeyW@12 -RegSetKeySecurity@12 -RegSetKeyValueA@24 -RegSetKeyValueW@24 -RegSetValueA@20 -RegSetValueExA@24 -RegSetValueExW@24 -RegSetValueW@20 -RegUnLoadKeyA@8 -RegUnLoadKeyW@8 -RegisterEventSourceA@8 -RegisterEventSourceW@8 -;RegisterIdleTask -RegisterServiceCtrlHandlerA@8 -RegisterServiceCtrlHandlerExA@12 -RegisterServiceCtrlHandlerExW@12 -RegisterServiceCtrlHandlerW@8 -RegisterTraceGuidsA@32 -RegisterTraceGuidsW@32 -;RemoveTraceCallback -RemoveUsersFromEncryptedFile@8 -ReportEventA@36 -ReportEventW@36 -RevertToSelf@0 -;SaferCloseLevel -;SaferComputeTokenFromLevel -;SaferCreateLevel -;SaferGetLevelInformation -;SaferGetPolicyInformation -;SaferIdentifyLevel -;SaferRecordEventLogEntry -;SaferSetLevelInformation -;SaferSetPolicyInformation -;SaferiChangeRegistryScope -;SaferiCompareTokenLevels -;SaferiIsExecutableFileType -;SaferiPopulateDefaultsInRegistry -;SaferiRecordEventLogEntry -;SaferiReplaceProcessThreadTokens -;SaferiSearchMatchingHashRules -SetAclInformation@16 -;SetEntriesInAccessListA -;SetEntriesInAccessListW -SetEntriesInAclA@16 -SetEntriesInAclW@16 -;SetEntriesInAuditListA -;SetEntriesInAuditListW -SetFileSecurityA@12 -SetFileSecurityW@12 -;SetInformationCodeAuthzLevelW -;SetInformationCodeAuthzPolicyW -SetKernelObjectSecurity@12 -SetNamedSecurityInfoA@28 -;SetNamedSecurityInfoExA -;SetNamedSecurityInfoExW -SetNamedSecurityInfoW@28 -SetPrivateObjectSecurity@20 -;SetPrivateObjectSecurityEx -SetSecurityAccessMask@8 -SetSecurityDescriptorControl@12 -SetSecurityDescriptorDacl@16 -SetSecurityDescriptorGroup@12 -SetSecurityDescriptorOwner@12 -SetSecurityDescriptorRMControl@8 -SetSecurityDescriptorSacl@16 -SetSecurityInfo@28 -;SetSecurityInfoExA -;SetSecurityInfoExW -SetServiceBits@16 -SetServiceObjectSecurity@12 -SetServiceStatus@8 -SetThreadToken@8 -SetTokenInformation@16 -;SetTraceCallback -;SetUserFileEncryptionKey -StartServiceA@12 -StartServiceCtrlDispatcherA@4 -StartServiceCtrlDispatcherW@4 -StartServiceW@12 -;StartTraceA -;StartTraceW -;StopTraceA -;StopTraceW -;SynchronizeWindows31FilesAndWindowsNTRegistry@16 -SystemFunction001@12 -SystemFunction002@12 -SystemFunction003@8 -SystemFunction004@12 -SystemFunction005@12 -SystemFunction006@8 -SystemFunction007@8 -SystemFunction008@12 -SystemFunction009@12 -SystemFunction010@12 -SystemFunction011@12=ADVAPI32.SystemFunction010@12 -SystemFunction012@12 -SystemFunction013@12 -SystemFunction014@12=ADVAPI32.SystemFunction012@12 -SystemFunction015@12=ADVAPI32.SystemFunction013@13 -SystemFunction016@12=ADVAPI32.SystemFunction012@12 -SystemFunction017@12=ADVAPI32.SystemFunction013@12 -SystemFunction018@12=ADVAPI32.SystemFunction012@12 -SystemFunction019@12=ADVAPI32.SystemFunction013@12 -SystemFunction020@12=ADVAPI32.SystemFunction012@12 -SystemFunction021@12=ADVAPI32.SystemFunction013@12 -SystemFunction022@12=ADVAPI32.SystemFunction012@12 -SystemFunction023@12=ADVAPI32.SystemFunction013@12 -SystemFunction024@12 -SystemFunction025@12 -SystemFunction026@12=ADVAPI32.SystemFunction024@12 -SystemFunction027@12=ADVAPI32.SystemFunction025@12 -SystemFunction028@8 -SystemFunction029@8 -SystemFunction030@8 -SystemFunction031@8=ADVAPI32.SystemFunction030@8 -SystemFunction032@8 -SystemFunction033@8 -SystemFunction034@8 -SystemFunction035@4 -SystemFunction036@8 -SystemFunction040@12 -SystemFunction041@12 -TraceEvent@12 -;TraceEventInstance -TraceMessage -;TraceMessageVa -TreeResetNamedSecurityInfoA@44 -TreeResetNamedSecurityInfoW@44 -;TrusteeAccessToObjectA -;TrusteeAccessToObjectW -;UninstallApplication -UnlockServiceDatabase@4 -;UnregisterIdleTask -UnregisterTraceGuids@8 -;UpdateTraceA -;UpdateTraceW -;WdmWmiServiceMain -;WmiCloseBlock -;WmiCloseTraceWithCursor -;WmiConvertTimestamp -;WmiDevInstToInstanceNameA -;WmiDevInstToInstanceNameW -;WmiEnumerateGuids -;WmiExecuteMethodA -;WmiExecuteMethodW -;WmiFileHandleToInstanceNameA -;WmiFileHandleToInstanceNameW -;WmiFreeBuffer -;WmiGetFirstTraceOffset -;WmiGetNextEvent -;WmiGetTraceHeader -;WmiMofEnumerateResourcesA -;WmiMofEnumerateResourcesW -;WmiNotificationRegistrationA -;WmiNotificationRegistrationW -;WmiOpenBlock -;WmiOpenTraceWithCursor -;WmiParseTraceEvent -;WmiQueryAllDataA -;WmiQueryAllDataMultipleA -;WmiQueryAllDataMultipleW -;WmiQueryAllDataW -;WmiQueryGuidInformation -;WmiQuerySingleInstanceA -;WmiQuerySingleInstanceMultipleA -;WmiQuerySingleInstanceMultipleW -;WmiQuerySingleInstanceW -;WmiReceiveNotificationsA -;WmiReceiveNotificationsW -;WmiSetSingleInstanceA -;WmiSetSingleInstanceW -;WmiSetSingleItemA -;WmiSetSingleItemW -;Wow64Win32ApiEntry -;WriteEncryptedFileRaw -; EOF Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] Fri Jul 25 09:13:04 2008 @@ -1,6 +1,6 @@ <module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll" unicode="yes"> - <importlibrary definition="advapi32.def" /> + <importlibrary definition="advapi32.spec.def" /> <include base="advapi32">.</include> <include base="scm_client">.</include> <include base="lsa_client">.</include> @@ -17,6 +17,7 @@ <library>kernel32</library> <library>pseh</library> <pch>advapi32.h</pch> + <file>advapi32.spec</file> <directory name="crypt"> <file>crypt.c</file> <file>crypt_arc4.c</file> Added: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Fri Jul 25 09:13:04 2008 @@ -1,0 +1,690 @@ + @ stdcall A_SHAFinal(ptr ptr) + @ stdcall A_SHAInit(ptr) + @ stdcall A_SHAUpdate(ptr ptr long) + @ stdcall AbortSystemShutdownA(ptr) + @ stdcall AbortSystemShutdownW(ptr) + @ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) + @ stdcall AccessCheckAndAuditAlarmA(str ptr str str ptr long ptr long ptr ptr ptr) + @ stdcall AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr) + @ stub AccessCheckByType #(ptr ptr long long ptr long ptr ptr ptr ptr ptr) + @ stub AccessCheckByTypeAndAuditAlarmA + @ stub AccessCheckByTypeAndAuditAlarmW + @ stub AccessCheckByTypeResultList + @ stub AccessCheckByTypeResultListAndAuditAlarmA + @ stub AccessCheckByTypeResultListAndAuditAlarmByHandleA + @ stub AccessCheckByTypeResultListAndAuditAlarmByHandleW + @ stub AccessCheckByTypeResultListAndAuditAlarmW + @ stdcall AddAccessAllowedAce (ptr long long ptr) + @ stdcall AddAccessAllowedAceEx (ptr long long long ptr) + @ stub AddAccessAllowedObjectAce + @ stdcall AddAccessDeniedAce(ptr long long ptr) + @ stdcall AddAccessDeniedAceEx(ptr long long long ptr) + @ stub AddAccessDeniedObjectAce + @ stdcall AddAce(ptr long long ptr long) + @ stdcall AddAuditAccessAce(ptr long long ptr long long) + @ stdcall AddAuditAccessAceEx(ptr long long long ptr long long) + @ stub AddAuditAccessObjectAce + @ stub AddUsersToEncryptedFile + @ stdcall AdjustTokenGroups(long long ptr long ptr ptr) + @ stdcall AdjustTokenPrivileges(long long ptr long ptr ptr) + @ stdcall AllocateAndInitializeSid(ptr long long long long long long long long long ptr) + @ stdcall AllocateLocallyUniqueId(ptr) + @ stdcall AreAllAccessesGranted(long long) + @ stdcall AreAnyAccessesGranted(long long) + @ stdcall BackupEventLogA (long str) + @ stdcall BackupEventLogW (long wstr) + @ stdcall BuildExplicitAccessWithNameA(ptr str long long long) + @ stdcall BuildExplicitAccessWithNameW(ptr wstr long long long) + @ stub BuildImpersonateExplicitAccessWithNameA + @ stub BuildImpersonateExplicitAccessWithNameW + @ stub BuildImpersonateTrusteeA + @ stub BuildImpersonateTrusteeW + @ stdcall BuildSecurityDescriptorA(ptr ptr long ptr long ptr ptr ptr ptr) + @ stdcall BuildSecurityDescriptorW(ptr ptr long ptr long ptr ptr ptr ptr) + @ stdcall BuildTrusteeWithNameA(ptr str) + @ stdcall BuildTrusteeWithNameW(ptr wstr) + @ stdcall BuildTrusteeWithObjectsAndNameA(ptr ptr long str str str) + @ stdcall BuildTrusteeWithObjectsAndNameW(ptr ptr long wstr wstr wstr) + @ stdcall BuildTrusteeWithObjectsAndSidA(ptr ptr ptr ptr ptr) + @ stdcall BuildTrusteeWithObjectsAndSidW(ptr ptr ptr ptr ptr) + @ stdcall BuildTrusteeWithSidA(ptr ptr) + @ stdcall BuildTrusteeWithSidW(ptr ptr) + @ stub CancelOverlappedAccess + @ stdcall ChangeServiceConfig2A(long long ptr) + @ stdcall ChangeServiceConfig2W(long long ptr) + @ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str) + @ stdcall ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) + @ stdcall CheckTokenMembership(long ptr ptr) + @ stdcall ClearEventLogA (long str) + @ stdcall ClearEventLogW (long wstr) + @ stub CloseCodeAuthzLevel + @ stub CloseEncryptedFileRaw + @ stdcall CloseEventLog (long) + @ stdcall CloseServiceHandle(long) + @ stub CloseTrace + @ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) + @ stub ComputeAccessTokenFromCodeAuthzLevel + @ stdcall ControlService(long long ptr) + @ stub ControlTraceA + @ stub ControlTraceW + @ stub ConvertAccessToSecurityDescriptorA + @ stub ConvertAccessToSecurityDescriptorW + @ stub ConvertSDToStringSDRootDomainA + @ stub ConvertSDToStringSDRootDomainW + @ stub ConvertSecurityDescriptorToAccessA + @ stub ConvertSecurityDescriptorToAccessNamedA + @ stub ConvertSecurityDescriptorToAccessNamedW + @ stub ConvertSecurityDescriptorToAccessW + @ stdcall ConvertSecurityDescriptorToStringSecurityDescriptorA(ptr long long ptr ptr) + @ stdcall ConvertSecurityDescriptorToStringSecurityDescriptorW(ptr long long ptr ptr) + @ stdcall ConvertSidToStringSidA(ptr ptr) + @ stdcall ConvertSidToStringSidW(ptr ptr) + @ stub ConvertStringSDToSDDomainA + @ stub ConvertStringSDToSDDomainW + @ stub ConvertStringSDToSDRootDomainA + @ stub ConvertStringSDToSDRootDomainW + @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorA(str long ptr ptr) + @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) + @ stdcall ConvertStringSidToSidA(ptr ptr) + @ stdcall ConvertStringSidToSidW(ptr ptr) + @ stub ConvertToAutoInheritPrivateObjectSecurity + @ stdcall CopySid(long ptr ptr) + @ stub CreateCodeAuthzLevel + @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) + @ stub CreatePrivateObjectSecurityEx + @ stub CreatePrivateObjectSecurityWithMultipleInheritance + @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) + @ stub CreateProcessAsUserSecure + @ stdcall CreateProcessAsUserW(long str str ptr ptr long long ptr str ptr ptr) + @ stub CreateProcessWithLogonW #(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) + @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) + @ stdcall CreateServiceA(long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) + @ stdcall CreateServiceW (long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) + @ stub CreateTraceInstanceId + @ stdcall CreateWellKnownSid(long ptr ptr ptr) + @ stub CredDeleteA #(str long long) + @ stub CredDeleteW #(wstr long long) + @ stub CredEnumerateA #(str long ptr ptr) + @ stub CredEnumerateW #(wstr long ptr ptr) + @ stub CredFree #(ptr) + @ stub CredGetSessionTypes #(long ptr) + @ stub CredGetTargetInfoA + @ stub CredGetTargetInfoW + @ stub CredIsMarshaledCredentialA + @ stub CredIsMarshaledCredentialW + @ stub CredMarshalCredentialA + @ stub CredMarshalCredentialW + @ stub CredProfileLoaded + @ stub CredReadA #(str long long ptr) + @ stub CredReadDomainCredentialsA + @ stub CredReadDomainCredentialsW + @ stub CredReadW #(wstr long long ptr) + @ stub CredRenameA + @ stub CredRenameW + @ stub CredUnmarshalCredentialA + @ stub CredUnmarshalCredentialW + @ stub CredWriteA #(ptr long) + @ stub CredWriteDomainCredentialsA + @ stub CredWriteDomainCredentialsW + @ stub CredWriteW #(ptr long) + @ stub CredpConvertCredential + @ stub CredpConvertTargetInfo + @ stub CredpDecodeCredential + @ stub CredpEncodeCredential + @ stdcall CryptAcquireContextA(ptr str str long long) + @ stdcall CryptAcquireContextW(ptr wstr wstr long long) + @ stdcall CryptContextAddRef(long ptr long) + @ stdcall CryptCreateHash(long long long long ptr) + @ stdcall CryptDecrypt(long long long long ptr ptr) + @ stdcall CryptDeriveKey(long long long long ptr) + @ stdcall CryptDestroyHash(long) + @ stdcall CryptDestroyKey(long) + @ stdcall CryptDuplicateHash(long ptr long ptr) + @ stdcall CryptDuplicateKey(long ptr long ptr) + @ stdcall CryptEncrypt(long long long long ptr ptr long) + @ stdcall CryptEnumProviderTypesA(long ptr long ptr ptr ptr) + @ stdcall CryptEnumProviderTypesW(long ptr long ptr ptr ptr) + @ stdcall CryptEnumProvidersA(long ptr long ptr ptr ptr) + @ stdcall CryptEnumProvidersW(long ptr long ptr ptr ptr) + @ stdcall CryptExportKey(long long long long ptr ptr) + @ stdcall CryptGenKey(long long long ptr) + @ stdcall CryptGenRandom(long long ptr) + @ stdcall CryptGetDefaultProviderA(long ptr long ptr ptr) + @ stdcall CryptGetDefaultProviderW(long ptr long ptr ptr) + @ stdcall CryptGetHashParam(long long ptr ptr long) + @ stdcall CryptGetKeyParam(long long ptr ptr long) + @ stdcall CryptGetProvParam(long long ptr ptr long) + @ stdcall CryptGetUserKey(long long ptr) + @ stdcall CryptHashData(long ptr long long) + @ stdcall CryptHashSessionKey(long long long) + @ stdcall CryptImportKey(long ptr long long long ptr) + @ stdcall CryptReleaseContext(long long) + @ stdcall CryptSetHashParam(long long ptr long) + @ stdcall CryptSetKeyParam(long long ptr long) + @ stdcall CryptSetProvParam(long long ptr long) + @ stdcall CryptSetProviderA(str long) + @ stdcall CryptSetProviderExA(str long ptr long) + @ stdcall CryptSetProviderExW(wstr long ptr long) + @ stdcall CryptSetProviderW(wstr long) + @ stdcall CryptSignHashA(long long ptr long ptr ptr) + @ stdcall CryptSignHashW(long long ptr long ptr ptr) + @ stdcall CryptVerifySignatureA(long ptr long long ptr long) + @ stdcall CryptVerifySignatureW(long ptr long long ptr long) + @ stdcall DecryptFileA(str long) + @ stdcall DecryptFileW(wstr long) + @ stdcall DeleteAce(ptr long) + @ stdcall DeleteService(long) + @ stdcall DeregisterEventSource(long) + @ stdcall DestroyPrivateObjectSecurity(ptr) + @ stub DuplicateEncryptionInfoFile + @ stdcall DuplicateToken(long long ptr) + @ stdcall DuplicateTokenEx(long long ptr long long ptr) + @ stub ElfBackupEventLogFileA + @ stub ElfBackupEventLogFileW + @ stub ElfChangeNotify + @ stub ElfClearEventLogFileA + @ stub ElfClearEventLogFileW + @ stub ElfCloseEventLog + @ stub ElfDeregisterEventSource + @ stub ElfDeregisterEventSourceW + @ stub ElfFlushEventLog + @ stub ElfNumberOfRecords + @ stub ElfOldestRecord + @ stub ElfOpenBackupEventLogA + @ stub ElfOpenBackupEventLogW + @ stub ElfOpenEventLogA + @ stub ElfOpenEventLogW + @ stub ElfReadEventLogA + @ stub ElfReadEventLogW + @ stub ElfRegisterEventSourceA + @ stub ElfRegisterEventSourceW + @ stub ElfReportEventA + @ stub ElfReportEventW + @ stub EnableTrace + @ stdcall EncryptFileA(str) + @ stdcall EncryptFileW(wstr) + @ stub EncryptedFileKeyInfo + @ stub EncryptionDisable + @ stdcall EnumDependentServicesA(long long ptr long ptr ptr) + @ stdcall EnumDependentServicesW(long long ptr long ptr ptr) + @ stub EnumServiceGroupA + @ stub EnumServiceGroupW + @ stdcall EnumServicesStatusA (long long long ptr long ptr ptr ptr) + @ stdcall EnumServicesStatusExA(long long long long ptr long ptr ptr ptr str) + @ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) + @ stdcall EnumServicesStatusW (long long long ptr long ptr ptr ptr) + @ stub EnumerateTraceGuids + @ stub EqualDomainSid + @ stdcall EqualPrefixSid(ptr ptr) + @ stdcall EqualSid(ptr ptr) + @ stdcall FileEncryptionStatusA(str ptr) + @ stdcall FileEncryptionStatusW(wstr ptr) + @ stdcall FindFirstFreeAce(ptr ptr) + @ stub FlushTraceA + @ stub FlushTraceW + @ stub FreeEncryptedFileKeyInfo + @ stub FreeEncryptionCertificateHashList + @ stub FreeInheritedFromArray + @ stdcall FreeSid(ptr) + @ stub GetAccessPermissionsForObjectA + @ stub GetAccessPermissionsForObjectW + @ stdcall GetAce(ptr long ptr) + @ stdcall GetAclInformation(ptr ptr long long) + @ stdcall GetAuditedPermissionsFromAclA(ptr ptr ptr ptr) + @ stdcall GetAuditedPermissionsFromAclW(ptr ptr ptr ptr) + @ stdcall GetCurrentHwProfileA(ptr) + @ stdcall GetCurrentHwProfileW(ptr) + @ stdcall GetEffectiveRightsFromAclA(ptr ptr ptr) + @ stdcall GetEffectiveRightsFromAclW(ptr ptr ptr) + @ stub GetEventLogInformation + @ stub GetExplicitEntriesFromAclA #(ptr ptr ptr) + @ stdcall GetExplicitEntriesFromAclW(ptr ptr ptr) + @ stdcall GetFileSecurityA(str long ptr long ptr) + @ stdcall GetFileSecurityW(wstr long ptr long ptr) + @ stub GetInformationCodeAuthzLevelW + @ stub GetInformationCodeAuthzPolicyW + @ stub GetInheritanceSourceA + @ stub GetInheritanceSourceW + @ stdcall GetKernelObjectSecurity(long long ptr long ptr) + @ stdcall GetLengthSid(ptr) + @ stub GetLocalManagedApplicationData + @ stub GetLocalManagedApplications + @ stub GetManagedApplicationCategories + @ stub GetManagedApplications + @ stub GetMangledSiteSid + @ stub GetMultipleTrusteeA + @ stub GetMultipleTrusteeOperationA + @ stub GetMultipleTrusteeOperationW + @ stub GetMultipleTrusteeW + @ stdcall GetNamedSecurityInfoA (str long long ptr ptr ptr ptr ptr) + @ stub GetNamedSecurityInfoExA + @ stub GetNamedSecurityInfoExW + @ stdcall GetNamedSecurityInfoW (wstr long long ptr ptr ptr ptr ptr) + @ stdcall GetNumberOfEventLogRecords (long ptr) + @ stdcall GetOldestEventLogRecord (long ptr) + @ stub GetOverlappedAccessResults + @ stdcall GetPrivateObjectSecurity(ptr long ptr long ptr) + @ stdcall GetSecurityDescriptorControl (ptr ptr ptr) + @ stdcall GetSecurityDescriptorDacl (ptr ptr ptr ptr) + @ stdcall GetSecurityDescriptorGroup(ptr ptr ptr) + @ stub GetSecurityDescriptorLength #(ptr) + @ stdcall GetSecurityDescriptorOwner(ptr ptr ptr) + @ stub GetSecurityDescriptorRMControl + @ stdcall GetSecurityDescriptorSacl (ptr ptr ptr ptr) + @ stdcall GetSecurityInfo (long long long ptr ptr ptr ptr ptr) + @ stub GetSecurityInfoExA + @ stdcall GetSecurityInfoExW (long long long wstr wstr ptr ptr ptr ptr) + @ stdcall GetServiceDisplayNameA(ptr str ptr ptr) + @ stdcall GetServiceDisplayNameW(ptr wstr ptr ptr) + @ stdcall GetServiceKeyNameA(long str ptr ptr) + @ stdcall GetServiceKeyNameW(long wstr ptr ptr) + @ stdcall GetSidIdentifierAuthority(ptr) + @ stdcall GetSidLengthRequired(long) + @ stdcall GetSidSubAuthority(ptr long) + @ stdcall GetSidSubAuthorityCount(ptr) + @ stub GetSiteSidFromToken + @ stdcall GetTokenInformation(long long ptr long ptr) + @ stub GetTraceEnableFlags + @ stub GetTraceEnableLevel + @ stub GetTraceLoggerHandle + @ stdcall GetTrusteeFormA(ptr) + @ stdcall GetTrusteeFormW(ptr) + @ stdcall GetTrusteeNameA(ptr) + @ stdcall GetTrusteeNameW(ptr) + @ stdcall GetTrusteeTypeA(ptr) + @ stdcall GetTrusteeTypeW(ptr) + @ stdcall GetUserNameA(ptr ptr) + @ stdcall GetUserNameW(ptr ptr) + @ stub GetWindowsAccountDomainSid + @ stub I_ScGetCurrentGroupStateW + @ stub I_ScIsSecurityProcess + @ stub I_ScPnPGetServiceName + @ stub I_ScSendTSMessage + @ stub I_ScSetServiceBit + @ stub I_ScSetServiceBitsA + @ stub I_ScSetServiceBitsW + @ stub IdentifyCodeAuthzLevelW + @ stub ImpersonateAnonymousToken + @ stdcall ImpersonateLoggedOnUser(long) + @ stdcall ImpersonateNamedPipeClient(long) + @ stdcall ImpersonateSelf(long) + @ stdcall InitializeAcl(ptr long long) + @ stdcall InitializeSecurityDescriptor(ptr long) + @ stdcall InitializeSid(ptr ptr long) + @ stdcall InitiateSystemShutdownA(str str long long long) + @ stub InitiateSystemShutdownExA #(str str long long long long) + @ stdcall InitiateSystemShutdownExW(wstr wstr long long long long) + @ stdcall InitiateSystemShutdownW(str str long long long) + @ stub InstallApplication + @ stub IsProcessRestricted + @ stub IsTextUnicode #(ptr long ptr) + @ stdcall IsTokenRestricted(long) + @ stub IsTokenUntrusted + @ stdcall IsValidAcl(ptr) + @ stdcall IsValidSecurityDescriptor(ptr) + @ stdcall IsValidSid(ptr) + @ stdcall IsWellKnownSid(ptr long) + @ stdcall LockServiceDatabase(ptr) + @ stdcall LogonUserA(str str str long long ptr) + @ stub LogonUserExA + @ stub LogonUserExW + @ stdcall LogonUserW(wstr wstr wstr long long ptr) + @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) + @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) + @ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) + @ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) + @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) + @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) + @ stdcall LookupPrivilegeNameA(str ptr ptr long) + @ stdcall LookupPrivilegeNameW(wstr ptr ptr long) + @ stdcall LookupPrivilegeValueA(ptr ptr ptr) + @ stdcall LookupPrivilegeValueW(ptr ptr ptr) + @ stub LookupSecurityDescriptorPartsA + @ stub LookupSecurityDescriptorPartsW + @ stdcall LsaAddAccountRights(ptr ptr ptr long) + @ stub LsaAddPrivilegesToAccount + @ stub LsaClearAuditLog + @ stdcall LsaClose(ptr) + @ stub LsaCreateAccount + @ stub LsaCreateSecret + @ stub LsaCreateTrustedDomain + @ stdcall LsaCreateTrustedDomainEx(ptr ptr ptr long ptr) + @ stub LsaDelete + @ stdcall LsaDeleteTrustedDomain(ptr ptr) + @ stdcall LsaEnumerateAccountRights(ptr ptr ptr ptr) + @ stub LsaEnumerateAccounts + @ stdcall LsaEnumerateAccountsWithUserRight(ptr ptr ptr ptr) + @ stub LsaEnumeratePrivileges + @ stub LsaEnumeratePrivilegesOfAccount + @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) + @ stdcall LsaEnumerateTrustedDomainsEx(ptr ptr ptr long ptr) + @ stdcall LsaFreeMemory(ptr) + @ stub LsaGetQuotasForAccount + @ stub LsaGetRemoteUserName + @ stub LsaGetSystemAccessAccount + @ stub LsaGetUserName + @ stub LsaICLookupNames + @ stub LsaICLookupNamesWithCreds + @ stub LsaICLookupSids + @ stub LsaICLookupSidsWithCreds + @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) + @ stdcall LsaLookupNames(long long ptr ptr ptr) + @ stub LsaLookupPrivilegeDisplayName + @ stub LsaLookupPrivilegeName + @ stub LsaLookupPrivilegeValue + @ stdcall LsaLookupSids(ptr long ptr ptr ptr) + @ stdcall LsaNtStatusToWinError(long) + @ stub LsaOpenAccount + @ stdcall LsaOpenPolicy(long long long long) + @ stub LsaOpenPolicySce + @ stub LsaOpenSecret + @ stub LsaOpenTrustedDomain + @ stdcall LsaOpenTrustedDomainByName(ptr ptr long ptr) + @ stub LsaQueryDomainInformationPolicy + @ stub LsaQueryForestTrustInformation + @ stub LsaQueryInfoTrustedDomain + @ stdcall LsaQueryInformationPolicy(ptr long ptr) + @ stub LsaQuerySecret + @ stub LsaQuerySecurityObject + @ stdcall LsaQueryTrustedDomainInfo(ptr ptr long ptr) + @ stdcall LsaQueryTrustedDomainInfoByName(ptr ptr long ptr) + @ stub LsaRegisterPolicyChangeNotification #(long long) + @ stdcall LsaRemoveAccountRights(ptr ptr long ptr long) + @ stub LsaRemovePrivilegesFromAccount + @ stdcall LsaRetrievePrivateData(ptr ptr ptr) + @ stub LsaSetDomainInformationPolicy + @ stub LsaSetForestTrustInformation + @ stdcall LsaSetInformationPolicy(long long ptr) + @ stub LsaSetInformationTrustedDomain + @ stub LsaSetQuotasForAccount + @ stub LsaSetSecret + @ stub LsaSetSecurityObject + @ stub LsaSetSystemAccessAccount + @ stdcall LsaSetTrustedDomainInfoByName(ptr ptr long ptr) + @ stdcall LsaSetTrustedDomainInformation(ptr ptr long ptr) + @ stdcall LsaStorePrivateData(ptr ptr ptr) + @ stub LsaUnregisterPolicyChangeNotification #(long long) + @ stdcall MD4Final(ptr) + @ stdcall MD4Init(ptr) + @ stdcall MD4Update(ptr ptr long) + @ stdcall MD5Final(ptr) + @ stdcall MD5Init(ptr) + @ stdcall MD5Update(ptr ptr long) + @ stub MSChapSrvChangePassword2 + @ stub MSChapSrvChangePassword + @ stub MakeAbsoluteSD2 + @ stdcall MakeAbsoluteSD(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) + @ stdcall MakeSelfRelativeSD(ptr ptr ptr) + @ stub MapGenericMask #(ptr ptr) + @ stdcall NotifyBootConfigStatus(long) + @ stdcall NotifyChangeEventLog (long long) + @ stdcall ObjectCloseAuditAlarmA(str ptr long) + @ stdcall ObjectCloseAuditAlarmW(wstr ptr long) + @ stub ObjectDeleteAuditAlarmA + @ stdcall ObjectDeleteAuditAlarmW(wstr ptr long) + @ stdcall ObjectOpenAuditAlarmA(str ptr str str ptr long long long ptr long long ptr) + @ stdcall ObjectOpenAuditAlarmW(wstr ptr wstr wstr ptr long long long ptr long long ptr) + @ stdcall ObjectPrivilegeAuditAlarmA(str ptr long long ptr long) + @ stdcall ObjectPrivilegeAuditAlarmW(wstr ptr long long ptr long) + @ stdcall OpenBackupEventLogA (str str) + @ stdcall OpenBackupEventLogW (wstr wstr) + @ stub OpenEncryptedFileRawA + @ stub OpenEncryptedFileRawW + @ stdcall OpenEventLogA (str str) + @ stdcall OpenEventLogW (wstr wstr) + @ stdcall OpenProcessToken(long long ptr) + @ stdcall OpenSCManagerA(str str long) + @ stdcall OpenSCManagerW(wstr wstr long) + @ stdcall OpenServiceA(long str long) + @ stdcall OpenServiceW(long wstr long) + @ stdcall OpenThreadToken(long long long ptr) + @ stub OpenTraceA + @ stub OpenTraceW + @ stdcall PrivilegeCheck(ptr ptr ptr) + @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long) + @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) + @ stub ProcessIdleTasks + @ stub ProcessTrace + @ stub QueryAllTracesA + @ stub QueryAllTracesW + @ stub QueryRecoveryAgentsOnEncryptedFile + @ stdcall QueryServiceConfig2A(long long ptr long ptr) + @ stdcall QueryServiceConfig2W(long long ptr long ptr) + @ stdcall QueryServiceConfigA(long ptr long ptr) + @ stdcall QueryServiceConfigW(long ptr long ptr) + @ stdcall QueryServiceLockStatusA(long ptr long ptr) + @ stdcall QueryServiceLockStatusW(long ptr long ptr) + @ stdcall QueryServiceObjectSecurity(long long ptr long ptr) + @ stdcall QueryServiceStatus(long ptr) + @ stdcall QueryServiceStatusEx (long long ptr long ptr) + @ stub QueryTraceA + @ stub QueryTraceW + @ stub QueryUsersOnEncryptedFile + @ stub QueryWindows31FilesMigration #(long) + @ stub ReadEncryptedFileRaw + @ stdcall ReadEventLogA (long long long ptr long ptr ptr) + @ stdcall ReadEventLogW (long long long ptr long ptr ptr) + @ stdcall RegCloseKey(long) + @ stdcall RegConnectRegistryA(str long ptr) + @ stdcall RegConnectRegistryW(wstr long ptr) + @ stdcall RegCreateKeyA(long str ptr) + @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) + @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) + @ stdcall RegCreateKeyW(long wstr ptr) + @ stdcall RegDeleteKeyA(long str) + @ stdcall RegDeleteKeyW(long wstr) + @ stdcall RegDeleteTreeA(long str) + @ stdcall RegDeleteTreeW(long wstr) + @ stdcall RegDeleteValueA(long str) + @ stdcall RegDeleteValueW(long wstr) + @ stdcall RegDisablePredefinedCache() + @ stdcall RegEnumKeyA(long long ptr long) + @ stdcall RegEnumKeyExA(long long ptr ptr ptr ptr ptr ptr) + @ stdcall RegEnumKeyExW(long long ptr ptr ptr ptr ptr ptr) + @ stdcall RegEnumKeyW(long long ptr long) + @ stdcall RegEnumValueA(long long ptr ptr ptr ptr ptr ptr) + @ stdcall RegEnumValueW(long long ptr ptr ptr ptr ptr ptr) + @ stdcall RegFlushKey(long) + @ stdcall RegGetKeySecurity(long long ptr ptr) + @ stdcall RegGetValueA(long str str long ptr ptr ptr) + @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) + @ stdcall RegLoadKeyA(long str str) + @ stdcall RegLoadKeyW(long wstr wstr) + @ stdcall RegLoadMUIStringA(long str str long ptr long str) + @ stdcall RegLoadMUIStringW(long wstr wstr long ptr long wstr) + @ stdcall RegNotifyChangeKeyValue(long long long long long) + @ stdcall RegOpenCurrentUser(long ptr) + @ stdcall RegOpenKeyA(long str ptr) + @ stdcall RegOpenKeyExA(long str long long ptr) + @ stdcall RegOpenKeyExW(long wstr long long ptr) + @ stdcall RegOpenKeyW(long wstr ptr) + @ stdcall RegOpenUserClassesRoot(ptr long long ptr) + @ stdcall RegOverridePredefKey(long long) + @ stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) + @ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) + @ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr) + @ stdcall RegQueryMultipleValuesW(long ptr long ptr ptr) + @ stdcall RegQueryValueA(long str ptr ptr) + @ stdcall RegQueryValueExA(long str ptr ptr ptr ptr) + @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) + @ stdcall RegQueryValueW(long wstr ptr ptr) + @ stub RegRemapPreDefKey + @ stdcall RegReplaceKeyA(long str str str) + @ stdcall RegReplaceKeyW(long wstr wstr wstr) + @ stdcall RegRestoreKeyA(long str long) + @ stdcall RegRestoreKeyW(long wstr long) + @ stdcall RegSaveKeyA(long ptr ptr) + @ stub RegSaveKeyExA + @ stub RegSaveKeyExW + @ stdcall RegSaveKeyW(long ptr ptr) + @ stdcall RegSetKeySecurity(long long ptr) + @ stdcall RegSetValueA(long str long ptr long) + @ stdcall RegSetValueExA(long str long long ptr long) + @ stdcall RegSetValueExW(long wstr long long ptr long) + @ stdcall RegSetValueW(long wstr long ptr long) + @ stdcall RegUnLoadKeyA(long str) + @ stdcall RegUnLoadKeyW(long wstr) + @ stdcall RegisterEventSourceA(ptr ptr) + @ stdcall RegisterEventSourceW(ptr ptr) + @ stub RegisterIdleTask + @ stdcall RegisterServiceCtrlHandlerA(str ptr) + @ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) + @ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) + @ stdcall RegisterServiceCtrlHandlerW(wstr ptr) + @ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) + @ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) + @ stub RemoveTraceCallback + @ stub RemoveUsersFromEncryptedFile + @ stdcall ReportEventA (long long long long ptr long long str ptr) + @ stdcall ReportEventW (long long long long ptr long long wstr ptr) + @ stdcall RevertToSelf() + @ stub SaferCloseLevel + @ stub SaferComputeTokenFromLevel + @ stub SaferCreateLevel + @ stub SaferGetLevelInformation + @ stub SaferGetPolicyInformation + @ stub SaferIdentifyLevel + @ stub SaferRecordEventLogEntry + @ stub SaferSetLevelInformation + @ stub SaferSetPolicyInformation + @ stub SaferiChangeRegistryScope + @ stub SaferiCompareTokenLevels + @ stub SaferiIsExecutableFileType + @ stub SaferiPopulateDefaultsInRegistry + @ stub SaferiRecordEventLogEntry + @ stub SaferiReplaceProcessThreadTokens + @ stub SaferiSearchMatchingHashRules + @ stdcall SetAclInformation(ptr ptr long long) + @ stub SetEntriesInAccessListA + @ stub SetEntriesInAccessListW + @ stdcall SetEntriesInAclA(long ptr ptr ptr) + @ stdcall SetEntriesInAclW(long ptr ptr ptr) + @ stub SetEntriesInAuditListA + @ stub SetEntriesInAuditListW + @ stdcall SetFileSecurityA(str long ptr ) + @ stdcall SetFileSecurityW(wstr long ptr) + @ stub SetInformationCodeAuthzLevelW + @ stub SetInformationCodeAuthzPolicyW + @ stdcall SetKernelObjectSecurity(long long ptr) + @ stdcall SetNamedSecurityInfoA(str long ptr ptr ptr ptr ptr) + @ stub SetNamedSecurityInfoExA + @ stub SetNamedSecurityInfoExW + @ stdcall SetNamedSecurityInfoW(wstr long ptr ptr ptr ptr ptr) + @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) + @ stub SetPrivateObjectSecurityEx + @ stdcall SetSecurityDescriptorControl(ptr long long) + @ stdcall SetSecurityDescriptorDacl(ptr long ptr long) + @ stdcall SetSecurityDescriptorGroup (ptr ptr long) + @ stdcall SetSecurityDescriptorOwner (ptr ptr long) + @ stub SetSecurityDescriptorRMControl + @ stdcall SetSecurityDescriptorSacl(ptr long ptr long) + @ stdcall SetSecurityInfo (long long long ptr ptr ptr ptr) + @ stub SetSecurityInfoExA + @ stub SetSecurityInfoExW + @ stdcall SetServiceBits(long long long long) + @ stdcall SetServiceObjectSecurity(long long ptr) + @ stdcall SetServiceStatus(long long) + @ stdcall SetThreadToken (ptr ptr) + @ stdcall SetTokenInformation (long long ptr long) + @ stub SetTraceCallback + @ stub SetUserFileEncryptionKey + @ stdcall StartServiceA(long long ptr) + @ stdcall StartServiceCtrlDispatcherA(ptr) + @ stdcall StartServiceCtrlDispatcherW(ptr) + @ stdcall StartServiceW(long long ptr) + @ stub StartTraceA + @ stub StartTraceW + @ stub StopTraceA + @ stub StopTraceW + @ stub SynchronizeWindows31FilesAndWindowsNTRegistry #(long long long long) + @ stdcall SystemFunction001(ptr ptr ptr) + @ stdcall SystemFunction002(ptr ptr ptr) + @ stdcall SystemFunction003(ptr ptr) + @ stdcall SystemFunction004(ptr ptr ptr) + @ stdcall SystemFunction005(ptr ptr ptr) + @ stdcall SystemFunction006(ptr ptr) + @ stdcall SystemFunction007(ptr ptr) + @ stdcall SystemFunction008(ptr ptr ptr) + @ stdcall SystemFunction009(ptr ptr ptr) + @ stdcall SystemFunction010(ptr ptr ptr) + @ stdcall SystemFunction011(ptr ptr ptr) SystemFunction010 + @ stdcall SystemFunction012(ptr ptr ptr) + @ stdcall SystemFunction013(ptr ptr ptr) + @ stdcall SystemFunction014(ptr ptr ptr) SystemFunction012 + @ stdcall SystemFunction015(ptr ptr ptr) SystemFunction013 + @ stdcall SystemFunction016(ptr ptr ptr) SystemFunction012 + @ stdcall SystemFunction017(ptr ptr ptr) SystemFunction013 + @ stdcall SystemFunction018(ptr ptr ptr) SystemFunction012 + @ stdcall SystemFunction019(ptr ptr ptr) SystemFunction013 + @ stdcall SystemFunction020(ptr ptr ptr) SystemFunction012 + @ stdcall SystemFunction021(ptr ptr ptr) SystemFunction013 + @ stdcall SystemFunction022(ptr ptr ptr) SystemFunction012 + @ stdcall SystemFunction023(ptr ptr ptr) SystemFunction013 + @ stdcall SystemFunction024(ptr ptr ptr) + @ stdcall SystemFunction025(ptr ptr ptr) + @ stdcall SystemFunction026(ptr ptr ptr) SystemFunction024 + @ stdcall SystemFunction027(ptr ptr ptr) SystemFunction025 + @ stub SystemFunction028 + @ stub SystemFunction029 + @ stdcall SystemFunction030(ptr ptr) + @ stdcall SystemFunction031(ptr ptr) SystemFunction030 + @ stdcall SystemFunction032(ptr ptr) + @ stub SystemFunction033 + @ stub SystemFunction034 + @ stdcall SystemFunction035(str) + @ stdcall SystemFunction036(ptr long) # RtlGenRandom + @ stdcall SystemFunction040(ptr long long) # RtlEncryptMemory + @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory + @ stub TraceEvent + @ stub TraceEventInstance + @ stub TraceMessage + @ stub TraceMessageVa + @ stub TreeResetNamedSecurityInfoA + @ stub TreeResetNamedSecurityInfoW + @ stub TrusteeAccessToObjectA + @ stub TrusteeAccessToObjectW + @ stub UninstallApplication + @ stdcall UnlockServiceDatabase (ptr) + @ stub UnregisterIdleTask + @ stub UnregisterTraceGuids + @ stub UpdateTraceA + @ stub UpdateTraceW + @ stub WdmWmiServiceMain + @ stub WmiCloseBlock + @ stub WmiCloseTraceWithCursor + @ stub WmiConvertTimestamp + @ stub WmiDevInstToInstanceNameA + @ stub WmiDevInstToInstanceNameW + @ stub WmiEnumerateGuids + @ stub WmiExecuteMethodA + @ stub WmiExecuteMethodW + @ stub WmiFileHandleToInstanceNameA + @ stub WmiFileHandleToInstanceNameW + @ stub WmiFreeBuffer + @ stub WmiGetFirstTraceOffset + @ stub WmiGetNextEvent + @ stub WmiGetTraceHeader + @ stub WmiMofEnumerateResourcesA + @ stub WmiMofEnumerateResourcesW + @ stub WmiNotificationRegistrationA + @ stub WmiNotificationRegistrationW + @ stub WmiOpenBlock + @ stub WmiOpenTraceWithCursor + @ stub WmiParseTraceEvent + @ stub WmiQueryAllDataA + @ stub WmiQueryAllDataMultipleA + @ stub WmiQueryAllDataMultipleW + @ stub WmiQueryAllDataW + @ stub WmiQueryGuidInformation + @ stub WmiQuerySingleInstanceA + @ stub WmiQuerySingleInstanceMultipleA + @ stub WmiQuerySingleInstanceMultipleW + @ stub WmiQuerySingleInstanceW + @ stub WmiReceiveNotificationsA + @ stub WmiReceiveNotificationsW + @ stub WmiSetSingleInstanceA + @ stub WmiSetSingleInstanceW + @ stub WmiSetSingleItemA + @ stub WmiSetSingleItemW + @ stub Wow64Win32ApiEntry + @ stub WriteEncryptedFileRaw Propchange: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/advapi32.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Fri Jul 25 09:13:04 2008 @@ -41,9 +41,9 @@ NtClose(Handle); \ } #define IsPredefKey(HKey) \ - (((ULONG)(HKey) & 0xF0000000) == 0x80000000) + (((ULONG_PTR)(HKey) & 0xF0000000) == 0x80000000) #define GetPredefKeyIndex(HKey) \ - ((ULONG)(HKey) & 0x0FFFFFFF) + ((ULONG_PTR)(HKey) & 0x0FFFFFFF) static NTSTATUS OpenClassesRootKey(PHANDLE KeyHandle); static NTSTATUS OpenLocalMachineKey (PHANDLE KeyHandle); Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Fri Jul 25 09:13:04 2008 @@ -93,7 +93,7 @@ LSAHandleBind(); return LsarClose(LSABindingHandle, - (unsigned long)ObjectHandle); + (ULONG_PTR)ObjectHandle); } Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Fri Jul 25 09:13:04 2008 @@ -117,7 +117,7 @@ HandleBind(); dwError = RChangeServiceConfig2A(BindingHandle, - (SC_RPC_HANDLE)hService, + (SC_RPC_HANDLE)(ULONG_PTR)hService, Info); if (dwError != ERROR_SUCCESS) { Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Fri Jul 25 09:13:04 2008 @@ -277,7 +277,7 @@ TRACE("Size: %lu\n", ControlPacket->dwSize); TRACE("Service: %S\n", &ControlPacket->szArguments[0]); - lpService = (PACTIVE_SERVICE)ControlPacket->hClient; + lpService = (PACTIVE_SERVICE)(ULONG_PTR)ControlPacket->hClient; if (lpService == NULL) { TRACE("Service not found\n"); @@ -320,7 +320,7 @@ TRACE("Size: %lu\n", ControlPacket->dwSize); TRACE("Service: %S\n", &ControlPacket->szArguments[0]); - lpService = (PACTIVE_SERVICE)ControlPacket->hClient; + lpService = (PACTIVE_SERVICE)(ULONG_PTR)ControlPacket->hClient; if (lpService == NULL) { TRACE("Service not found\n");

16 years, 1 month

[janderwald] 34784: - identation janitor

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Jul 25 09:04:37 2008 New Revision: 34784 URL: http://svn.reactos.org/svn/reactos?rev=34784&view=rev Log: - identation janitor Modified: trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Fri Jul 25 09:04:37 2008 @@ -303,15 +303,17 @@ if (!(UseLookaside) || (MaximumLength > OBP_NAME_LOOKASIDE_MAX_SIZE)) { /* Nope, allocate directly from pool */ - /* Since we later use MaximumLength to detect that we're not allocating - * from a list, we need at least MaximumLength + sizeof(UNICODE_NULL) - * here. - * - * People do call this with UseLookasideList FALSE so the distinction - * is critical. - */ - if (MaximumLength <= OBP_NAME_LOOKASIDE_MAX_SIZE) - MaximumLength = OBP_NAME_LOOKASIDE_MAX_SIZE + sizeof(UNICODE_NULL); + /* Since we later use MaximumLength to detect that we're not allocating + * from a list, we need at least MaximumLength + sizeof(UNICODE_NULL) + * here. + * + * People do call this with UseLookasideList FALSE so the distinction + * is critical. + */ + if (MaximumLength <= OBP_NAME_LOOKASIDE_MAX_SIZE) + { + MaximumLength = OBP_NAME_LOOKASIDE_MAX_SIZE + sizeof(UNICODE_NULL); + } Buffer = ExAllocatePoolWithTag(PagedPool, MaximumLength, OB_NAME_TAG); @@ -319,7 +321,7 @@ else { /* Allocate from the lookaside */ - MaximumLength = OBP_NAME_LOOKASIDE_MAX_SIZE; + MaximumLength = OBP_NAME_LOOKASIDE_MAX_SIZE; Buffer = ObpAllocateObjectCreateInfoBuffer(LookasideNameBufferList); } @@ -417,7 +419,10 @@ { /* Handle exception and free the string buffer */ Status = _SEH_GetExceptionCode(); - if (StringBuffer) ObpFreeObjectNameBuffer(CapturedName); + if (StringBuffer) + { + ObpFreeObjectNameBuffer(CapturedName); + } } _SEH_END; @@ -486,7 +491,7 @@ if(!NT_SUCCESS(Status)) { /* Capture failed, quit */ - ObjectCreateInfo->SecurityDescriptor = NULL; + ObjectCreateInfo->SecurityDescriptor = NULL; _SEH_LEAVE; }

16 years, 1 month

[arty] 34783: Fix several problems with lookasides and temporary captures: ob_x.h: Add a proper define for the size of a lookaside name buffer oblink.c: Use move memory rather than copy in the case that we re-use the name buffer. We probably never reused it before, because MaximumLength was never set properly. See below. oblife.c: Several things ObpCaptureObjectName - Properly set MaximumLength rather than copping out and setting it to just string + nul. This was dangerous because later, we'll u

by arty＠svn.reactos.org

Author: arty Date: Fri Jul 25 08:42:05 2008 New Revision: 34783 URL: http://svn.reactos.org/svn/reactos?rev=34783&view=rev Log: Fix several problems with lookasides and temporary captures: ob_x.h: Add a proper define for the size of a lookaside name buffer oblink.c: Use move memory rather than copy in the case that we re-use the name buffer. We probably never reused it before, because MaximumLength was never set properly. See below. oblife.c: Several things ObpCaptureObjectName - Properly set MaximumLength rather than copping out and setting it to just string + nul. This was dangerous because later, we'll use MaximumLength to determine whether we allocated the name from the lookaside list or the heap. - Since we use MaximumLength to determine where the allocation came from make sure that MaximumLength never equals the magic value if the string comes from the heap for whatever reason. - Free the string using the right symmetry if we would fault copying. ObpCaptureObjectCreateInformation - We didn't allocate the ObjectCreateInfo, but we might've allocated the security descriptor, so free it if needed, rather than borking some non heap. Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/oblink.c Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h [iso-8859-1] Fri Jul 25 08:42:05 2008 @@ -14,6 +14,8 @@ #define OBP_LOCK_STATE_POST_ACQUISITION_SHARED 0xDDDD1234 #define OBP_LOCK_STATE_RELEASED 0xEEEE1234 #define OBP_LOCK_STATE_INITIALIZED 0xFFFF1234 + +#define OBP_NAME_LOOKASIDE_MAX_SIZE 248 ULONG FORCEINLINE Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Fri Jul 25 08:42:05 2008 @@ -300,9 +300,18 @@ MaximumLength = Length + sizeof(UNICODE_NULL); /* Check if we should use the lookaside buffer */ - if (!(UseLookaside) || (MaximumLength > 248)) + if (!(UseLookaside) || (MaximumLength > OBP_NAME_LOOKASIDE_MAX_SIZE)) { /* Nope, allocate directly from pool */ + /* Since we later use MaximumLength to detect that we're not allocating + * from a list, we need at least MaximumLength + sizeof(UNICODE_NULL) + * here. + * + * People do call this with UseLookasideList FALSE so the distinction + * is critical. + */ + if (MaximumLength <= OBP_NAME_LOOKASIDE_MAX_SIZE) + MaximumLength = OBP_NAME_LOOKASIDE_MAX_SIZE + sizeof(UNICODE_NULL); Buffer = ExAllocatePoolWithTag(PagedPool, MaximumLength, OB_NAME_TAG); @@ -310,13 +319,13 @@ else { /* Allocate from the lookaside */ - //MaximumLength = 248; <= hack, we should actually set this...! + MaximumLength = OBP_NAME_LOOKASIDE_MAX_SIZE; Buffer = ObpAllocateObjectCreateInfoBuffer(LookasideNameBufferList); } /* Setup the string */ + ObjectName->MaximumLength = (USHORT)MaximumLength; ObjectName->Length = (USHORT)Length; - ObjectName->MaximumLength = (USHORT)MaximumLength; ObjectName->Buffer = Buffer; return Buffer; } @@ -328,7 +337,7 @@ PVOID Buffer = Name->Buffer; /* We know this is a pool-allocation if the size doesn't match */ - if (Name->MaximumLength != 248) + if (Name->MaximumLength != OBP_NAME_LOOKASIDE_MAX_SIZE) { /* Free it from the pool */ ExFreePool(Buffer); @@ -408,7 +417,7 @@ { /* Handle exception and free the string buffer */ Status = _SEH_GetExceptionCode(); - if (StringBuffer) ExFreePool(StringBuffer); + if (StringBuffer) ObpFreeObjectNameBuffer(CapturedName); } _SEH_END; @@ -477,7 +486,7 @@ if(!NT_SUCCESS(Status)) { /* Capture failed, quit */ - ObjectCreateInfo->SecurityDescriptor = NULL; + ObjectCreateInfo->SecurityDescriptor = NULL; _SEH_LEAVE; } @@ -541,7 +550,10 @@ } /* Cleanup if we failed */ - if (!NT_SUCCESS(Status)) ObpFreeObjectCreateInformation(ObjectCreateInfo); + if (!NT_SUCCESS(Status)) + { + ObpReleaseObjectCreateInformation(ObjectCreateInfo); + } /* Return status to caller */ return Status; Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Fri Jul 25 08:42:05 2008 @@ -181,7 +181,7 @@ if (RemainingName->Length) { /* Copy the new path */ - RtlCopyMemory((PVOID)((ULONG_PTR)NewTargetPath + TargetPath->Length), + RtlMoveMemory((PVOID)((ULONG_PTR)NewTargetPath + TargetPath->Length), RemainingName->Buffer, RemainingName->Length); }

16 years, 1 month

[tkreuzer] 34782: fix usage of InterlockedCompareExchangePointer

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jul 25 08:42:03 2008 New Revision: 34782 URL: http://svn.reactos.org/svn/reactos?rev=34782&view=rev Log: fix usage of InterlockedCompareExchangePointer Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Fri Jul 25 08:42:03 2008 @@ -486,7 +486,7 @@ Class->Clone = NULL; Class->Base = BaseClass; Class->Next = BaseClass->Clone; - (void)InterlockedExchangePointer(&BaseClass->Clone, + (void)InterlockedExchangePointer((VOID*)&BaseClass->Clone, Class); } }

16 years, 1 month

[tkreuzer] 34781: fix usage of InterlockedCompareExchangePointer

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jul 25 08:37:45 2008 New Revision: 34781 URL: http://svn.reactos.org/svn/reactos?rev=34781&view=rev Log: fix usage of InterlockedCompareExchangePointer Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/eng/engwindow.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] Fri Jul 25 08:37:45 2008 @@ -134,7 +134,7 @@ RtlCopyMemory(&WndObjInt->WndObj.coClient, ClipObj, sizeof (CLIPOBJ)); RtlCopyMemory(&WndObjInt->WndObj.rclClient, &Window->Wnd->ClientRect, sizeof (RECT)); - OldClipObj = InterlockedExchangePointer(&WndObjInt->ClientClipObj, ClipObj); + OldClipObj = InterlockedExchangePointer((PVOID*)&WndObjInt->ClientClipObj, ClipObj); if (OldClipObj != NULL) IntEngDeleteClipRegion(OldClipObj);

16 years, 1 month

[tkreuzer] 34780: some DWORD -> DWORD_PTR

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jul 25 08:26:08 2008 New Revision: 34780 URL: http://svn.reactos.org/svn/reactos?rev=34780&view=rev Log: some DWORD -> DWORD_PTR Modified: branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri Jul 25 08:26:08 2008 @@ -876,18 +876,18 @@ LPARAM lParam, BOOL Ansi); -DWORD +DWORD_PTR NTAPI NtUserCallNoParam( DWORD Routine); -DWORD +DWORD_PTR NTAPI NtUserCallOneParam( DWORD Param, DWORD Routine); -DWORD +DWORD_PTR NTAPI NtUserCallTwoParam( DWORD Param1, @@ -1612,7 +1612,7 @@ THREADSTATE_TASKMANWINDOW }; -DWORD +DWORD_PTR NTAPI NtUserGetThreadState( DWORD Routine); Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Fri Jul 25 08:26:08 2008 @@ -17,11 +17,11 @@ /* * @unimplemented */ -DWORD STDCALL +DWORD_PTR STDCALL NtUserGetThreadState( DWORD Routine) { - DECLARE_RETURN(DWORD); + DECLARE_RETURN(DWORD_PTR); DPRINT("Enter NtUserGetThreadState\n"); if (Routine != THREADSTATE_GETTHREADINFO) @@ -40,16 +40,16 @@ RETURN(0); case THREADSTATE_FOCUSWINDOW: - RETURN( (DWORD)IntGetThreadFocusWindow()); + RETURN( (DWORD_PTR)IntGetThreadFocusWindow()); case THREADSTATE_CAPTUREWINDOW: /* FIXME should use UserEnterShared */ - RETURN( (DWORD)IntGetCapture()); + RETURN( (DWORD_PTR)IntGetCapture()); case THREADSTATE_PROGMANWINDOW: - RETURN( (DWORD)GetW32ThreadInfo()->Desktop->hProgmanWindow); + RETURN( (DWORD_PTR)GetW32ThreadInfo()->Desktop->hProgmanWindow); case THREADSTATE_TASKMANWINDOW: - RETURN( (DWORD)GetW32ThreadInfo()->Desktop->hTaskManWindow); + RETURN( (DWORD_PTR)GetW32ThreadInfo()->Desktop->hTaskManWindow); case THREADSTATE_ACTIVEWINDOW: - RETURN ( (DWORD)UserGetActiveWindow()); + RETURN ( (DWORD_PTR)UserGetActiveWindow()); } RETURN( 0); Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Fri Jul 25 08:26:08 2008 @@ -74,12 +74,12 @@ /* * @unimplemented */ -DWORD +DWORD_PTR STDCALL NtUserCallNoParam(DWORD Routine) { - DWORD Result = 0; - DECLARE_RETURN(DWORD); + DWORD_PTR Result = 0; + DECLARE_RETURN(DWORD_PTR); DPRINT("Enter NtUserCallNoParam\n"); UserEnterExclusive(); @@ -87,39 +87,39 @@ switch(Routine) { case NOPARAM_ROUTINE_CREATEMENU: - Result = (DWORD)UserCreateMenu(FALSE); + Result = (DWORD_PTR)UserCreateMenu(FALSE); break; case NOPARAM_ROUTINE_CREATEMENUPOPUP: - Result = (DWORD)UserCreateMenu(TRUE); + Result = (DWORD_PTR)UserCreateMenu(TRUE); break; case NOPARAM_ROUTINE_DESTROY_CARET: - Result = (DWORD)co_IntDestroyCaret(PsGetCurrentThread()->Tcb.Win32Thread); + Result = (DWORD_PTR)co_IntDestroyCaret(PsGetCurrentThread()->Tcb.Win32Thread); break; case NOPARAM_ROUTINE_INIT_MESSAGE_PUMP: - Result = (DWORD)IntInitMessagePumpHook(); + Result = (DWORD_PTR)IntInitMessagePumpHook(); break; case NOPARAM_ROUTINE_UNINIT_MESSAGE_PUMP: - Result = (DWORD)IntUninitMessagePumpHook(); + Result = (DWORD_PTR)IntUninitMessagePumpHook(); break; case NOPARAM_ROUTINE_GETMESSAGEEXTRAINFO: - Result = (DWORD)MsqGetMessageExtraInfo(); + Result = (DWORD_PTR)MsqGetMessageExtraInfo(); break; case NOPARAM_ROUTINE_ANYPOPUP: - Result = (DWORD)IntAnyPopup(); + Result = (DWORD_PTR)IntAnyPopup(); break; case NOPARAM_ROUTINE_CSRSS_INITIALIZED: - Result = (DWORD)CsrInit(); + Result = (DWORD_PTR)CsrInit(); break; case NOPARAM_ROUTINE_MSQCLEARWAKEMASK: - RETURN( (DWORD)IntMsqClearWakeMask()); + RETURN( (DWORD_PTR)IntMsqClearWakeMask()); default: DPRINT1("Calling invalid routine number 0x%x in NtUserCallNoParam\n", Routine); @@ -138,13 +138,13 @@ /* * @implemented */ -DWORD +DWORD_PTR STDCALL NtUserCallOneParam( DWORD Param, DWORD Routine) { - DECLARE_RETURN(DWORD); + DECLARE_RETURN(DWORD_PTR); DPRINT("Enter NtUserCallOneParam\n"); @@ -153,7 +153,7 @@ switch(Routine) { case ONEPARAM_ROUTINE_SHOWCURSOR: - RETURN( (DWORD)UserShowCursor((BOOL)Param) ); + RETURN( (DWORD_PTR)UserShowCursor((BOOL)Param) ); case ONEPARAM_ROUTINE_GETDESKTOPMAPPING: { @@ -163,7 +163,7 @@ { /* Try convert the pointer to a user mode pointer if the desktop is mapped into the process */ - RETURN((DWORD)DesktopHeapAddressToUser((PVOID)Param)); + RETURN((DWORD_PTR)DesktopHeapAddressToUser((PVOID)Param)); } else { @@ -174,14 +174,14 @@ case ONEPARAM_ROUTINE_GETMENU: { PWINDOW_OBJECT Window; - DWORD Result; + DWORD DWORD_PTR; if(!(Window = UserGetWindowObject((HWND)Param))) { RETURN( FALSE); } - Result = (DWORD)Window->Wnd->IDMenu; + Result = (DWORD_PTR)Window->Wnd->IDMenu; RETURN( Result); } @@ -189,7 +189,7 @@ case ONEPARAM_ROUTINE_ISWINDOWUNICODE: { PWINDOW_OBJECT Window; - DWORD Result; + DWORD_PTR Result; Window = UserGetWindowObject((HWND)Param); if(!Window) @@ -201,12 +201,12 @@ } case ONEPARAM_ROUTINE_WINDOWFROMDC: - RETURN( (DWORD)IntWindowFromDC((HDC)Param)); + RETURN( (DWORD_PTR)IntWindowFromDC((HDC)Param)); case ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID: { PWINDOW_OBJECT Window; - DWORD Result; + DWORD_PTR Result; Window = UserGetWindowObject((HWND)Param); if(!Window) @@ -223,17 +223,17 @@ { PWINSTATION_OBJECT WinSta; NTSTATUS Status; - DWORD Result; + DWORD_PTR Result; Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, KernelMode, 0, &WinSta); if (!NT_SUCCESS(Status)) - RETURN( (DWORD)FALSE); + RETURN( (DWORD_PTR)FALSE); /* FIXME - Result = (DWORD)IntSwapMouseButton(WinStaObject, (BOOL)Param); */ + Result = (DWORD_PTR)IntSwapMouseButton(WinStaObject, (BOOL)Param); */ Result = 0; ObDereferenceObject(WinSta); @@ -241,10 +241,10 @@ } case ONEPARAM_ROUTINE_SWITCHCARETSHOWING: - RETURN( (DWORD)IntSwitchCaretShowing((PVOID)Param)); + RETURN( (DWORD_PTR)IntSwitchCaretShowing((PVOID)Param)); case ONEPARAM_ROUTINE_SETCARETBLINKTIME: - RETURN( (DWORD)IntSetCaretBlinkTime((UINT)Param)); + RETURN( (DWORD_PTR)IntSetCaretBlinkTime((UINT)Param)); case ONEPARAM_ROUTINE_GETWINDOWINSTANCE: { @@ -256,12 +256,12 @@ RETURN( FALSE); } - Result = (DWORD)Window->Wnd->Instance; + Result = (DWORD_PTR)Window->Wnd->Instance; RETURN( Result); } case ONEPARAM_ROUTINE_SETMESSAGEEXTRAINFO: - RETURN( (DWORD)MsqSetMessageExtraInfo((LPARAM)Param)); + RETURN( (DWORD_PTR)MsqSetMessageExtraInfo((LPARAM)Param)); case ONEPARAM_ROUTINE_CREATECURICONHANDLE: { @@ -282,7 +282,7 @@ } ObDereferenceObject(WinSta); - RETURN((DWORD)CurIcon->Self); + RETURN((DWORD_PTR)CurIcon->Self); } case ONEPARAM_ROUTINE_GETCURSORPOSITION: @@ -292,13 +292,13 @@ POINT Pos; if(!Param) - RETURN( (DWORD)FALSE); + RETURN( (DWORD_PTR)FALSE); Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, KernelMode, 0, &WinSta); if (!NT_SUCCESS(Status)) - RETURN( (DWORD)FALSE); + RETURN( (DWORD_PTR)FALSE); /* FIXME - check if process has WINSTA_READATTRIBUTES */ IntGetCursorLocation(WinSta, &Pos); @@ -313,20 +313,20 @@ ObDereferenceObject(WinSta); - RETURN( (DWORD)TRUE); + RETURN( (DWORD_PTR)TRUE); } case ONEPARAM_ROUTINE_ISWINDOWINDESTROY: { PWINDOW_OBJECT Window; - DWORD Result; + DWORD_PTR Result; if(!(Window = UserGetWindowObject((HWND)Param))) { RETURN( FALSE); } - Result = (DWORD)IntIsWindowInDestroy(Window); + Result = (DWORD_PTR)IntIsWindowInDestroy(Window); RETURN( Result); } @@ -356,13 +356,13 @@ } case ONEPARAM_ROUTINE_MSQSETWAKEMASK: - RETURN( (DWORD)IntMsqSetWakeMask(Param)); + RETURN( (DWORD_PTR)IntMsqSetWakeMask(Param)); case ONEPARAM_ROUTINE_GETKEYBOARDTYPE: RETURN( UserGetKeyboardType(Param)); case ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT: - RETURN( (DWORD)UserGetKeyboardLayout(Param)); + RETURN( (DWORD_PTR)UserGetKeyboardLayout(Param)); case ONEPARAM_ROUTINE_REGISTERUSERMODULE: { @@ -415,7 +415,7 @@ /* * @implemented */ -DWORD +DWORD_PTR STDCALL NtUserCallTwoParam( DWORD Param1, @@ -424,7 +424,7 @@ { NTSTATUS Status; PWINDOW_OBJECT Window; - DECLARE_RETURN(DWORD); + DECLARE_RETURN(DWORD_PTR); DPRINT("Enter NtUserCallTwoParam\n"); UserEnterExclusive(); @@ -433,12 +433,12 @@ { case TWOPARAM_ROUTINE_GETWINDOWRGNBOX: { - DWORD Ret; + DWORD_PTR Ret; RECT rcRect; Window = UserGetWindowObject((HWND)Param1); if (!Window) RETURN(ERROR); - Ret = (DWORD)IntGetWindowRgnBox(Window, &rcRect); + Ret = (DWORD_PTR)IntGetWindowRgnBox(Window, &rcRect); Status = MmCopyToCaller((PVOID)Param2, &rcRect, sizeof(RECT)); if(!NT_SUCCESS(Status)) { @@ -452,11 +452,11 @@ Window = UserGetWindowObject((HWND)Param1); if (!Window) RETURN(ERROR); - RETURN( (DWORD)IntGetWindowRgn(Window, (HRGN)Param2)); + RETURN( (DWORD_PTR)IntGetWindowRgn(Window, (HRGN)Param2)); } case TWOPARAM_ROUTINE_SETMENUBARHEIGHT: { - DWORD Ret; + DWORD_PTR Ret; PMENU_OBJECT MenuObject = IntGetMenuObject((HMENU)Param1); if(!MenuObject) RETURN( 0); @@ -467,7 +467,7 @@ MenuObject->MenuInfo.Height = (int)Param2; } else - Ret = (DWORD)MenuObject->MenuInfo.Height; + Ret = (DWORD_PTR)MenuObject->MenuInfo.Height; IntReleaseMenuObject(MenuObject); RETURN( Ret); } @@ -488,7 +488,7 @@ Ret = IntSetMenuItemRect(MenuObject, smir.uItem, smir.fByPosition, &smir.rcRect); IntReleaseMenuObject(MenuObject); - RETURN( (DWORD)Ret); + RETURN( (DWORD_PTR)Ret); } case TWOPARAM_ROUTINE_SETGUITHRDHANDLE: @@ -496,7 +496,7 @@ PUSER_MESSAGE_QUEUE MsgQueue = ((PW32THREAD)PsGetCurrentThread()->Tcb.Win32Thread)->MessageQueue; ASSERT(MsgQueue); - RETURN( (DWORD)MsqSetStateWindow(MsgQueue, (ULONG)Param1, (HWND)Param2)); + RETURN( (DWORD_PTR)MsqSetStateWindow(MsgQueue, (ULONG)Param1, (HWND)Param2)); } case TWOPARAM_ROUTINE_ENABLEWINDOW: @@ -508,7 +508,7 @@ Window = UserGetWindowObject((HWND)Param1); if (!Window) RETURN(0); - RETURN( (DWORD)IntShowOwnedPopups(Window, (BOOL) Param2)); + RETURN( (DWORD_PTR)IntShowOwnedPopups(Window, (BOOL) Param2)); } case TWOPARAM_ROUTINE_ROS_UPDATEUISTATE: @@ -532,20 +532,20 @@ if(!(Window = UserGetWindowObject((HWND)Param1))) { - RETURN( (DWORD)FALSE); + RETURN( (DWORD_PTR)FALSE); } Window->Wnd->ContextHelpId = Param2; - RETURN( (DWORD)TRUE); + RETURN( (DWORD_PTR)TRUE); case TWOPARAM_ROUTINE_SETCARETPOS: - RETURN( (DWORD)co_IntSetCaretPos((int)Param1, (int)Param2)); + RETURN( (DWORD_PTR)co_IntSetCaretPos((int)Param1, (int)Param2)); case TWOPARAM_ROUTINE_GETWINDOWINFO: { WINDOWINFO wi; - DWORD Ret; + DWORD_PTR Ret; if(!(Window = UserGetWindowObject((HWND)Param1))) { @@ -571,7 +571,7 @@ } #endif - if((Ret = (DWORD)IntGetWindowInfo(Window, &wi))) + if((Ret = (DWORD_PTR)IntGetWindowInfo(Window, &wi))) { Status = MmCopyToCaller((PVOID)Param2, &wi, sizeof(WINDOWINFO)); if(!NT_SUCCESS(Status)) @@ -585,13 +585,13 @@ } case TWOPARAM_ROUTINE_REGISTERLOGONPROC: - RETURN( (DWORD)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2)); + RETURN( (DWORD_PTR)co_IntRegisterLogonProcess((HANDLE)Param1, (BOOL)Param2)); case TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES: case TWOPARAM_ROUTINE_GETSYSCOLORPENS: case TWOPARAM_ROUTINE_GETSYSCOLORS: { - DWORD Ret = 0; + DWORD_PTR Ret = 0; union { PVOID Pointer; @@ -608,13 +608,13 @@ switch(Routine) { case TWOPARAM_ROUTINE_GETSYSCOLORBRUSHES: - Ret = (DWORD)IntGetSysColorBrushes(Buffer.Brushes, (UINT)Param2); + Ret = (DWORD_PTR)IntGetSysColorBrushes(Buffer.Brushes, (UINT)Param2); break; case TWOPARAM_ROUTINE_GETSYSCOLORPENS: - Ret = (DWORD)IntGetSysColorPens(Buffer.Pens, (UINT)Param2); + Ret = (DWORD_PTR)IntGetSysColorPens(Buffer.Pens, (UINT)Param2); break; case TWOPARAM_ROUTINE_GETSYSCOLORS: - Ret = (DWORD)IntGetSysColors(Buffer.Colors, (UINT)Param2); + Ret = (DWORD_PTR)IntGetSysColors(Buffer.Colors, (UINT)Param2); break; default: Ret = 0; @@ -638,7 +638,7 @@ case TWOPARAM_ROUTINE_ROS_REGSYSCLASSES: { - DWORD Ret = 0; + DWORD_PTR Ret = 0; DWORD Count = Param1; PREGISTER_SYSCLASS RegSysClassArray = (PREGISTER_SYSCLASS)Param2; @@ -651,7 +651,7 @@ Count, 2); - Ret = (DWORD)UserRegisterSystemClasses(Count, + Ret = (DWORD_PTR)UserRegisterSystemClasses(Count, RegSysClassArray); } _SEH_HANDLE

16 years, 1 month

[tkreuzer] 34779: Sync with trunk head (34777)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jul 25 08:10:00 2008 New Revision: 34779 URL: http://svn.reactos.org/svn/reactos?rev=34779&view=rev Log: Sync with trunk head (34777) Added: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.spec - copied unchanged from r34778, trunk/reactos/drivers/base/bootvid/bootvid.spec Removed: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_arm.def branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_i386.def Modified: branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/scm.c branches/ros-amd64-bringup/reactos/dll/win32/shell32/folder_options.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild branches/ros-amd64-bringup/reactos/include/psdk/winuser.h branches/ros-amd64-bringup/reactos/include/reactos/idl/pnp.idl branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/msgqueue.c branches/ros-amd64-bringup/reactos/tools/cabman/cabinet.cxx branches/ros-amd64-bringup/reactos/tools/sysreg/os_support.cpp Modified: branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -160,7 +160,7 @@ /* Function 0 */ -DWORD PNP_Function0( +DWORD PNP_Disconnect( handle_t hBinding) { UNREFERENCED_PARAMETER(hBinding); @@ -170,7 +170,7 @@ /* Function 1 */ -DWORD PNP_Function1( +DWORD PNP_Connect( handle_t hBinding) { UNREFERENCED_PARAMETER(hBinding); @@ -1681,7 +1681,7 @@ /* Function 55 */ -DWORD PNP_Function55( +DWORD PNP_SetHwProf( handle_t hBinding) { UNIMPLEMENTED; @@ -1690,7 +1690,7 @@ /* Function 56 */ -DWORD PNP_Function56( +DWORD PNP_QueryArbitratorFreeData( handle_t hBinding) { UNIMPLEMENTED; @@ -1699,7 +1699,7 @@ /* Function 57 */ -DWORD PNP_Function57( +DWORD PNP_QueryArbitratorFreeSize( handle_t hBinding) { UNIMPLEMENTED; @@ -1710,7 +1710,7 @@ /* Function 58 */ CONFIGRET PNP_RunDetection( - handle_t BindingHandle, + handle_t hBinding, DWORD ulFlags) { UNIMPLEMENTED; @@ -1719,7 +1719,7 @@ /* Function 59 */ -DWORD PNP_Function59( +DWORD PNP_RegisterNotification( handle_t hBinding) { UNIMPLEMENTED; @@ -1728,7 +1728,7 @@ /* Function 60 */ -DWORD PNP_Function60( +DWORD PNP_UnregisterNotification( handle_t hBinding) { UNIMPLEMENTED; @@ -1831,6 +1831,69 @@ PNP_PROP_SIZE PropertySize, BYTE *PropertyBuffer, DWORD Flags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 68 */ +DWORD PNP_InstallDevInst( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 69 */ +DWORD PNP_ApplyPowerSettings( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 70 */ +DWORD PNP_DriverStoreAddDriverPackage( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 71 */ +DWORD PNP_DriverStoreDeleteDriverPackage( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 72 */ +DWORD PNP_RegisterServiceNotification( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 73 */ +DWORD PNP_SetActiveService( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 74 */ +DWORD PNP_DeleteServiceDevices( + handle_t hBinding) { UNIMPLEMENTED; return CR_CALL_NOT_IMPLEMENTED; Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -502,7 +502,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - MultiByteToWideChar(CP_ACP, 0, lpDependencies, -1, lpDependenciesW, dwDependenciesLength); + MultiByteToWideChar(CP_ACP, 0, lpDependencies, dwDependenciesLength, lpDependenciesW, dwDependenciesLength); } if (lpServiceStartName) Modified: branches/ros-amd64-bringup/reactos/dll/win32/shell32/folder_options.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -80,6 +80,105 @@ return FALSE; } +VOID +InitializeFileTypesListCtrlColumns(HWND hDlgCtrl) +{ + RECT clientRect; + LVCOLUMNW col; + WCHAR szName[50]; + + if (!LoadStringW(shell32_hInstance, IDS_COLUMN_EXTENSION, szName, sizeof(szName) / sizeof(WCHAR))) + szName[0] = 0; + szName[(sizeof(szName)/sizeof(WCHAR))-1] = 0; + + GetClientRect(hDlgCtrl, &clientRect); + ZeroMemory(&col, sizeof(LV_COLUMN)); + col.mask = LVCF_SUBITEM | LVCF_WIDTH | LVCF_FMT; + col.iSubItem = 0; + col.pszText = szName; + col.fmt = LVCFMT_LEFT; + col.cx = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL); + (void)ListView_InsertColumnW(hDlgCtrl, 0, &col); +} +INT +FindItem(HWND hDlgCtrl, WCHAR * ItemName) +{ + LVFINDINFOW findInfo; + ZeroMemory(&findInfo, sizeof(LVFINDINFOW)); + + findInfo.flags = LVFI_STRING; + findInfo.psz = ItemName; + return ListView_FindItem(hDlgCtrl, 0, &findInfo); +} + +VOID +InsertFileType(HWND hDlgCtrl, WCHAR * szName, DWORD Size, INT iItem) +{ + WCHAR szPath[100]; + HKEY hKey; + LVITEMW lvItem; + DWORD dwSize; + + if (FindItem(hDlgCtrl, szName) != -1) + return; + + wcscpy(szPath, szName); + /* get the name */ + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szPath, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + if (RegLoadMUIStringW(hKey, L"FriendlyTypeName", szName, Size, NULL, 0, NULL) != ERROR_SUCCESS) + { + dwSize = Size; + if (RegQueryValueExW(hKey, NULL, NULL, NULL, (LPBYTE)szName, &dwSize) != ERROR_SUCCESS) + { + wcscpy(szName, szPath); + } + } + RegCloseKey(hKey); + szName[(Size/sizeof(WCHAR))-1] = 0; + } + wcscat(szPath, L"\\shell"); + + ZeroMemory(&lvItem, sizeof(LVITEMW)); + lvItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE; + lvItem.state = LVIS_SELECTED; + lvItem.pszText = szName; + lvItem.iItem = iItem; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szPath, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + lvItem.lParam = 0; + (void)ListView_InsertItemW(hDlgCtrl, &lvItem); + RegCloseKey(hKey); + } +} + +BOOL +InitializeFileTypesListCtrl(HWND hwndDlg) +{ + HWND hDlgCtrl; + DWORD dwIndex = 0; + WCHAR szName[50]; + DWORD dwName; + INT iItem = 0; + + + hDlgCtrl = GetDlgItem(hwndDlg, 14000); + InitializeFileTypesListCtrlColumns(hDlgCtrl); + + + + dwName = sizeof(szName) / sizeof(WCHAR); + + while(RegEnumKeyExW(HKEY_CLASSES_ROOT, dwIndex++, szName, &dwName, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + InsertFileType(hDlgCtrl, szName, sizeof(szName), iItem++); + dwName = sizeof(szName) / sizeof(WCHAR); + } + return TRUE; +} + + INT_PTR CALLBACK FolderOptionsFileTypesDlg( @@ -89,7 +188,12 @@ LPARAM lParam ) { - + switch(uMsg) + { + case WM_INITDIALOG: + InitializeFileTypesListCtrl(hwndDlg); + return TRUE; + } return FALSE; @@ -102,7 +206,7 @@ PROPSHEETHEADERW pinfo; HPROPSHEETPAGE hppages[3]; HPROPSHEETPAGE hpage; - UINT num_pages = 0; + UINT num_pages = 0; WCHAR szOptions[100]; hpage = SH_CreatePropertySheetPage("FOLDER_OPTIONS_GENERAL_DLG", FolderOptionsGeneralDlg, 0, NULL); @@ -116,14 +220,14 @@ hpage = SH_CreatePropertySheetPage("FOLDER_OPTIONS_FILETYPES_DLG", FolderOptionsFileTypesDlg, 0, NULL); if (hpage) hppages[num_pages++] = hpage; - + szOptions[0] = L'\0'; - LoadStringW(hInst, IDS_FOLDER_OPTIONS, szOptions, sizeof(szOptions) / sizeof(WCHAR)); - szOptions[99] = L'\0'; - + LoadStringW(shell32_hInstance, IDS_FOLDER_OPTIONS, szOptions, sizeof(szOptions) / sizeof(WCHAR)); + szOptions[(sizeof(szOptions)/sizeof(WCHAR))-1] = L'\0'; + memset(&pinfo, 0x0, sizeof(PROPSHEETHEADERW)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); - pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE; + pinfo.dwFlags = PSH_NOCONTEXTHELP; pinfo.nPages = num_pages; pinfo.u3.phpage = hppages; pinfo.pszCaption = szOptions; Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -422,6 +422,9 @@ PKBDLLHOOKSTRUCT KeyboardLlData; PMSLLHOOKSTRUCT MouseLlData; PMSG Msg; + PMOUSEHOOKSTRUCT MHook; + PCWPSTRUCT CWP; + PCWPRETSTRUCT CWPR; Common = (PHOOKPROC_CALLBACK_ARGUMENTS) Arguments; @@ -502,12 +505,27 @@ MouseLlData = (PMSLLHOOKSTRUCT)((PCHAR) Common + Common->lParam); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) MouseLlData); break; + case WH_MOUSE: + MHook = (PMOUSEHOOKSTRUCT)((PCHAR) Common + Common->lParam); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) MHook); + break; + case WH_CALLWNDPROC: + CWP = (PCWPSTRUCT)((PCHAR) Common + Common->lParam); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) CWP); + break; + case WH_CALLWNDPROCRET: + CWPR = (PCWPRETSTRUCT)((PCHAR) Common + Common->lParam); + Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) CWPR); + break; case WH_MSGFILTER: case WH_SYSMSGFILTER: case WH_GETMESSAGE: Msg = (PMSG)((PCHAR) Common + Common->lParam); // FIXME("UHOOK Memory: %x: %x\n",Common, Msg); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) Msg); + break; + case WH_KEYBOARD: + Result = Common->Proc(Common->Code, Common->wParam, Common->lParam); break; default: return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -1441,6 +1441,11 @@ MsgiKMToUMCleanup(&Info.Msg, &Conversion.UnicodeMsg); return (BOOL) -1; } + if (!lpMsg) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } *lpMsg = Conversion.AnsiMsg; Conversion.Ansi = TRUE; Conversion.FinalMsg = lpMsg; @@ -1481,6 +1486,11 @@ { return (BOOL) -1; } + if (!lpMsg) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } *lpMsg = Conversion.UnicodeMsg; Conversion.Ansi = FALSE; Conversion.FinalMsg = lpMsg; @@ -1527,6 +1537,11 @@ MsgiKMToUMCleanup(&Info.Msg, &Conversion.UnicodeMsg); return (BOOL) -1; } + if (!lpMsg) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } *lpMsg = Conversion.AnsiMsg; Conversion.Ansi = TRUE; Conversion.FinalMsg = lpMsg; @@ -1570,6 +1585,11 @@ { return (BOOL) -1; } + if (!lpMsg) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } *lpMsg = Conversion.UnicodeMsg; Conversion.Ansi = FALSE; Conversion.FinalMsg = lpMsg; @@ -2560,15 +2580,6 @@ return IsDialogMessageW( hwndDlg, &msg ); } -typedef struct _BROADCASTPARM -{ - DWORD flags; - DWORD recipients; - HDESK hDesk; - HWND hWnd; - LUID luid; -} BROADCASTPARM, *PBROADCASTPARM; - LONG STDCALL IntBroadcastSystemMessage( Modified: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="bootvid.dll"> - <importlibrary definition="bootvid_$(ARCH).def"></importlibrary> + <importlibrary definition="bootvid.spec.def"></importlibrary> <bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" /> <include base="bootvid">.</include> <library>ntoskrnl</library> @@ -20,5 +20,6 @@ </directory> </if> <file>bootvid.rc</file> + <file>bootvid.spec</file> <pch>precomp.h</pch> </module> Removed: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_arm.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_arm.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_arm.def (removed) @@ -1,15 +1,0 @@ -LIBRARY BOOTVID.DLL - -EXPORTS -VidBitBlt -VidBufferToScreenBlt -VidCleanUp -VidDisplayString -VidDisplayStringXY -VidInitialize -VidResetDisplay -VidScreenToBufferBlt -VidSetScrollRegion -VidSetTextColor -VidSolidColorFill - Removed: branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_i386.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_i386.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/bootvid/bootvid_i386.def (removed) @@ -1,15 +1,0 @@ -LIBRARY BOOTVID.DLL - -EXPORTS -VidBitBlt@12 -VidBufferToScreenBlt@24 -VidCleanUp@0 -VidDisplayString@4 -VidDisplayStringXY -VidInitialize@4 -VidResetDisplay@4 -VidScreenToBufferBlt@24 -VidSetScrollRegion@16 -VidSetTextColor@4 -VidSolidColorFill@20 - Modified: branches/ros-amd64-bringup/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -1170,6 +1170,12 @@ #define SMTO_ABORTIFHUNG 2 #define SMTO_BLOCK 1 #define SMTO_NORMAL 0 +#if (WINVER >= 0x0500) +#define SMTO_NOTIMEOUTIFNOTHUNG 8 +#endif +#if (WINVER >= 0x0600) +#define SMTO_ERRORONEXIT 32 +#endif #define SIF_ALL 23 #define SIF_PAGE 2 #define SIF_POS 4 Modified: branches/ros-amd64-bringup/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -253,11 +253,11 @@ interface pnp { /* Function 0 */ - DWORD PNP_Function0( + DWORD PNP_Disconnect( [in] handle_t hBinding); /* FIXME */ /* Function 1 */ - DWORD PNP_Function1( + DWORD PNP_Connect( [in] handle_t hBinding); /* FIXME */ /* Function 2 */ @@ -716,15 +716,15 @@ [in] DWORD ulFlags); /* Function 55 */ - DWORD PNP_Function55( + DWORD PNP_SetHwProf( [in] handle_t hBinding); /* Function 56 */ - DWORD PNP_Function56( + DWORD PNP_QueryArbitratorFreeData( [in] handle_t hBinding); /* Function 57 */ - DWORD PNP_Function57( + DWORD PNP_QueryArbitratorFreeSize( [in] handle_t hBinding); /* Function 58 */ @@ -733,12 +733,14 @@ [in] DWORD ulFlags); /* Function 59 */ - DWORD PNP_Function59( + DWORD PNP_RegisterNotification( [in] handle_t hBinding); /* Function 60 */ - DWORD PNP_Function60( + DWORD PNP_UnregisterNotification( [in] handle_t hBinding); + +cpp_quote("#if _WIN32_WINNT >= 0x0501") /* Function 61 */ DWORD PNP_GetCustomDevProp( @@ -769,6 +771,8 @@ [in] handle_t hBinding, [out] DWORD *pulSSDIFlags, [in] DWORD ulFlags); + +cpp_quote("#if _WIN32_WINNT >= 0x0600") /* Function 65 */ DWORD PNP_GetObjectPropKeys( @@ -805,4 +809,36 @@ [in] PNP_PROP_SIZE PropertySize, [in, unique, size_is(PropertySize)] BYTE *PropertyBuffer, [in] DWORD Flags); + + /* Function 68 */ + DWORD PNP_InstallDevInst( + [in] handle_t hBinding); /* FIXME */ + + /* Function 69 */ + DWORD PNP_ApplyPowerSettings( + [in] handle_t hBinding); /* FIXME */ + + /* Function 70 */ + DWORD PNP_DriverStoreAddDriverPackage( + [in] handle_t hBinding); /* FIXME */ + + /* Function 71 */ + DWORD PNP_DriverStoreDeleteDriverPackage( + [in] handle_t hBinding); /* FIXME */ + + /* Function 72 */ + DWORD PNP_RegisterServiceNotification( + [in] handle_t hBinding); /* FIXME */ + + /* Function 73 */ + DWORD PNP_SetActiveService( + [in] handle_t hBinding); /* FIXME */ + + /* Function 74 */ + DWORD PNP_DeleteServiceDevices( + [in] handle_t hBinding); /* FIXME */ + +cpp_quote("#endif /* WIN32_WINNT >= 0x0600 */") +cpp_quote("#endif /* WIN32_WINNT >= 0x0501 */") + } Modified: branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -392,7 +392,14 @@ ATOM Atom; } PROPERTY, *PPROPERTY; - +typedef struct _BROADCASTPARM +{ + DWORD flags; + DWORD recipients; + HDESK hDesk; + HWND hWnd; + LUID luid; +} BROADCASTPARM, *PBROADCASTPARM; PW32THREADINFO GetW32ThreadInfo(VOID); PW32PROCESSINFO GetW32ProcessInfo(VOID); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -342,19 +342,22 @@ PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR Md; ULONG_PTR LastKrnlPhysAddr = 0; - + for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; NextEntry = NextEntry->Flink) { Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - if (Md->MemoryType != LoaderFree) + + if (Md->MemoryType != LoaderFree && + Md->MemoryType != LoaderFirmwareTemporary && + Md->MemoryType != LoaderSpecialMemory) { if (Md->BasePage+Md->PageCount > LastKrnlPhysAddr) - LastKrnlPhysAddr = Md->BasePage+Md->PageCount; + LastKrnlPhysAddr = Md->BasePage+Md->PageCount; } } - + /* Convert to a physical address */ return LastKrnlPhysAddr << PAGE_SHIFT; } Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -379,13 +379,23 @@ case WH_MOUSE_LL: ArgumentLength += sizeof(MSLLHOOKSTRUCT); break; + case WH_MOUSE: + ArgumentLength += sizeof(MOUSEHOOKSTRUCT); + break; + case WH_CALLWNDPROC: + ArgumentLength += sizeof(CWPSTRUCT); + break; + case WH_CALLWNDPROCRET: + ArgumentLength += sizeof(CWPRETSTRUCT); + break; case WH_MSGFILTER: case WH_SYSMSGFILTER: case WH_GETMESSAGE: ArgumentLength += sizeof(MSG); break; + case WH_KEYBOARD: // case WH_SHELL: -// break; + break; default: DPRINT1("Trying to call unsupported window hook %d\n", HookId); return 0; @@ -444,6 +454,18 @@ RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MSLLHOOKSTRUCT)); Common->lParam = (LPARAM) (Extra - (PCHAR) Common); break; + case WH_MOUSE: + RtlCopyMemory(Extra, (PVOID) lParam, sizeof(MOUSEHOOKSTRUCT)); + Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + break; + case WH_CALLWNDPROC: + RtlCopyMemory(Extra, (PVOID) lParam, sizeof(CWPSTRUCT)); + Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + break; + case WH_CALLWNDPROCRET: + RtlCopyMemory(Extra, (PVOID) lParam, sizeof(CWPRETSTRUCT)); + Common->lParam = (LPARAM) (Extra - (PCHAR) Common); + break; case WH_MSGFILTER: case WH_SYSMSGFILTER: case WH_GETMESSAGE: @@ -451,9 +473,11 @@ Common->lParam = (LPARAM) (Extra - (PCHAR) Common); // DPRINT1("KHOOK Memory: %x\n",Common); break; + case WH_KEYBOARD: + break; // case WH_SHELL: // Extra = lParam; -// break; + break; } ResultPointer = NULL; Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -922,7 +922,9 @@ { //TODO : sinthesize CF_UNICODETEXT & CF_OEMTEXT // CF_TEXT -> CF_UNICODETEXT - RtlAnsiStringToUnicodeString(&unicodeString, hCBData, TRUE); + ansiString.Buffer = hCBData; + ansiString.Length = size; + RtlAnsiStringToUnicodeString(&unicodeString, &ansiString, TRUE); intAddFormatedData(CF_UNICODETEXT, unicodeString.Buffer, unicodeString.Length * sizeof(WCHAR)); // CF_TEXT -> CF_OEMTEXT RtlUnicodeStringToOemString(&oemString, &unicodeString, TRUE); Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -1003,14 +1003,10 @@ /* We only (partially) support local WH_CBT hooks and * WH_KEYBOARD_LL, WH_MOUSE_LL and WH_GETMESSAGE hooks for now */ - if (WH_CALLWNDPROC == HookId && - WH_CALLWNDPROCRET == HookId && - WH_DEBUG == HookId && - WH_JOURNALPLAYBACK == HookId && - WH_JOURNALRECORD == HookId && - WH_FOREGROUNDIDLE == HookId && - WH_KEYBOARD == HookId && - WH_MOUSE == HookId && + if (WH_DEBUG == HookId || + WH_JOURNALPLAYBACK == HookId || + WH_JOURNALRECORD == HookId || + WH_FOREGROUNDIDLE == HookId || WH_SHELL == HookId) { #if 0 /* Removed to get winEmbed working again */ Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -658,6 +658,7 @@ BOOL Present, RemoveMessages; USER_REFERENCE_ENTRY Ref; USHORT HitTest; + MOUSEHOOKSTRUCT MHook; /* The queues and order in which they are checked are documented in the MSDN article on GetMessage() */ @@ -814,9 +815,51 @@ goto CheckMessages; } MsgExit: + if ( ISITHOOKED(WH_MOUSE) && + Msg->Msg.message >= WM_MOUSEFIRST && + Msg->Msg.message <= WM_MOUSELAST ) + { + MHook.pt = Msg->Msg.pt; + MHook.hwnd = Msg->Msg.hwnd; + MHook.wHitTestCode = HitTest; + MHook.dwExtraInfo = 0; + if (co_HOOK_CallHooks( WH_MOUSE, + RemoveMsg ? HC_ACTION : HC_NOREMOVE, + Msg->Msg.message, + (LPARAM)&MHook )) + { + if (ISITHOOKED(WH_CBT)) + { + MHook.pt = Msg->Msg.pt; + MHook.hwnd = Msg->Msg.hwnd; + MHook.wHitTestCode = HitTest; + MHook.dwExtraInfo = 0; + co_HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, + Msg->Msg.message, (LPARAM)&MHook); + } + return FALSE; + } + } + if ( ISITHOOKED(WH_KEYBOARD) && + (Msg->Msg.message == WM_KEYDOWN || Msg->Msg.message == WM_KEYUP) ) + { + if (co_HOOK_CallHooks( WH_KEYBOARD, + RemoveMsg ? HC_ACTION : HC_NOREMOVE, + LOWORD(Msg->Msg.wParam), + Msg->Msg.lParam)) + { + if (ISITHOOKED(WH_CBT)) + { + /* skip this message */ + co_HOOK_CallHooks( WH_CBT, HCBT_KEYSKIPPED, + LOWORD(Msg->Msg.wParam), Msg->Msg.lParam ); + } + return FALSE; + } + } // The WH_GETMESSAGE hook enables an application to monitor messages about to // be returned by the GetMessage or PeekMessage function. - if(ISITHOOKED(WH_GETMESSAGE)) + if (ISITHOOKED(WH_GETMESSAGE)) { //DPRINT1("Peek WH_GETMESSAGE -> %x\n",&Msg); co_HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, RemoveMsg & PM_REMOVE, (LPARAM)&Msg->Msg); @@ -863,7 +906,6 @@ } Present = co_IntPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg); - if (Present) { @@ -1346,8 +1388,8 @@ PW32THREAD Win32Thread; DECLARE_RETURN(LRESULT); USER_REFERENCE_ENTRY Ref; - - /* FIXME: Call hooks. */ + BOOL SameThread = FALSE; + if (!(Window = UserGetWindowObject(hWnd))) { RETURN( FALSE); @@ -1357,8 +1399,22 @@ Win32Thread = PsGetCurrentThreadWin32Thread(); + if (Window->ti == Win32Thread->ThreadInfo) + SameThread = TRUE; + + if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || + (SameThread && ISITHOOKED(WH_CALLWNDPROC)) ) + { + CWPSTRUCT CWP; + CWP.hwnd = hWnd; + CWP.message = Msg; + CWP.wParam = wParam; + CWP.lParam = lParam; + co_HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, SameThread, (LPARAM)&CWP ); + } + if (NULL != Win32Thread && - Window->MessageQueue == Win32Thread->MessageQueue) + Window->MessageQueue == Win32Thread->MessageQueue) { if (Win32Thread->IsExiting) { @@ -1379,7 +1435,7 @@ if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam))) { - DPRINT1("Failed to pack message parameters\n"); + DPRINT1("Failed to pack message parameters\n"); RETURN( FALSE); } @@ -1391,42 +1447,85 @@ *uResult = Result; } + if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || + (SameThread && ISITHOOKED(WH_CALLWNDPROCRET)) ) + { + CWPRETSTRUCT CWPR; + CWPR.hwnd = hWnd; + CWPR.message = Msg; + CWPR.wParam = wParam; + CWPR.lParam = lParam; + CWPR.lResult = Result; + co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); + } + if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam))) { DPRINT1("Failed to unpack message parameters\n"); - RETURN( TRUE); - } - - RETURN( TRUE); - } - - if(uFlags & SMTO_ABORTIFHUNG && MsqIsHung(Window->MessageQueue)) + RETURN( TRUE); + } + + RETURN( TRUE); + } + + if (uFlags & SMTO_ABORTIFHUNG && MsqIsHung(Window->MessageQueue)) { /* FIXME - Set a LastError? */ - RETURN( FALSE); - } - - if(Window->Status & WINDOWSTATUS_DESTROYING) + RETURN( FALSE); + } + + if (Window->Status & WINDOWSTATUS_DESTROYING) { /* FIXME - last error? */ DPRINT1("Attempted to send message to window 0x%x that is being destroyed!\n", hWnd); - RETURN( FALSE); - } - - Status = co_MsqSendMessage(Window->MessageQueue, hWnd, Msg, wParam, lParam, - uTimeout, (uFlags & SMTO_BLOCK), FALSE, uResult); - + RETURN( FALSE); + } + + do + { + Status = co_MsqSendMessage( Window->MessageQueue, + hWnd, + Msg, + wParam, + lParam, + uTimeout, + (uFlags & SMTO_BLOCK), + FALSE, + uResult); + } + while ((STATUS_TIMEOUT == Status) && + (uFlags & SMTO_NOTIMEOUTIFNOTHUNG) && + !MsqIsHung(Window->MessageQueue)); + + if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || + (SameThread && ISITHOOKED(WH_CALLWNDPROCRET)) ) + { + CWPRETSTRUCT CWPR; + CWPR.hwnd = hWnd; + CWPR.message = Msg; + CWPR.wParam = wParam; + CWPR.lParam = lParam; + CWPR.lResult = *uResult; + co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); + } if (STATUS_TIMEOUT == Status) { - /* MSDN says GetLastError() should return 0 after timeout */ - SetLastWin32Error(0); - RETURN( FALSE); +/* + MSDN says: + Microsoft Windows 2000: If GetLastError returns zero, then the function + timed out. + XP+ : If the function fails or times out, the return value is zero. + To get extended error information, call GetLastError. If GetLastError + returns ERROR_TIMEOUT, then the function timed out. + */ + SetLastWin32Error(ERROR_TIMEOUT); + RETURN( FALSE); } else if (! NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( FALSE); + RETURN( FALSE); } RETURN( TRUE); @@ -1506,8 +1605,7 @@ } else { - if(!co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) - { + if(!co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) { Result = 0; } } @@ -1863,14 +1961,121 @@ { return 0; } - UserRefObjectCo(Window, &Ref); switch(dwType) { case FNID_DEFWINDOWPROC: + UserRefObjectCo(Window, &Ref); lResult = IntDefWindowProc(Window, Msg, wParam, lParam, Ansi); + UserDerefObjectCo(Window); break; - } - UserDerefObjectCo(Window); + case FNID_BROADCASTSYSTEMMESSAGE: + { + PBROADCASTPARM parm; + BOOL BadChk = FALSE; + DWORD_PTR RetVal = 0; + lResult = -1; + + if (ResultInfo) + { + _SEH_TRY + { + ProbeForWrite((PVOID)ResultInfo, + sizeof(BROADCASTPARM), + 1); + parm = (PBROADCASTPARM)ResultInfo; + } + _SEH_HANDLE + { + BadChk = TRUE; + } + _SEH_END; + if (BadChk) break; + } + else + break; + + if ( parm->recipients & BSM_ALLDESKTOPS || + parm->recipients == BSM_ALLCOMPONENTS ) + { + } + else if (parm->recipients & BSM_APPLICATIONS) + { + if (parm->flags & BSF_QUERY) + { + if (parm->flags & BSF_FORCEIFHUNG || parm->flags & BSF_NOHANG) + { + co_IntSendMessageTimeout( HWND_BROADCAST, + Msg, + wParam, + lParam, + SMTO_ABORTIFHUNG, + 2000, + &RetVal); + } + else if (parm->flags & BSF_NOTIMEOUTIFNOTHUNG) + { + co_IntSendMessageTimeout( HWND_BROADCAST, + Msg, + wParam, + lParam, + SMTO_NOTIMEOUTIFNOTHUNG, + 2000, + &RetVal); + } + else + { + co_IntSendMessageTimeout( HWND_BROADCAST, + Msg, + wParam, + lParam, + SMTO_NORMAL, + 2000, + &RetVal); + } + } + else if (parm->flags & BSF_POSTMESSAGE) + { + lResult = UserPostMessage(HWND_BROADCAST, Msg, wParam, lParam); + } + else if ( parm->flags & BSF_SENDNOTIFYMESSAGE) + { + lResult = UserSendNotifyMessage(HWND_BROADCAST, Msg, wParam, lParam); + } + } + } + break; + case FNID_SENDMESSAGECALLBACK: + break; + case FNID_CALLWNDPROC: + { + CWPSTRUCT CWP; + PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); + CWP.hwnd = hWnd; + CWP.message = Msg; + CWP.wParam = wParam; + CWP.lParam = lParam; + lResult = co_HOOK_CallHooks( WH_CALLWNDPROC, + HC_ACTION, + ((ClientInfo->CI_flags & CI_CURTHPRHOOK) ? 1 : 0), + (LPARAM)&CWP ); + } + break; + case FNID_CALLWNDPROCRET: + { + CWPRETSTRUCT CWPR; + PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); + CWPR.hwnd = hWnd; + CWPR.message = Msg; + CWPR.wParam = wParam; + CWPR.lParam = lParam; + CWPR.lResult = ClientInfo->dwHookData; + lResult = co_HOOK_CallHooks( WH_CALLWNDPROCRET, + HC_ACTION, + ((ClientInfo->CI_flags & CI_CURTHPRHOOK) ? 1 : 0), + (LPARAM)&CWPR ); + } + break; + } UserLeave(); return lResult; } Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -70,7 +70,22 @@ static VOID FASTCALL IdlePing(VOID) { + HWND hWnd; + PWINDOW_OBJECT Window; PW32PROCESS W32d = PsGetCurrentProcessWin32Process(); + + hWnd = UserGetForegroundWindow(); + + Window = UserGetWindowObject(hWnd); + + if (Window && Window->ti) + { + if (Window->ti->Hooks & HOOKID_TO_FLAG(WH_FOREGROUNDIDLE)) + { + co_HOOK_CallHooks(WH_FOREGROUNDIDLE,HC_ACTION,0,0); + } + } + if (W32d && W32d->InputIdleEvent) KePulseEvent( W32d->InputIdleEvent, EVENT_INCREMENT, TRUE); } @@ -159,6 +174,7 @@ LARGE_INTEGER LargeTickCount; KIRQL OldIrql; ULONG Prev; + EVENTMSG Event; IntLockSystemMessageQueue(OldIrql); @@ -175,6 +191,13 @@ KeQueryTickCount(&LargeTickCount); Msg->time = MsqCalculateMessageTime(&LargeTickCount); + + Event.message = Msg->message; + Event.time = Msg->time; + Event.hwnd = Msg->hwnd; + Event.paramL = Msg->pt.x; + Event.paramH = Msg->pt.y; + co_HOOK_CallHooks( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)&Event); /* * If we got WM_MOUSEMOVE and there are already messages in the @@ -713,20 +736,36 @@ MSG Msg; LARGE_INTEGER LargeTickCount; KBDLLHOOKSTRUCT KbdHookData; + EVENTMSG Event; + + DPRINT("MsqPostKeyboardMessage(uMsg 0x%x, wParam 0x%x, lParam 0x%x)\n", + uMsg, wParam, lParam); // Condition may arise when calling MsqPostMessage and waiting for an event. if (!UserIsEntered()) UserEnterExclusive(); // Fixme: Not sure ATM if this thread is locked. - DPRINT("MsqPostKeyboardMessage(uMsg 0x%x, wParam 0x%x, lParam 0x%x)\n", - uMsg, wParam, lParam); + FocusMessageQueue = IntGetFocusMessageQueue(); Msg.hwnd = 0; + + if (FocusMessageQueue && (FocusMessageQueue->FocusWindow != (HWND)0)) + Msg.hwnd = FocusMessageQueue->FocusWindow; + Msg.message = uMsg; Msg.wParam = wParam; Msg.lParam = lParam; KeQueryTickCount(&LargeTickCount); Msg.time = MsqCalculateMessageTime(&LargeTickCount); + + Event.message = Msg.message; + Event.hwnd = Msg.hwnd; + Event.time = Msg.time; + Event.paramL = (Msg.wParam & 0xFF) | (HIWORD(Msg.lParam) << 8); + Event.paramH = Msg.lParam & 0x7FFF; + if (HIWORD(Msg.lParam) & 0x0100) Event.paramH |= 0x8000; + co_HOOK_CallHooks( WH_JOURNALRECORD, HC_ACTION, 0, (LPARAM)&Event); + /* We can't get the Msg.pt point here since we don't know thread (and thus the window station) the message will end up in yet. */ @@ -744,7 +783,6 @@ return; } - FocusMessageQueue = IntGetFocusMessageQueue(); if (FocusMessageQueue == NULL) { DPRINT("No focus message queue\n"); Modified: branches/ros-amd64-bringup/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -1694,8 +1694,7 @@ return CAB_STATUS_INVALID_CAB; } - *(unsigned char**)&CurrentIBuffer += BytesRead; - + CurrentIBuffer = (unsigned char*)CurrentIBuffer + BytesRead; CurrentIBufferSize += (USHORT)BytesRead; if (CurrentIBufferSize == CAB_BLOCKSIZE) @@ -3573,8 +3572,8 @@ CurrentFolderNode->TotalFolderSize += (BytesWritten + sizeof(CFDATA)); CurrentFolderNode->Folder.DataBlockCount++; - *(unsigned char**)&CurrentOBuffer += DataNode->Data.CompSize; - CurrentOBufferSize -= DataNode->Data.CompSize; + CurrentOBuffer = (unsigned char*)CurrentOBuffer + DataNode->Data.CompSize; + CurrentOBufferSize -= DataNode->Data.CompSize; LastBlockStart += DataNode->Data.UncompSize; Modified: branches/ros-amd64-bringup/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/sysreg/os_support.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/sysreg/os_support.cpp [iso-8859-1] Fri Jul 25 08:10:00 2008 @@ -22,6 +22,8 @@ size_t i; #if 0 // gettimeofday(&tm, 0); +#else + memset(&tm, 0, sizeof(tm)); #endif for (i = 0; i < s_Entries.size(); i++) {

16 years, 1 month

← Newer
1
...
18
19
20
21
22
23
24
...
77
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2008