Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[dchapyshev] 32955: - Add compstui, printui and ntdsapi from Wine
by dchapyshev＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: dchapyshev Date: Mon Apr 14 08:11:01 2008 New Revision: 32955 URL: http://svn.reactos.org/svn/reactos?rev=32955&view=rev Log: - Add compstui, printui and ntdsapi from Wine Added: trunk/reactos/dll/win32/compstui/ trunk/reactos/dll/win32/compstui/compstui.rbuild (with props) trunk/reactos/dll/win32/compstui/compstui.spec (with props) trunk/reactos/dll/win32/compstui/compstui_main.c (with props) trunk/reactos/dll/win32/ntdsapi/ trunk/reactos/dll/win32/ntdsapi/ntdsapi.c (with props) trunk/reactos/dll/win32/ntdsapi/ntdsapi.rbuild (with props) trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec (with props) trunk/reactos/dll/win32/printui/ trunk/reactos/dll/win32/printui/printui.c (with props) trunk/reactos/dll/win32/printui/printui.rbuild (with props) trunk/reactos/dll/win32/printui/printui.rc (with props) trunk/reactos/dll/win32/printui/printui.spec (with props) trunk/reactos/dll/win32/printui/printui_private.h (with props) Modified: trunk/reactos/dll/win32/win32.rbuild Added: trunk/reactos/dll/win32/compstui/compstui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/compstui/compstu… ============================================================================== --- trunk/reactos/dll/win32/compstui/compstui.rbuild (added) +++ trunk/reactos/dll/win32/compstui/compstui.rbuild [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -1,0 +1,16 @@ +<module name="compstui" type="win32dll" baseaddress="${BASEADDRESS_COMPSTUI}" installbase="system32" installname="compstui.dll" allowwarnings="true" entrypoint="0"> + <importlibrary definition="compstui.spec.def" /> + <include base="compstui">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> + <file>compstui_main.c</file> + <file>compstui.spec</file> +</module> Propchange: trunk/reactos/dll/win32/compstui/compstui.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/compstui/compstui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/compstui/compstu… ============================================================================== --- trunk/reactos/dll/win32/compstui/compstui.spec (added) +++ trunk/reactos/dll/win32/compstui/compstui.spec [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -1,0 +1,4 @@ +@ stdcall CommonPropertySheetUIA(long ptr long ptr) +@ stdcall CommonPropertySheetUIW(long ptr long ptr) +@ stdcall GetCPSUIUserData(long) +@ stdcall SetCPSUIUserData(long ptr) Propchange: trunk/reactos/dll/win32/compstui/compstui.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/compstui/compstui_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/compstui/compstu… ============================================================================== --- trunk/reactos/dll/win32/compstui/compstui_main.c (added) +++ trunk/reactos/dll/win32/compstui/compstui_main.c [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -1,0 +1,93 @@ +/* + * Implementation of the Common Property Sheets User Interface + * + * Copyright 2006 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ddk/compstui.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(compstui); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} + +/****************************************************************** + * CommonPropertySheetUIA (COMPSTUI.@) + * + */ +LONG WINAPI CommonPropertySheetUIA(HWND hWnd, PFNPROPSHEETUI pfnPropSheetUI, LPARAM lparam, LPDWORD pResult) +{ + FIXME("(%p, %p, 0x%lx, %p)\n", hWnd, pfnPropSheetUI, lparam, pResult); + return CPSUI_CANCEL; +} + +/****************************************************************** + * CommonPropertySheetUIW (COMPSTUI.@) + * + */ +LONG WINAPI CommonPropertySheetUIW(HWND hWnd, PFNPROPSHEETUI pfnPropSheetUI, LPARAM lparam, LPDWORD pResult) +{ + FIXME("(%p, %p, 0x%lx, %p)\n", hWnd, pfnPropSheetUI, lparam, pResult); + return CPSUI_CANCEL; +} + +/****************************************************************** + * GetCPSUIUserData (COMPSTUI.@) + * + */ +ULONG_PTR WINAPI GetCPSUIUserData(HWND hDlg) +{ + FIXME("(%p): stub\n", hDlg); + return 0; +} + +/****************************************************************** + * SetCPSUIUserData (COMPSTUI.@) + * + */ +BOOL WINAPI SetCPSUIUserData(HWND hDlg, ULONG_PTR UserData ) +{ + FIXME("(%p, %08lx): stub\n", hDlg, UserData); + return TRUE; +} Propchange: trunk/reactos/dll/win32/compstui/compstui_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ntdsapi/ntdsapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/ntdsapi.… ============================================================================== --- trunk/reactos/dll/win32/ntdsapi/ntdsapi.c (added) +++ trunk/reactos/dll/win32/ntdsapi/ntdsapi.c [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -1,0 +1,152 @@ +/* + * Copyright (C) 2006 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" +#include "ntdsapi.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntdsapi); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + } + return TRUE; +} + +/*********************************************************************** + * DsMakeSpnW (NTDSAPI.@) + */ +DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, + LPCWSTR inst_name, USHORT inst_port, + LPCWSTR ref, DWORD *spn_length, LPWSTR spn) +{ + DWORD new_spn_length; + INT len; + LPWSTR p; + + TRACE("(%s,%s,%s,%d,%s,%p,%p)\n", debugstr_w(svc_class), + debugstr_w(svc_name), debugstr_w(inst_name), inst_port, + debugstr_w(ref), spn_length, spn); + + if (!svc_class || !svc_name) + return ERROR_INVALID_PARAMETER; + + new_spn_length = strlenW(svc_class) + 1 /* for '/' */ + 1 /* for terminating '\0' */; + if (inst_name) + new_spn_length += strlenW(inst_name); + else + new_spn_length += strlenW(svc_name); + if (inst_port) + { + USHORT n = inst_port; + new_spn_length += 1 /* for ':' */; + do + { + n /= 10; + new_spn_length++; + } while (n != 0); + } + if (inst_name) + new_spn_length += 1 /* for '/' */ + strlenW(svc_name); + + if (*spn_length < new_spn_length) + { + *spn_length = new_spn_length; + return ERROR_BUFFER_OVERFLOW; + } + *spn_length = new_spn_length; + + p = spn; + len = strlenW(svc_class); + memcpy(p, svc_class, len * sizeof(WCHAR)); + p += len; + *p = '/'; + p++; + if (inst_name) + { + len = strlenW(inst_name); + memcpy(p, inst_name, len * sizeof(WCHAR)); + p += len; + *p = '\0'; + } + else + { + len = strlenW(svc_name); + memcpy(p, svc_name, len * sizeof(WCHAR)); + p += len; + *p = '\0'; + } + + if (inst_port) + { + static const WCHAR percentU[] = {'%','u',0}; + *p = ':'; + p++; + wsprintfW(p, percentU, inst_port); + p += strlenW(p); + } + + if (inst_name) + { + *p = '/'; + p++; + len = strlenW(svc_name); + memcpy(p, svc_name, len * sizeof(WCHAR)); + p += len; + *p = '\0'; + } + + TRACE("spn = %s\n", debugstr_w(spn)); + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * DsMakeSpnA (NTDSAPI.@) + * + * See DsMakeSpnW. + */ +DWORD WINAPI DsMakeSpnA(LPCSTR svc_class, LPCSTR svc_name, + LPCSTR inst_name, USHORT inst_port, + LPCSTR ref, DWORD *spn_length, LPSTR spn) +{ + FIXME("(%s,%s,%s,%d,%s,%p,%p): stub!\n", debugstr_a(svc_class), + debugstr_a(svc_name), debugstr_a(inst_name), inst_port, + debugstr_a(ref), spn_length, spn); + + return ERROR_CALL_NOT_IMPLEMENTED; +} Propchange: trunk/reactos/dll/win32/ntdsapi/ntdsapi.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ntdsapi/ntdsapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/ntdsapi.… ============================================================================== --- trunk/reactos/dll/win32/ntdsapi/ntdsapi.rbuild (added) +++ trunk/reactos/dll/win32/ntdsapi/ntdsapi.rbuild [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -1,0 +1,17 @@ +<module name="ntdsapi" type="win32dll" baseaddress="${BASEADDRESS_NTDSAPI}" installbase="system32" installname="ntdsapi.dll" allowwarnings="true" entrypoint="0"> + <importlibrary definition="ntdsapi.spec.def" /> + <include base="ntdsapi">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>user32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>ntdsapi.c</file> + <file>ntdsapi.spec</file> +</module> Propchange: trunk/reactos/dll/win32/ntdsapi/ntdsapi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/ntdsapi.… ============================================================================== --- trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec (added) +++ trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -1,0 +1,96 @@ +@ stub DsAddSidHistoryA +@ stub DsAddSidHistoryW +@ stub DsBindA +@ stub DsBindW +@ stub DsBindWithCredA +@ stub DsBindWithCredW +@ stub DsBindWithSpnA +@ stub DsBindWithSpnW +@ stub DsClientMakeSpnForTargetServerA +@ stub DsClientMakeSpnForTargetServerW +@ stub DsCrackNamesA +@ stub DsCrackNamesW +@ stub DsCrackSpn2A +@ stub DsCrackSpn2W +@ stub DsCrackSpn3W +@ stub DsCrackSpnA +@ stub DsCrackSpnW +@ stub DsCrackUnquotedMangledRdnA +@ stub DsCrackUnquotedMangledRdnW +@ stub DsFreeDomainControllerInfoA +@ stub DsFreeDomainControllerInfoW +@ stub DsFreeNameResultA +@ stub DsFreeNameResultW +@ stub DsFreePasswordCredentials +@ stub DsFreeSchemaGuidMapA +@ stub DsFreeSchemaGuidMapW +@ stub DsFreeSpnArrayA +@ stub DsFreeSpnArrayW +@ stub DsGetDomainControllerInfoA +@ stub DsGetDomainControllerInfoW +@ stub DsGetRdnW +@ stub DsGetSpnA +@ stub DsGetSpnW +@ stub DsInheritSecurityIdentityA +@ stub DsInheritSecurityIdentityW +@ stub DsIsMangledDnA +@ stub DsIsMangledDnW +@ stub DsIsMangledRdnValueA +@ stub DsIsMangledRdnValueW +@ stub DsListDomainsInSiteA +@ stub DsListDomainsInSiteW +@ stub DsListInfoForServerA +@ stub DsListInfoForServerW +@ stub DsListRolesA +@ stub DsListRolesW +@ stub DsListServersForDomainInSiteA +@ stub DsListServersForDomainInSiteW +@ stub DsListServersInSiteA +@ stub DsListServersInSiteW +@ stub DsListSitesA +@ stub DsListSitesW +@ stub DsLogEntry +@ stub DsMakePasswordCredentialsA +@ stub DsMakePasswordCredentialsW +@ stdcall DsMakeSpnA(str str str long str ptr ptr) +@ stdcall DsMakeSpnW(wstr wstr wstr long wstr ptr ptr) +@ stub DsMapSchemaGuidsA +@ stub DsMapSchemaGuidsW +@ stub DsQuoteRdnValueA +@ stub DsQuoteRdnValueW +@ stub DsRemoveDsDomainA +@ stub DsRemoveDsDomainW +@ stub DsRemoveDsServerA +@ stub DsRemoveDsServerW +@ stub DsReplicaAddA +@ stub DsReplicaAddW +@ stub DsReplicaConsistencyCheck +@ stub DsReplicaDelA +@ stub DsReplicaDelW +@ stub DsReplicaFreeInfo +@ stub DsReplicaGetInfo2W +@ stub DsReplicaGetInfoW +@ stub DsReplicaModifyA +@ stub DsReplicaModifyW +@ stub DsReplicaSyncA +@ stub DsReplicaSyncAllA +@ stub DsReplicaSyncAllW +@ stub DsReplicaSyncW +@ stub DsReplicaUpdateRefsA +@ stub DsReplicaUpdateRefsW +@ stub DsReplicaVerifyObjectsA +@ stub DsReplicaVerifyObjectsW +@ stub DsServerRegisterSpnA +@ stub DsServerRegisterSpnW +@ stub DsUnBindA +@ stub DsUnBindW +@ stub DsUnquoteRdnValueA +@ stub DsUnquoteRdnValueW +@ stub DsWriteAccountSpnA +@ stub DsWriteAccountSpnW +@ stub DsaopBind +@ stub DsaopBindWithCred +@ stub DsaopBindWithSpn +@ stub DsaopExecuteScript +@ stub DsaopPrepareScript +@ stub DsaopUnBind Propchange: trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/printui/printui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.c (added) +++ trunk/reactos/dll/win32/printui/printui.c [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -1,0 +1,283 @@ +/* + * Implementation of the Printer User Interface Dialogs + * + * Copyright 2006-2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "winver.h" +#include "winnls.h" +#include "shellapi.h" + +#include "wine/unicode.h" +#include "wine/debug.h" +#include "printui_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(printui); + +HINSTANCE PRINTUI_hInstance = NULL; + +/* ################################# */ + +/* Must be in order with OPT_* */ +static const WCHAR optionsW[OPT_MAX+1]={'a','b','c','f','h','j','l','m','n','t','r','v',0}; + +/* Must be in order with FLAG_* */ +static const WCHAR flagsW[FLAG_MAX+1]={'q','w','y','z','Z',0}; + + +/* ################################ + * get_next_wstr() [Internal] + * + * Get the next WSTR, when available + * + */ + +static LPWSTR get_next_wstr(context_t * cx) +{ + LPWSTR ptr; + + ptr = cx->pNextCharW; + if (ptr && ptr[0]) { + cx->pNextCharW = NULL; + return ptr; + } + + /* Get the next Parameter, when available */ + if (cx->next_arg < cx->argc) { + ptr = cx->argv[cx->next_arg]; + cx->next_arg++; + cx->pNextCharW = NULL; + return ptr; + } + return NULL; +} + + +/* ################################ + * get_next_wchar() [Internal] + * + * Get the next WCHAR from the Commandline or from the File (@ Filename) + * + * ToDo: Support Parameter from a File ( "@Filename" ) + * + */ + +static WCHAR get_next_wchar(context_t * cx, BOOL use_next_parameter) +{ + WCHAR c; + + /* Try the next WCHAR in the actual Parameter */ + if (cx->pNextCharW) { + c = *cx->pNextCharW; + if (c) { + cx->pNextCharW++; + return c; + } + /* We reached the end of the Parameter */ + cx->pNextCharW = NULL; + } + + /* Get the next Parameter, when available and allowed */ + if ((cx->pNextCharW == NULL) && (cx->next_arg < cx->argc) && (use_next_parameter)) { + cx->pNextCharW = cx->argv[cx->next_arg]; + cx->next_arg++; + } + + if (cx->pNextCharW) { + c = *cx->pNextCharW; + if (c) { + cx->pNextCharW++; + } + else + { + /* We reached the end of the Parameter */ + cx->pNextCharW = NULL; + } + return c; + } + return '\0'; +} + +/* ################################ */ +static BOOL parse_rundll(context_t * cx) +{ + LPWSTR ptr; + DWORD index; + WCHAR txtW[2]; + WCHAR c; + + + c = get_next_wchar(cx, TRUE); + txtW[1] = '\0'; + + while (c) + { + + while ( (c == ' ') || (c == '\t')) + { + c = get_next_wchar(cx, TRUE); + } + txtW[0] = c; + + if (c == '@') { + /* read commands from a File */ + ptr = get_next_wstr(cx); + FIXME("redir not supported: %s\n", debugstr_w(ptr)); + return FALSE; + } + else if (c == '/') { + c = get_next_wchar(cx, FALSE); + while ( c ) + { + txtW[0] = c; + ptr = strchrW(optionsW, c); + if (ptr) { + index = ptr - optionsW; + cx->options[index] = get_next_wstr(cx); + TRACE(" opt: %s %s\n", debugstr_w(txtW), debugstr_w(cx->options[index])); + c = 0; + } + else + { + ptr = strchrW(flagsW, c); + if (ptr) { + index = ptr - flagsW; + cx->flags[index] = TRUE; + TRACE("flag: %s\n", debugstr_w(txtW)); + } + else + { + cx->command = c; + cx->subcommand = '\0'; + TRACE(" cmd: %s\n", debugstr_w(txtW)); + } + + /* help has priority over all commands */ + if (c == '?') { + return TRUE; + } + + c = get_next_wchar(cx, FALSE); + + /* Some commands use two wchar */ + if ((cx->command == 'd') || (cx->command == 'g') || (cx->command == 'i') || + (cx->command == 'S') || (cx->command == 'X') ){ + cx->subcommand = c; + txtW[0] = c; + TRACE(" sub: %s\n", debugstr_w(txtW)); + c = get_next_wchar(cx, FALSE); + } + } + } + c = get_next_wchar(cx, TRUE); + + } + else + { + /* The commands 'S' and 'X' have additional Parameter */ + if ((cx->command == 'S') || (cx->command == 'X')) { + + /* the actual WCHAR is the start from the extra Parameter */ + cx->pNextCharW--; + TRACE("%d extra Parameter, starting with %s\n", 1 + (cx->argc - cx->next_arg), debugstr_w(cx->pNextCharW)); + return TRUE; + } + FIXME("0x%x: %s is unknown\n", c, debugstr_wn(&c, 1)); + return FALSE; + } + + } + return TRUE; +} + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + PRINTUI_hInstance = hinstDLL; + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} + + +/***************************************************** + * PrintUIEntryW [printui.@] + * Commandline-Interface for using printui.dll with rundll32.exe + * + */ +void WINAPI PrintUIEntryW(HWND hWnd, HINSTANCE hInst, LPCWSTR pCommand, DWORD nCmdShow) +{ + context_t cx; + BOOL res = FALSE; + + TRACE("(%p, %p, %s, 0x%x)\n", hWnd, hInst, debugstr_w(pCommand), nCmdShow); + + memset(&cx, 0, sizeof(context_t)); + cx.hWnd = hWnd; + cx.nCmdShow = nCmdShow; + + if ((pCommand) && (pCommand[0])) { + /* result is allocated with GlobalAlloc() */ + cx.argv = CommandLineToArgvW(pCommand, &cx.argc); + TRACE("got %d args at %p\n", cx.argc, cx.argv); + + res = parse_rundll(&cx); + } + + if (res && cx.command) { + switch (cx.command) + { + + default: + { + WCHAR txtW[3]; + txtW[0] = cx.command; + txtW[1] = cx.subcommand; + txtW[2] = '\0'; + FIXME("command not implemented: %s\n", debugstr_w(txtW)); + } + } + } + + if ((res == FALSE) || (cx.command == '\0')) { + FIXME("dialog: Printer / The operation was not successful\n"); + } + + GlobalFree(cx.argv); + +} Propchange: trunk/reactos/dll/win32/printui/printui.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/printui/printui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.rbuild (added) +++ trunk/reactos/dll/win32/printui/printui.rbuild [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -1,0 +1,18 @@ +<module name="printui" type="win32dll" baseaddress="${BASEADDRESS_PRINTUI}" installbase="system32" installname="printui.dll" allowwarnings="true" entrypoint="0"> + <importlibrary definition="printui.spec.def" /> + <include base="printui">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>shell32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>printui.c</file> + <file>printui.rc</file> + <file>printui.spec</file> +</module> Propchange: trunk/reactos/dll/win32/printui/printui.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/printui/printui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.rc (added) +++ trunk/reactos/dll/win32/printui/printui.rc [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -1,0 +1,37 @@ +/* + * Top level resource file for printui.dll + * + * Copyright 2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" + +#define WINE_FILENAME_STR "printui.dll" +#define WINE_FILEDESCRIPTION_STR "User Interface for Printing" + +/* Same Version as WinXP_sp2 */ +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/printui/printui.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/printui/printui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.spec (added) +++ trunk/reactos/dll/win32/printui/printui.spec [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -1,0 +1,23 @@ +@ stub ConnectToPrinterDlg +@ stub ConnectToPrinterPropertyPage +@ stub ConstructPrinterFriendlyName +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DocumentPropertiesWrap +@ stub PnPInterface +@ stub PrintNotifyTray_Exit +@ stub PrintNotifyTray_Init +@ stdcall PrintUIEntryW(ptr ptr wstr long) +@ stub PrinterPropPageProvider +@ stub RegisterPrintNotify +@ stub ShowErrorMessageHR +@ stub ShowErrorMessageSC +@ stub UnregisterPrintNotify +@ stub bFolderEnumPrinters +@ stub bFolderGetPrinter +@ stub bFolderRefresh +@ stub bPrinterSetup +@ stub vDocumentDefaults +@ stub vPrinterPropPages +@ stub vQueueCreate +@ stub vServerPropPages Propchange: trunk/reactos/dll/win32/printui/printui.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/printui/printui_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui_… ============================================================================== --- trunk/reactos/dll/win32/printui/printui_private.h (added) +++ trunk/reactos/dll/win32/printui/printui_private.h [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -1,0 +1,72 @@ +/* + * Implementation of the Printer User Interface Dialogs: private Header + * + * Copyright 2007 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_PRINTUI_PRIVATE__ +#define __WINE_PRINTUI_PRIVATE__ + +/* Index for Options with an argument */ +/* Must be in order with optionsW */ +typedef enum _OPT_INDEX { + OPT_A = 0, + OPT_B, + OPT_C, + OPT_F, + OPT_H, + OPT_J, + OPT_L, + OPT_M, + OPT_N, + OPT_R, + OPT_T, + OPT_V, + OPT_MAX +} OPT_INDEX; + +/* Index for Flags without an argument */ +/* Must be in order with flagsW */ +typedef enum _FLAG_INDEX { + FLAG_Q = 0, + FLAG_W, + FLAG_Y, + FLAG_Z, + FLAG_ZZ, + FLAG_MAX +} FLAG_INDEX; + + +typedef struct tag_context { + HWND hWnd; + DWORD nCmdShow; + LPWSTR * argv; + LPWSTR pNextCharW; + int argc; + int next_arg; + WCHAR command; + WCHAR subcommand; + LPWSTR options[OPT_MAX]; + BOOL flags[FLAG_MAX]; +} context_t; + + +/* ## DLL-wide Globals ## */ +extern HINSTANCE PRINTUI_hInstance; + + +#endif Propchange: trunk/reactos/dll/win32/printui/printui_private.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Mon Apr 14 08:11:01 2008 @@ -52,6 +52,9 @@ <directory name="comdlg32"> <xi:include href="comdlg32/comdlg32.rbuild" /> </directory> +<directory name="compstui"> + <xi:include href="compstui/compstui.rbuild" /> +</directory> <directory name="crtdll"> <xi:include href="crtdll/crtdll.rbuild" /> </directory> @@ -181,6 +184,9 @@ <directory name="newdev"> <xi:include href="newdev/newdev.rbuild" /> </directory> +<directory name="ntdsapi"> + <xi:include href="ntdsapi/ntdsapi.rbuild" /> +</directory> <directory name="ntmarta"> <xi:include href="ntmarta/ntmarta.rbuild" /> </directory> @@ -211,6 +217,9 @@ <directory name="powrprof"> <xi:include href="powrprof/powrprof.rbuild" /> </directory> +<directory name="printui"> + <xi:include href="printui/printui.rbuild" /> +</directory> <directory name="psapi"> <xi:include href="psapi/psapi.rbuild" /> </directory>

1 0

[dchapyshev] 32954: - Add baseaddress for compstui, printui, ntdsapi - Fix baseaddress for shfolder
by dchapyshev＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: dchapyshev Date: Mon Apr 14 08:08:28 2008 New Revision: 32954 URL: http://svn.reactos.org/svn/reactos?rev=32954&view=rev Log: - Add baseaddress for compstui, printui, ntdsapi - Fix baseaddress for shfolder Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=329… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Mon Apr 14 08:08:28 2008 @@ -67,6 +67,7 @@ <property name="BASEADDRESS_DESKADP" value="0x6d410000" /> <property name="BASEADDRESS_WLDAP32" value="0x6e130000" /> <property name="BASEADDRESS_SCHANNEL" value="0x6e360000" /> + <property name="BASEADDRESS_COMPSTUI" value="0x6ec10000" /> <property name="BASEADDRESS_CLB" value="0x6f2b0000" /> <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> @@ -94,6 +95,7 @@ <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> <property name="BASEADDRESS_POWRPROF" value="0x74ad0000" /> <property name="BASEADDRESS_MSXML3" value="0x74ae0000" /> + <property name="BASEADDRESS_PRINTUI" value="0x74b40000" /> <property name="BASEADDRESS_MMDRV" value="0x74c30000" /> <property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> <property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> @@ -122,7 +124,8 @@ <property name="BASEADDRESS_MPR" value="0x76620000" /> <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> <property name="BASEADDRESS_CRYPTDLL" value="0x76740000" /> - <property name="BASEADDRESS_SHFOLDER" value="0x76780000" /> + <property name="BASEADDRESS_SHFOLDER" value="0x76760000" /> + <property name="BASEADDRESS_NTDSAPI" value="0x76780000" /> <property name="BASEADDRESS_NTMARTA" value="0x768A0000" /> <property name="BASEADDRESS_RASDLG" value="0x768d0000" /> <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" />

1 0

[dchapyshev] 32953: - Add header
by dchapyshev＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: dchapyshev Date: Mon Apr 14 08:06:15 2008 New Revision: 32953 URL: http://svn.reactos.org/svn/reactos?rev=32953&view=rev Log: - Add header Added: trunk/reactos/include/ddk/compstui.h (with props) Added: trunk/reactos/include/ddk/compstui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/compstui.h?rev… ============================================================================== --- trunk/reactos/include/ddk/compstui.h (added) +++ trunk/reactos/include/ddk/compstui.h [iso-8859-1] Mon Apr 14 08:06:15 2008 @@ -1,0 +1,71 @@ +/* + * Definitions for Common Property Sheet User Interface + * + * Copyright 2006 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef _COMPSTUI_ +#define _COMPSTUI_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* DEFINES */ + +#define PROPSHEETUI_INFO_VERSION 0x0100 + +#define PSUIINFO_UNICODE 1 + +/* return-values for CommonPropertySheetUI on success */ +#define CPSUI_CANCEL 0 +#define CPSUI_OK 1 +#define CPSUI_RESTARTWINDOWS 2 +#define CPSUI_REBOOTSYSTEM 3 + + +/* TYPES */ +typedef DWORD (CALLBACK *PFNCOMPROPSHEET)(HANDLE, UINT, LPARAM, LPARAM); + +typedef struct _PROPSHEETUI_INFO { + WORD cbSize; + WORD Version; + WORD Flags; /* set PSUIINFO_UNICODE for UNICODE */ + WORD Reason; + HANDLE hComPropSheet; + PFNCOMPROPSHEET pfnComPropSheet; + LPARAM lParamInit; + DWORD UserData; + DWORD Result; + } PROPSHEETUI_INFO, *PPROPSHEETUI_INFO; + +typedef LONG (CALLBACK *PFNPROPSHEETUI)(PROPSHEETUI_INFO, LPARAM); + +/* FUNCTIONS */ +LONG WINAPI CommonPropertySheetUIA(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); +LONG WINAPI CommonPropertySheetUIW(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); +#define CommonPropertySheetUI WINELIB_NAME_AW(CommonPropertySheetUI) + +ULONG_PTR WINAPI GetPSTUIUserData(HWND); +BOOL WINAPI SetPSTUIUserData(HWND, ULONG_PTR); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _COMPSTUI_ */ Propchange: trunk/reactos/include/ddk/compstui.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 32952: - Add Russian .mc file
by dchapyshev＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: dchapyshev Date: Mon Apr 14 07:55:33 2008 New Revision: 32952 URL: http://svn.reactos.org/svn/reactos?rev=32952&view=rev Log: - Add Russian .mc file Added: trunk/reactos/dll/win32/kernel32/lang/ru-RU.mc (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/kernel32/lang/ru-RU.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/ru…

1 0

[dchapyshev] 32951: - Synchronised with wine head
by dchapyshev＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: dchapyshev Date: Mon Apr 14 07:53:30 2008 New Revision: 32951 URL: http://svn.reactos.org/svn/reactos?rev=32951&view=rev Log: - Synchronised with wine head Added: trunk/reactos/dll/win32/gdiplus/region.c (with props) Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/customlinecap.c trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/imageattributes.c Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] Mon Apr 14 07:53:30 2008 @@ -653,3 +653,47 @@ return Ok; } + +GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient *brush, ARGB color1, + ARGB color2) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient *brush, REAL focus, + REAL scale) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient *brush, + GDIPCONST ARGB *blend, GDIPCONST REAL* positions, INT count) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush, + GDIPCONST GpMatrix *matrix) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} Modified: trunk/reactos/dll/win32/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/customli… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] Mon Apr 14 07:53:30 2008 @@ -129,3 +129,58 @@ return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap* custom, + GpLineCap base) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap* custom, + REAL* inset) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap* custom, + REAL inset) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap* custom, + GpLineJoin join) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap* custom, + REAL width) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] Mon Apr 14 07:53:30 2008 @@ -29,5 +29,6 @@ <file>pathiterator.c</file> <file>pen.c</file> <file>stringformat.c</file> + <file>region.c</file> <file>gdiplus.spec</file> </module> Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Mon Apr 14 07:53:30 2008 @@ -75,7 +75,7 @@ @ stdcall GdipCreateBitmapFromFileICM(wstr ptr) @ stub GdipCreateBitmapFromGdiDib @ stdcall GdipCreateBitmapFromGraphics(long long ptr ptr) -@ stub GdipCreateBitmapFromHBITMAP +@ stdcall GdipCreateBitmapFromHBITMAP(ptr ptr ptr) @ stub GdipCreateBitmapFromHICON @ stub GdipCreateBitmapFromResource @ stdcall GdipCreateBitmapFromScan0(long long long long ptr ptr) @@ -250,7 +250,7 @@ @ stdcall GdipGetCompositingMode(ptr ptr) @ stdcall GdipGetCompositingQuality(ptr ptr) @ stub GdipGetCustomLineCapBaseCap -@ stub GdipGetCustomLineCapBaseInset +@ stdcall GdipGetCustomLineCapBaseInset(ptr ptr) @ stub GdipGetCustomLineCapStrokeCaps @ stub GdipGetCustomLineCapStrokeJoin @ stub GdipGetCustomLineCapType @@ -510,41 +510,41 @@ @ stub GdipSetClipHrgn @ stub GdipSetClipPath @ stub GdipSetClipRect -@ stub GdipSetClipRectI -@ stub GdipSetClipRegion +@ stdcall GdipSetClipRectI(ptr long long long long long) +@ stdcall GdipSetClipRegion(ptr ptr long) @ stdcall GdipSetCompositingMode(ptr long) @ stdcall GdipSetCompositingQuality(ptr long) -@ stub GdipSetCustomLineCapBaseCap -@ stub GdipSetCustomLineCapBaseInset +@ stdcall GdipSetCustomLineCapBaseCap(ptr long) +@ stdcall GdipSetCustomLineCapBaseInset(ptr long) @ stdcall GdipSetCustomLineCapStrokeCaps(ptr long long) -@ stub GdipSetCustomLineCapStrokeJoin -@ stub GdipSetCustomLineCapWidthScale -@ stub GdipSetEffectParameters -@ stub GdipSetEmpty -@ stub GdipSetImageAttributesCachedBackground +@ stdcall GdipSetCustomLineCapStrokeJoin(ptr long) +@ stdcall GdipSetCustomLineCapWidthScale(ptr long) +@ stdcall GdipSetEffectParameters(ptr ptr long) +@ stdcall GdipSetEmpty(ptr) +@ stdcall GdipSetImageAttributesCachedBackground(ptr long) @ stdcall GdipSetImageAttributesColorKeys(ptr long long long long) @ stdcall GdipSetImageAttributesColorMatrix(ptr long long ptr ptr long) -@ stub GdipSetImageAttributesGamma -@ stub GdipSetImageAttributesNoOp -@ stub GdipSetImageAttributesOutputChannel -@ stub GdipSetImageAttributesOutputChannelColorProfile -@ stub GdipSetImageAttributesRemapTable -@ stub GdipSetImageAttributesThreshold -@ stub GdipSetImageAttributesToIdentity +@ stdcall GdipSetImageAttributesGamma(ptr long long long) +@ stdcall GdipSetImageAttributesNoOp(ptr long long) +@ stdcall GdipSetImageAttributesOutputChannel(ptr long long long) +@ stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long ptr) +@ stdcall GdipSetImageAttributesRemapTable(ptr long long long ptr) +@ stdcall GdipSetImageAttributesThreshold(ptr long long long) +@ stdcall GdipSetImageAttributesToIdentity(ptr long) @ stdcall GdipSetImageAttributesWrapMode(ptr long long long) @ stdcall GdipSetImagePalette(ptr ptr) -@ stub GdipSetInfinite +@ stdcall GdipSetInfinite(ptr) @ stdcall GdipSetInterpolationMode(ptr long) @ stdcall GdipSetLineBlend(ptr ptr ptr long) -@ stub GdipSetLineColors +@ stdcall GdipSetLineColors(ptr long long) @ stdcall GdipSetLineGammaCorrection(ptr long) -@ stub GdipSetLineLinearBlend -@ stub GdipSetLinePresetBlend +@ stdcall GdipSetLineLinearBlend(ptr long long) +@ stdcall GdipSetLinePresetBlend(ptr ptr ptr long) @ stdcall GdipSetLineSigmaBlend(ptr long long) -@ stub GdipSetLineTransform +@ stdcall GdipSetLineTransform(ptr ptr) @ stdcall GdipSetLineWrapMode(ptr long) @ stdcall GdipSetMatrixElements(ptr long long long long long long) -@ stub GdipSetMetafileDownLevelRasterizationLimit +@ stdcall GdipSetMetafileDownLevelRasterizationLimit(ptr long) @ stdcall GdipSetPageScale(ptr long) @ stdcall GdipSetPageUnit(ptr long) @ stdcall GdipSetPathFillMode(ptr long) Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Mon Apr 14 07:53:30 2008 @@ -2088,3 +2088,37 @@ return GdipTranslateMatrix(graphics->worldtrans, dx, dy, order); } + +GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics *graphics, INT x, INT y, + INT width, INT height, + CombineMode combineMode) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetClipRegion(GpGraphics *graphics, GpRegion *region, + CombineMode combineMode) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpGraphics *graphics, + UINT limitDpi) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Mon Apr 14 07:53:30 2008 @@ -179,7 +179,7 @@ memset(&path->pathdata.Types[old_count + 1], PathPointTypeBezier, MAX_ARC_PTS - 1); - /* An ellipse is an instrinsic figure (always its own subpath). */ + /* An ellipse is an intrinsic figure (always is its own subpath). */ path->pathdata.Types[old_count] = PathPointTypeStart; path->pathdata.Types[old_count + MAX_ARC_PTS - 1] |= PathPointTypeCloseSubpath; path->newfigure = TRUE; Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Mon Apr 14 07:53:30 2008 @@ -1096,3 +1096,14 @@ return retval; } + +GpStatus WINGDIPAPI GdipSetEffectParameters(CGpEffect *effect, + const VOID *params, const UINT size) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} Modified: trunk/reactos/dll/win32/gdiplus/imageattributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/imageatt… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/imageattributes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/imageattributes.c [iso-8859-1] Mon Apr 14 07:53:30 2008 @@ -90,3 +90,93 @@ return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes *imageAttr, + BOOL enableFlag) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetImageAttributesGamma(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, REAL gamma) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetImageAttributesNoOp(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannel(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, ColorChannelFlags channelFlags) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannelColorProfile(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, + GDIPCONST WCHAR *colorProfileFilename) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, UINT mapSize, + GDIPCONST ColorMap *map) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, REAL threshold) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetImageAttributesToIdentity(GpImageAttributes *imageAttr, + ColorAdjustType type) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} Added: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c (added) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Mon Apr 14 07:53:30 2008 @@ -1,0 +1,51 @@ +/* + * Copyright (C) 2008 Google (Lei Zhang) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" + +#include "objbase.h" + +#include "gdiplus.h" +#include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); + +GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *region) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} Propchange: trunk/reactos/dll/win32/gdiplus/region.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 32950: - Update headers
by dchapyshev＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: dchapyshev Date: Mon Apr 14 07:51:59 2008 New Revision: 32950 URL: http://svn.reactos.org/svn/reactos?rev=32950&view=rev Log: - Update headers Modified: trunk/reactos/include/psdk/gdiplus.h trunk/reactos/include/psdk/gdipluscolor.h trunk/reactos/include/psdk/gdipluscolormatrix.h trunk/reactos/include/psdk/gdiplusenums.h trunk/reactos/include/psdk/gdiplusflat.h trunk/reactos/include/psdk/gdiplusgpstubs.h Modified: trunk/reactos/include/psdk/gdiplus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplus.h?rev… ============================================================================== --- trunk/reactos/include/psdk/gdiplus.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplus.h [iso-8859-1] Mon Apr 14 07:51:59 2008 @@ -34,6 +34,7 @@ #include "gdipluspixelformats.h" #include "gdiplusmetaheader.h" #include "gdiplusimaging.h" +#include "gdipluscolor.h" #include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h" @@ -53,6 +54,7 @@ #include "gdipluspixelformats.h" #include "gdiplusmetaheader.h" #include "gdiplusimaging.h" +#include "gdipluscolor.h" #include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h" Modified: trunk/reactos/include/psdk/gdipluscolor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdipluscolor.… ============================================================================== --- trunk/reactos/include/psdk/gdipluscolor.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdipluscolor.h [iso-8859-1] Mon Apr 14 07:51:59 2008 @@ -1,279 +1,51 @@ /* - * GdiPlusColor.h + * Copyright (C) 2808 Google (Lei Zhang) * - * Windows GDI+ + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. * - * This file is part of the w32api package. + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _GDIPLUSCOLOR_H #define _GDIPLUSCOLOR_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif +enum ColorChannelFlags +{ + ColorChannelFlagsC, + ColorChannelFlagsM, + ColorChannelFlagsY, + ColorChannelFlagsK, + ColorChannelFlagsLast +}; -typedef enum { - ColorChannelFlagsC = 0, - ColorChannelFlagsM = 1, - ColorChannelFlagsY = 2, - ColorChannelFlagsK = 3, - ColorChannelFlagsLast = 4 -} ColorChannelFlags; +#ifdef __cplusplus - +/* FIXME: missing the methods. */ class Color { -public: - Color(BYTE a, BYTE r, BYTE g, BYTE b) - { - color = MakeARGB(a, r, g, b); - } - - Color(VOID) - { - } - - Color(BYTE r, BYTE g, BYTE b) - { - } - - Color(ARGB argb) - { - } - - BYTE GetA(VOID) - { - return 0; - } - - BYTE GetAlpha(VOID) - { - return 0; - } - - BYTE GetB(VOID) - { - return 0; - } - - BYTE GetBlue(VOID) - { - return 0; - } - - BYTE GetG(VOID) - { - return 0; - } - - BYTE GetGreen(VOID) - { - return 0; - } - - BYTE GetR(VOID) - { - return 0; - } - - BYTE GetRed(VOID) - { - return 0; - } - - ARGB GetValue(VOID) const - { - return color; - } - - enum - { - AlphaShift = 24, - RedShift = 16, - GreenShift = 8, - BlueShift = 0 - }; - - static ARGB MakeARGB(BYTE a, BYTE r, BYTE g, BYTE b) - { - return (((ARGB)(b) << BlueShift) | - ((ARGB)(g) << GreenShift) | - ((ARGB)(r) << RedShift) | - ((ARGB)(a) << AlphaShift)); - } - - VOID SetFromCOLORREF(COLORREF rgb) - { - } - - VOID SetValue(ARGB argb) - { - } - - COLORREF ToCOLORREF(VOID) - { - return 0; - } - - - enum - { - AliceBlue = 0xFFF0F8FF, - AntiqueWhite = 0xFFFAEBD7, - Aqua = 0xFF00FFFF, - Aquamarine = 0xFF7FFFD4, - Azure = 0xFFF0FFFF, - Beige = 0xFFF5F5DC, - Bisque = 0xFFFFE4C4, - Black = 0xFF000000, - BlanchedAlmond = 0xFFFFEBCD, - Blue = 0xFF0000FF, - BlueViolet = 0xFF8A2BE2, - Brown = 0xFFA52A2A, - BurlyWood = 0xFFDEB887, - CadetBlue = 0xFF5F9EA0, - Chartreuse = 0xFF7FFF00, - Chocolate = 0xFFD2691E, - Coral = 0xFFFF7F50, - CornflowerBlue = 0xFF6495ED, - Cornsilk = 0xFFFFF8DC, - Crimson = 0xFFDC143C, - Cyan = 0xFF00FFFF, - DarkBlue = 0xFF00008B, - DarkCyan = 0xFF008B8B, - DarkGoldenrod = 0xFFB8860B, - DarkGray = 0xFFA9A9A9, - DarkGreen = 0xFF006400, - DarkKhaki = 0xFFBDB76B, - DarkMagenta = 0xFF8B008B, - DarkOliveGreen = 0xFF556B2F, - DarkOrange = 0xFFFF8C00, - DarkOrchid = 0xFF9932CC, - DarkRed = 0xFF8B0000, - DarkSalmon = 0xFFE9967A, - DarkSeaGreen = 0xFF8FBC8B, - DarkSlateBlue = 0xFF483D8B, - DarkSlateGray = 0xFF2F4F4F, - DarkTurquoise = 0xFF00CED1, - DarkViolet = 0xFF9400D3, - DeepPink = 0xFFFF1493, - DeepSkyBlue = 0xFF00BFFF, - DimGray = 0xFF696969, - DodgerBlue = 0xFF1E90FF, - Firebrick = 0xFFB22222, - FloralWhite = 0xFFFFFAF0, - ForestGreen = 0xFF228B22, - Fuchsia = 0xFFFF00FF, - Gainsboro = 0xFFDCDCDC, - GhostWhite = 0xFFF8F8FF, - Gold = 0xFFFFD700, - Goldenrod = 0xFFDAA520, - Gray = 0xFF808080, - Green = 0xFF008000, - GreenYellow = 0xFFADFF2F, - Honeydew = 0xFFF0FFF0, - HotPink = 0xFFFF69B4, - IndianRed = 0xFFCD5C5C, - Indigo = 0xFF4B0082, - Ivory = 0xFFFFFFF0, - Khaki = 0xFFF0E68C, - Lavender = 0xFFE6E6FA, - LavenderBlush = 0xFFFFF0F5, - LawnGreen = 0xFF7CFC00, - LemonChiffon = 0xFFFFFACD, - LightBlue = 0xFFADD8E6, - LightCoral = 0xFFF08080, - LightCyan = 0xFFE0FFFF, - LightGoldenrodYellow = 0xFFFAFAD2, - LightGray = 0xFFD3D3D3, - LightGreen = 0xFF90EE90, - LightPink = 0xFFFFB6C1, - LightSalmon = 0xFFFFA07A, - LightSeaGreen = 0xFF20B2AA, - LightSkyBlue = 0xFF87CEFA, - LightSlateGray = 0xFF778899, - LightSteelBlue = 0xFFB0C4DE, - LightYellow = 0xFFFFFFE0, - Lime = 0xFF00FF00, - LimeGreen = 0xFF32CD32, - Linen = 0xFFFAF0E6, - Magenta = 0xFFFF00FF, - Maroon = 0xFF800000, - MediumAquamarine = 0xFF66CDAA, - MediumBlue = 0xFF0000CD, - MediumOrchid = 0xFFBA55D3, - MediumPurple = 0xFF9370DB, - MediumSeaGreen = 0xFF3CB371, - MediumSlateBlue = 0xFF7B68EE, - MediumSpringGreen = 0xFF00FA9A, - MediumTurquoise = 0xFF48D1CC, - MediumVioletRed = 0xFFC71585, - MidnightBlue = 0xFF191970, - MintCream = 0xFFF5FFFA, - MistyRose = 0xFFFFE4E1, - Moccasin = 0xFFFFE4B5, - NavajoWhite = 0xFFFFDEAD, - Navy = 0xFF000080, - OldLace = 0xFFFDF5E6, - Olive = 0xFF808000, - OliveDrab = 0xFF6B8E23, - Orange = 0xFFFFA500, - OrangeRed = 0xFFFF4500, - Orchid = 0xFFDA70D6, - PaleGoldenrod = 0xFFEEE8AA, - PaleGreen = 0xFF98FB98, - PaleTurquoise = 0xFFAFEEEE, - PaleVioletRed = 0xFFDB7093, - PapayaWhip = 0xFFFFEFD5, - PeachPuff = 0xFFFFDAB9, - Peru = 0xFFCD853F, - Pink = 0xFFFFC0CB, - Plum = 0xFFDDA0DD, - PowderBlue = 0xFFB0E0E6, - Purple = 0xFF800080, - Red = 0xFFFF0000, - RosyBrown = 0xFFBC8F8F, - RoyalBlue = 0xFF4169E1, - SaddleBrown = 0xFF8B4513, - Salmon = 0xFFFA8072, - SandyBrown = 0xFFF4A460, - SeaGreen = 0xFF2E8B57, - SeaShell = 0xFFFFF5EE, - Sienna = 0xFFA0522D, - Silver = 0xFFC0C0C0, - SkyBlue = 0xFF87CEEB, - SlateBlue = 0xFF6A5ACD, - SlateGray = 0xFF708090, - Snow = 0xFFFFFAFA, - SpringGreen = 0xFF00FF7F, - SteelBlue = 0xFF4682B4, - Tan = 0xFFD2B48C, - Teal = 0xFF008080, - Thistle = 0xFFD8BFD8, - Tomato = 0xFFFF6347, - Transparent = 0x00FFFFFF, - Turquoise = 0xFF40E0D0, - Violet = 0xFFEE82EE, - Wheat = 0xFFF5DEB3, - White = 0xFFFFFFFF, - WhiteSmoke = 0xFFF5F5F5, - Yellow = 0xFFFFFF00, - YellowGreen = 0xFF9ACD32, - }; - -private: - ARGB color; +protected: + ARGB Argb; }; -#endif /* _GDIPLUSCOLOR_H */ +#else /* end of c++ typedefs */ + +typedef struct Color +{ + ARGB Argb; +} Color; + +typedef enum ColorChannelFlags ColorChannelFlags; + +#endif /* end of c typedefs */ + +#endif /* _GDIPLUSCOLOR_H */ Modified: trunk/reactos/include/psdk/gdipluscolormatrix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdipluscolorm… ============================================================================== --- trunk/reactos/include/psdk/gdipluscolormatrix.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdipluscolormatrix.h [iso-8859-1] Mon Apr 14 07:51:59 2008 @@ -42,11 +42,18 @@ ColorAdjustTypeAny }; +struct ColorMap +{ + Color oldColor; + Color newCOlor; +}; + #ifndef __cplusplus typedef enum ColorAdjustType ColorAdjustType; typedef enum ColorMatrixFlags ColorMatrixFlags; typedef struct ColorMatrix ColorMatrix; +typedef struct ColorMap ColorMap; #endif /* end of c typedefs */ Modified: trunk/reactos/include/psdk/gdiplusenums.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusenums.… ============================================================================== --- trunk/reactos/include/psdk/gdiplusenums.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusenums.h [iso-8859-1] Mon Apr 14 07:51:59 2008 @@ -268,6 +268,16 @@ ImageCodecFlagsBuiltin = 65536, ImageCodecFlagsSystem = 131072, ImageCodecFlagsUser = 262144 +}; + +enum CombineMode +{ + CombineModeReplace, + CombineModeIntersect, + CombineModeUnion, + CombineModeXor, + CombineModeExclude, + CombineModeComplement }; #ifndef __cplusplus @@ -299,6 +309,7 @@ typedef enum HotkeyPrefix HotkeyPrefix; typedef enum PenAlignment GpPenAlignment; typedef enum ImageCodecFlags ImageCodecFlags; +typedef enum CombineMode CombineMode; #endif /* end of c typedefs */ Modified: trunk/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h… ============================================================================== --- trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] Mon Apr 14 07:51:59 2008 @@ -261,6 +261,7 @@ GpStatus WINGDIPAPI GdipFindNextImageItem(GpImage*,ImageItemData*); GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size); GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodecInfo *encoders); +GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP, HPALETTE, GpBitmap**); GpStatus WINGDIPAPI GdipGetImageItemData(GpImage*,ImageItemData*); GpStatus WINGDIPAPI GdipGetImageBounds(GpImage*,GpRectF*,GpUnit*); GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage*,GpGraphics**); Modified: trunk/reactos/include/psdk/gdiplusgpstubs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusgpstub… ============================================================================== --- trunk/reactos/include/psdk/gdiplusgpstubs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusgpstubs.h [iso-8859-1] Mon Apr 14 07:51:59 2008 @@ -38,6 +38,8 @@ class GpTexture : public GpBrush {}; class GpFont {}; class GpStringFormat {}; +class GpRegion {}; +class CGpEffect {}; #else /* end of c++ declarations */ @@ -58,6 +60,8 @@ typedef struct GpTexture GpTexture; typedef struct GpFont GpFont; typedef struct GpStringFormat GpStringFormat; +typedef struct GpRegion GpRegion; +typedef struct CGpEffect CGpEffect; #endif /* end of c declarations */ @@ -76,5 +80,6 @@ typedef MatrixOrder GpMatrixOrder; typedef Point GpPoint; typedef WrapMode GpWrapMode; +typedef Color GpColor; #endif

1 0

[jimtabor] 32949: Attach global server information to process information.
by jimtabor＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: jimtabor Date: Mon Apr 14 05:51:53 2008 New Revision: 32949 URL: http://svn.reactos.org/svn/reactos?rev=32949&view=rev Log: Attach global server information to process information. Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Mon Apr 14 05:51:53 2008 @@ -37,6 +37,8 @@ HANDLE GlobalUserHeap = NULL; PSECTION_OBJECT GlobalUserHeapSection = NULL; + +PSERVERINFO gpsi = NULL; // Global User Server Information. extern ULONG_PTR Win32kSSDT[]; extern UCHAR Win32kSSPT[]; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Mon Apr 14 05:51:53 2008 @@ -13,6 +13,7 @@ #define NDEBUG #include <debug.h> +extern PSERVERINFO gpsi; /* * @unimplemented @@ -414,6 +415,7 @@ pi->hUserHeap = W32Process->HeapMappings.KernelMapping; pi->UserHeapDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping - (ULONG_PTR)W32Process->HeapMappings.UserMapping; + pi->psi = gpsi; if (InterlockedCompareExchangePointer(&W32Process->ProcessInfo, pi, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Apr 14 05:51:53 2008 @@ -33,6 +33,8 @@ #define NDEBUG #include <debug.h> +extern PSERVERINFO gpsi; + /* dialog resources appear to pass this in 16 bits, handle them properly */ #define CW_USEDEFAULT16 (0x8000) @@ -49,6 +51,8 @@ NTSTATUS FASTCALL InitWindowImpl(VOID) { + gpsi = UserHeapAlloc(sizeof(SERVERINFO)); + if (gpsi) RtlZeroMemory(gpsi, sizeof(SERVERINFO)); return STATUS_SUCCESS; }

1 0

[hpoussin] 32948: Make plug-and-play RPC interface more compatible with MS Windows
by hpoussin＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: hpoussin Date: Mon Apr 14 05:48:38 2008 New Revision: 32948 URL: http://svn.reactos.org/svn/reactos?rev=32948&view=rev Log: Make plug-and-play RPC interface more compatible with MS Windows Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Mon Apr 14 05:48:38 2008 @@ -35,6 +35,7 @@ #include <umpnpmgr/sysguid.h> #include <wdmguid.h> #include <cfgmgr32.h> +#include <regstr.h> #include <rpc.h> #include <rpcdce.h> @@ -158,37 +159,57 @@ } +/* Function 0 */ +DWORD PNP_Function0( + handle_t hBinding) +{ + UNREFERENCED_PARAMETER(hBinding); + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 1 */ +DWORD PNP_Function1( + handle_t hBinding) +{ + UNREFERENCED_PARAMETER(hBinding); + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + /* Function 2 */ -CONFIGRET -PNP_GetVersion(handle_t BindingHandle, - unsigned short *Version) -{ - UNREFERENCED_PARAMETER(BindingHandle); - - *Version = 0x0400; +DWORD PNP_GetVersion( + handle_t hBinding, + WORD *pVersion) +{ + UNREFERENCED_PARAMETER(hBinding); + + *pVersion = 0x0400; return CR_SUCCESS; } /* Function 3 */ -CONFIGRET -PNP_GetGlobalState(handle_t BindingHandle, - unsigned long *State, - unsigned long Flags) -{ - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(Flags); - - *State = CM_GLOBAL_STATE_CAN_DO_UI | CM_GLOBAL_STATE_SERVICES_AVAILABLE; +DWORD PNP_GetGlobalState( + handle_t hBinding, + DWORD *pulState, + DWORD ulFlags) +{ + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); + + *pulState = CM_GLOBAL_STATE_CAN_DO_UI | CM_GLOBAL_STATE_SERVICES_AVAILABLE; return CR_SUCCESS; } /* Function 4 */ -CONFIGRET -PNP_InitDetection(handle_t BindingHandle) -{ - UNREFERENCED_PARAMETER(BindingHandle); +DWORD PNP_InitDetection( + handle_t hBinding) +{ + UNREFERENCED_PARAMETER(hBinding); DPRINT("PNP_InitDetection() called\n"); return CR_SUCCESS; @@ -196,14 +217,15 @@ /* Function 5 */ -CONFIGRET -PNP_ReportLogOn(handle_t BindingHandle, - BOOL Admin, - DWORD ProcessId) +DWORD PNP_ReportLogOn( + handle_t hBinding, + BOOL Admin, + DWORD ProcessId) { HANDLE hProcess; - UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(Admin); DPRINT("PNP_ReportLogOn(%u, %u) called\n", Admin, ProcessId); @@ -237,21 +259,22 @@ /* Function 6 */ -CONFIGRET -PNP_ValidateDeviceInstance(handle_t BindingHandle, - wchar_t *DeviceInstance, - DWORD Flags) +DWORD PNP_ValidateDeviceInstance( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulFlags) { CONFIGRET ret = CR_SUCCESS; HKEY hDeviceKey = NULL; - UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_ValidateDeviceInstance(%S %lx) called\n", - DeviceInstance, Flags); + pDeviceID, ulFlags); if (RegOpenKeyExW(hEnumKey, - DeviceInstance, + pDeviceID, 0, KEY_READ, &hDeviceKey)) @@ -274,24 +297,24 @@ /* Function 7 */ -CONFIGRET -PNP_GetRootDeviceInstance(handle_t BindingHandle, - wchar_t *DeviceInstance, - DWORD Length) +DWORD PNP_GetRootDeviceInstance( + handle_t hBinding, + LPWSTR pDeviceID, + PNP_RPC_STRING_LEN ulLength) { CONFIGRET ret = CR_SUCCESS; - UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(hBinding); DPRINT("PNP_GetRootDeviceInstance() called\n"); - if (Length < lstrlenW(szRootDeviceId) + 1) + if (ulLength < lstrlenW(szRootDeviceId) + 1) { ret = CR_BUFFER_SMALL; goto Done; } - lstrcpyW(DeviceInstance, + lstrcpyW(pDeviceID, szRootDeviceId); Done: @@ -302,32 +325,32 @@ /* Function 8 */ -CONFIGRET -PNP_GetRelatedDeviceInstance(handle_t BindingHandle, - DWORD Relationship, - wchar_t *DeviceId, - wchar_t *RelatedDeviceId, - DWORD Length, - DWORD Flags) +DWORD PNP_GetRelatedDeviceInstance( + handle_t hBinding, + DWORD ulRelationship, + LPWSTR pDeviceID, + LPWSTR pRelatedDeviceId, + PNP_RPC_STRING_LEN *pulLength, + DWORD ulFlags) { PLUGPLAY_CONTROL_RELATED_DEVICE_DATA PlugPlayData; CONFIGRET ret = CR_SUCCESS; NTSTATUS Status; - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(Flags); + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_GetRelatedDeviceInstance() called\n"); - DPRINT(" Relationship %ld\n", Relationship); - DPRINT(" DeviceId %S\n", DeviceId); + DPRINT(" Relationship %ld\n", ulRelationship); + DPRINT(" DeviceId %S\n", pDeviceID); RtlInitUnicodeString(&PlugPlayData.TargetDeviceInstance, - DeviceId); - - PlugPlayData.Relation = Relationship; - - PlugPlayData.RelatedDeviceInstanceLength = Length; - PlugPlayData.RelatedDeviceInstance = RelatedDeviceId; + pDeviceID); + + PlugPlayData.Relation = ulRelationship; + + PlugPlayData.RelatedDeviceInstanceLength = *pulLength; + PlugPlayData.RelatedDeviceInstance = pRelatedDeviceId; Status = NtPlugPlayControl(PlugPlayControlGetRelatedDevice, (PVOID)&PlugPlayData, @@ -348,31 +371,31 @@ /* Function 9 */ -CONFIGRET -PNP_EnumerateSubKeys(handle_t BindingHandle, - DWORD Branch, - DWORD Index, - wchar_t *Buffer, - DWORD Length, - DWORD *RequiredLength, - DWORD Flags) +DWORD PNP_EnumerateSubKeys( + handle_t hBinding, + DWORD ulBranch, + DWORD ulIndex, + LPWSTR Buffer, + PNP_RPC_STRING_LEN ulLength, + PNP_RPC_STRING_LEN *pulRequiredLen, + DWORD ulFlags) { CONFIGRET ret = CR_SUCCESS; HKEY hKey; DWORD dwError; - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(Flags); + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_EnumerateSubKeys() called\n"); - switch (Branch) - { - case PNP_BRANCH_ENUM: + switch (ulBranch) + { + case PNP_ENUMERATOR_SUBKEYS: hKey = hEnumKey; break; - case PNP_BRANCH_CLASS: + case PNP_CLASS_SUBKEYS: hKey = hClassKey; break; @@ -380,11 +403,11 @@ return CR_FAILURE; } - *RequiredLength = Length; + *pulRequiredLen = ulLength; dwError = RegEnumKeyExW(hKey, - Index, + ulIndex, Buffer, - RequiredLength, + pulRequiredLen, NULL, NULL, NULL, @@ -395,7 +418,7 @@ } else { - (*RequiredLength)++; + (*pulRequiredLen)++; } DPRINT("PNP_EnumerateSubKeys() done (returns %lx)\n", ret); @@ -404,51 +427,56 @@ } +/* Function 10 */ +DWORD PNP_GetDeviceList( + handle_t hBinding, + LPWSTR pszFilter, + LPWSTR Buffer, + PNP_RPC_STRING_LEN *pulLength, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + /* Function 11 */ -CONFIGRET -PNP_GetDeviceListSize(handle_t BindingHandle, - wchar_t *Filter, - unsigned long *Length, - DWORD Flags) -{ - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(Filter); - UNREFERENCED_PARAMETER(Flags); - - DPRINT("PNP_GetDeviceListSize() called\n"); - - /* FIXME */ - *Length = 2; - - return CR_SUCCESS; +DWORD PNP_GetDeviceListSize( + handle_t hBinding, + LPWSTR pszFilter, + PNP_RPC_BUFFER_SIZE *pulLen, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 12 */ -CONFIGRET -PNP_GetDepth(handle_t BindingHandle, - wchar_t *DeviceInstance, - unsigned long *Depth, - DWORD Flags) +DWORD PNP_GetDepth( + handle_t hBinding, + LPWSTR pszDeviceID, + DWORD *pulDepth, + DWORD ulFlags) { PLUGPLAY_CONTROL_DEPTH_DATA PlugPlayData; CONFIGRET ret = CR_SUCCESS; NTSTATUS Status; - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(Flags); + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_GetDepth() called\n"); RtlInitUnicodeString(&PlugPlayData.DeviceInstance, - DeviceInstance); + pszDeviceID); Status = NtPlugPlayControl(PlugPlayControlGetDeviceDepth, (PVOID)&PlugPlayData, sizeof(PLUGPLAY_CONTROL_DEPTH_DATA)); if (NT_SUCCESS(Status)) { - *Depth = PlugPlayData.Depth; + *pulDepth = PlugPlayData.Depth; } else { @@ -462,15 +490,15 @@ /* Function 13 */ -CONFIGRET -PNP_GetDeviceRegProp(handle_t BindingHandle, - wchar_t *DeviceInstance, - DWORD Property, - DWORD *DataType, - char *Buffer, - DWORD *TransferLen, - DWORD *Length, - DWORD Flags) +DWORD PNP_GetDeviceRegProp( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulProperty, + DWORD *pulRegDataType, + BYTE *Buffer, + PNP_PROP_SIZE *pulTransferLen, + PNP_PROP_SIZE *pulLength, + DWORD ulFlags) { PLUGPLAY_CONTROL_PROPERTY_DATA PlugPlayData; CONFIGRET ret = CR_SUCCESS; @@ -478,12 +506,12 @@ HKEY hKey = 0; NTSTATUS Status; - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(Flags); + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_GetDeviceRegProp() called\n"); - switch (Property) + switch (ulProperty) { case CM_DRP_DEVICEDESC: lpValueName = L"DeviceDesc"; @@ -575,7 +603,7 @@ { /* Retrieve information from the Registry */ if (RegOpenKeyExW(hEnumKey, - DeviceInstance, + pDeviceID, 0, KEY_ALL_ACCESS, &hKey)) @@ -584,9 +612,9 @@ if (RegQueryValueExW(hKey, lpValueName, NULL, - DataType, - (LPBYTE)Buffer, - Length)) + pulRegDataType, + Buffer, + pulLength)) ret = CR_REGISTRY_ERROR; /* FIXME: Check buffer size */ @@ -597,11 +625,11 @@ { /* Retrieve information from the Device Node */ RtlInitUnicodeString(&PlugPlayData.DeviceInstance, - DeviceInstance); + pDeviceID); PlugPlayData.Buffer = Buffer; - PlugPlayData.BufferSize = *TransferLen; - - switch (Property) + PlugPlayData.BufferSize = *pulTransferLen; + + switch (ulProperty) { #if 0 case CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME: @@ -638,7 +666,7 @@ sizeof(PLUGPLAY_CONTROL_PROPERTY_DATA)); if (NT_SUCCESS(Status)) { - *Length = PlugPlayData.BufferSize; + *pulLength = PlugPlayData.BufferSize; } else { @@ -653,30 +681,30 @@ /* Function 14 */ -CONFIGRET -PNP_SetDeviceRegProp(handle_t BindingHandle, - wchar_t *DeviceId, - unsigned long Property, - unsigned long DataType, - char *Buffer, - unsigned long Length, - unsigned long Flags) +DWORD PNP_SetDeviceRegProp( + handle_t hBinding, + LPWSTR pDeviceId, + DWORD ulProperty, + DWORD ulDataType, + BYTE *Buffer, + PNP_PROP_SIZE ulLength, + DWORD ulFlags) { CONFIGRET ret = CR_SUCCESS; LPWSTR lpValueName = NULL; HKEY hKey = 0; - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(Flags); + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_SetDeviceRegProp() called\n"); - DPRINT("DeviceId: %S\n", DeviceId); - DPRINT("Property: %lu\n", Property); - DPRINT("DataType: %lu\n", DataType); - DPRINT("Length: %lu\n", Length); - - switch (Property) + DPRINT("DeviceId: %S\n", pDeviceId); + DPRINT("Property: %lu\n", ulProperty); + DPRINT("DataType: %lu\n", ulDataType); + DPRINT("Length: %lu\n", ulLength); + + switch (ulProperty) { case CM_DRP_DEVICEDESC: lpValueName = L"DeviceDesc"; @@ -737,13 +765,13 @@ DPRINT("Value name: %S\n", lpValueName); if (RegOpenKeyExW(hEnumKey, - DeviceId, + pDeviceId, 0, - KEY_ALL_ACCESS, + KEY_ALL_ACCESS, /* FIXME: so much? */ &hKey)) return CR_INVALID_DEVNODE; - if (Length == 0) + if (ulLength == 0) { if (RegDeleteValueW(hKey, lpValueName)) @@ -754,9 +782,9 @@ if (RegSetValueExW(hKey, lpValueName, 0, - DataType, - (const BYTE*)Buffer, - Length)) + ulDataType, + Buffer, + ulLength)) ret = CR_REGISTRY_ERROR; } @@ -769,87 +797,56 @@ /* Function 15 */ -CONFIGRET -PNP_GetClassInstance(handle_t BindingHandle, - wchar_t *DeviceId, /* in */ - wchar_t *Buffer, /* out */ - unsigned long Length) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(DeviceId); - UNREFERENCED_PARAMETER(Buffer); - UNREFERENCED_PARAMETER(Length); - - DPRINT("PNP_Get_Class_Instance() called\n"); - - DPRINT("PNP_Get_Class_Instance() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_GetClassInstance( + handle_t hBinding, + LPWSTR pDeviceId, + LPWSTR pszClassInstance, + PNP_RPC_STRING_LEN ulLength) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 16 */ -CONFIGRET -PNP_CreateKey(handle_t BindingHandle, - wchar_t *SubKey, - unsigned long samDesired, - unsigned long Flags) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(SubKey); - UNREFERENCED_PARAMETER(samDesired); - UNREFERENCED_PARAMETER(Flags); - - DPRINT("PNP_CreateKey() called\n"); - - DPRINT("PNP_CreateKey() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_CreateKey( + handle_t hBinding, + LPWSTR pszSubKey, + DWORD samDesired, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 17 */ -CONFIGRET -PNP_DeleteRegistryKey(handle_t BindingHandle, - wchar_t *DeviceId, - wchar_t *ParentKey, - wchar_t *ChildKey, - unsigned long Flags) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(DeviceId); - UNREFERENCED_PARAMETER(ParentKey); - UNREFERENCED_PARAMETER(ChildKey); - UNREFERENCED_PARAMETER(Flags); - - DPRINT("PNP_DeleteRegistryKey() called\n"); - - DPRINT("PNP_DeleteRegistryKey() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_DeleteRegistryKey( + handle_t hBinding, + LPWSTR pszDeviceID, + LPWSTR pszParentKey, + LPWSTR pszChildKey, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 18 */ -#if 0 -CONFIGRET -PNP_GetClassCount(handle_t BindingHandle, - unsigned long *ClassCount, - unsigned long Flags) -{ - HANDLE hKey = NULL; +DWORD PNP_GetClassCount( + handle_t hBinding, + DWORD *pulClassCount, + DWORD ulFlags) +{ + HKEY hKey; DWORD dwError; - UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - pszRegPathClass, + REGSTR_PATH_CLASS, 0, KEY_QUERY_VALUE, &hKey); @@ -860,7 +857,7 @@ NULL, NULL, NULL, - &ClassCount, + pulClassCount, NULL, NULL, NULL, @@ -874,31 +871,30 @@ return CR_SUCCESS; } -#endif /* Function 19 */ -CONFIGRET -PNP_GetClassName(handle_t BindingHandle, - wchar_t *ClassGuid, - wchar_t *Buffer, - unsigned long *Length, - unsigned long Flags) +DWORD PNP_GetClassName( + handle_t hBinding, + LPWSTR pszClassGuid, + LPWSTR Buffer, + PNP_RPC_STRING_LEN *pulLength, + DWORD ulFlags) { WCHAR szKeyName[MAX_PATH]; CONFIGRET ret = CR_SUCCESS; - HKEY hKey = NULL; + HKEY hKey; DWORD dwSize; - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(Flags); + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_GetClassName() called\n"); lstrcpyW(szKeyName, L"System\\CurrentControlSet\\Control\\Class"); lstrcatW(szKeyName, L"\\"); - if(lstrlenW(ClassGuid) < sizeof(szKeyName)/sizeof(WCHAR)-lstrlenW(szKeyName)) - lstrcatW(szKeyName, ClassGuid); + if(lstrlenW(pszClassGuid) < sizeof(szKeyName)/sizeof(WCHAR)-lstrlenW(szKeyName)) + lstrcatW(szKeyName, pszClassGuid); else return CR_INVALID_DATA; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -908,7 +904,7 @@ &hKey)) return CR_REGISTRY_ERROR; - dwSize = *Length * sizeof(WCHAR); + dwSize = *pulLength * sizeof(WCHAR); if (RegQueryValueExW(hKey, L"Class", NULL, @@ -916,12 +912,12 @@ (LPBYTE)Buffer, &dwSize)) { - *Length = 0; + *pulLength = 0; ret = CR_REGISTRY_ERROR; } else { - *Length = dwSize / sizeof(WCHAR); + *pulLength = dwSize / sizeof(WCHAR); } RegCloseKey(hKey); @@ -933,25 +929,25 @@ /* Function 20 */ -CONFIGRET -PNP_DeleteClassKey(handle_t BindingHandle, - wchar_t *ClassGuid, - unsigned long Flags) +DWORD PNP_DeleteClassKey( + handle_t hBinding, + LPWSTR pszClassGuid, + DWORD ulFlags) { CONFIGRET ret = CR_SUCCESS; - UNREFERENCED_PARAMETER(BindingHandle); - - DPRINT("PNP_GetClassName(%S, %lx) called\n", ClassGuid, Flags); - - if (Flags & CM_DELETE_CLASS_SUBKEYS) - { - if (RegDeleteTreeW(hClassKey, ClassGuid) != ERROR_SUCCESS) + UNREFERENCED_PARAMETER(hBinding); + + DPRINT("PNP_GetClassName(%S, %lx) called\n", pszClassGuid, ulFlags); + + if (ulFlags & CM_DELETE_CLASS_SUBKEYS) + { + if (RegDeleteTreeW(hClassKey, pszClassGuid) != ERROR_SUCCESS) ret = CR_REGISTRY_ERROR; } else { - if (RegDeleteKeyW(hClassKey, ClassGuid) != ERROR_SUCCESS) + if (RegDeleteKeyW(hClassKey, pszClassGuid) != ERROR_SUCCESS) ret = CR_REGISTRY_ERROR; } @@ -961,81 +957,161 @@ } +/* Function 21 */ +DWORD PNP_GetInterfaceDeviceAlias( + handle_t hBinding, + LPWSTR pszInterfaceDevice, + GUID *AliasInterfaceGuid, + LPWSTR pszAliasInterfaceDevice, + PNP_RPC_STRING_LEN *pulLength, + PNP_RPC_STRING_LEN *pulTransferLen, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 22 */ +DWORD PNP_GetInterfaceDeviceList( + handle_t hBinding, + GUID *InterfaceGuid, + LPWSTR pszDeviceID, + BYTE *Buffer, + PNP_RPC_BUFFER_SIZE *pulLength, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 23 */ +DWORD PNP_GetInterfaceDeviceListSize( + handle_t hBinding, + PNP_RPC_BUFFER_SIZE *pulLen, + GUID *InterfaceGuid, + LPWSTR pszDeviceID, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 24 */ +DWORD PNP_RegisterDeviceClassAssociation( + handle_t hBinding, + LPWSTR pszDeviceID, + GUID *InterfaceGuid, + LPWSTR pszReference, + LPWSTR pszSymLink, + PNP_RPC_STRING_LEN *pulLength, + PNP_RPC_STRING_LEN *pulTransferLen, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 25 */ +DWORD PNP_UnregisterDeviceClassAssociation( + handle_t hBinding, + LPWSTR pszInterfaceDevice, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 26 */ +DWORD PNP_GetClassRegProp( + handle_t hBinding, + LPWSTR pszClassGuid, + DWORD ulProperty, + DWORD *pulRegDataType, + BYTE *Buffer, + PNP_RPC_STRING_LEN *pulTransferLen, + PNP_RPC_STRING_LEN *pulLength, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 27 */ +DWORD PNP_SetClassRegProp( + handle_t hBinding, + LPWSTR *pszClassGuid, + DWORD ulProperty, + DWORD ulDataType, + BYTE *Buffer, + PNP_PROP_SIZE ulLength, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + /* Function 28 */ -CONFIGRET -PNP_CreateDevInst(handle_t BindingHandle, - wchar_t *DeviceId, /* [in, out, string, size_is(Length)] */ - wchar_t *ParentDeviceId, /* [in, string] */ - unsigned long Length, /* [in] */ - unsigned long Flags) /* [in] */ -{ - CONFIGRET ret = CR_CALL_NOT_IMPLEMENTED; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(DeviceId); - UNREFERENCED_PARAMETER(ParentDeviceId); - UNREFERENCED_PARAMETER(Length); - UNREFERENCED_PARAMETER(Flags); - - DPRINT1("PNP_CreateDevInst() called\n"); - - DPRINT1("PNP_CreateDevInst() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_CreateDevInst( + handle_t hBinding, + LPWSTR pszDeviceID, + LPWSTR pszParentDeviceID, + PNP_RPC_STRING_LEN ulLength, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 29 */ -CONFIGRET -PNP_DeviceInstanceAction(handle_t BindingHandle, - unsigned long MajorAction, - unsigned long MinorAction, - wchar_t *DeviceInstance1, - wchar_t *DeviceInstance2) +#define PNP_DEVINST_SETUP 0x3 +#define PNP_DEVINST_ENABLE 0x4 +#define PNP_DEVINST_REENUMERATE 0x7 +DWORD PNP_DeviceInstanceAction( + handle_t hBinding, + DWORD ulMajorAction, + DWORD ulMinorAction, + LPWSTR pszDeviceInstance1, + LPWSTR pszDeviceInstance2) { CONFIGRET ret = CR_SUCCESS; - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(MinorAction); - UNREFERENCED_PARAMETER(DeviceInstance1); - UNREFERENCED_PARAMETER(DeviceInstance2); + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulMinorAction); + UNREFERENCED_PARAMETER(pszDeviceInstance1); + UNREFERENCED_PARAMETER(pszDeviceInstance2); DPRINT("PNP_DeviceInstanceAction() called\n"); - switch (MajorAction) - { - case 2: - DPRINT("Move device instance\n"); - /* FIXME */ - ret = CR_CALL_NOT_IMPLEMENTED; - break; - - case 3: + switch (ulMajorAction) + { + case PNP_DEVINST_SETUP: DPRINT("Setup device instance\n"); /* FIXME */ ret = CR_CALL_NOT_IMPLEMENTED; break; - case 4: + case PNP_DEVINST_ENABLE: DPRINT("Enable device instance\n"); /* FIXME */ ret = CR_CALL_NOT_IMPLEMENTED; break; - case 5: - DPRINT("Disable device instance\n"); - /* FIXME */ - ret = CR_CALL_NOT_IMPLEMENTED; - break; - - case 7: + case PNP_DEVINST_REENUMERATE: DPRINT("Reenumerate device instance\n"); /* FIXME */ ret = CR_CALL_NOT_IMPLEMENTED; break; default: - DPRINT1("Unknown function %lu\n", MajorAction); + DPRINT1("Unknown function %lu\n", ulMajorAction); ret = CR_CALL_NOT_IMPLEMENTED; } @@ -1046,24 +1122,24 @@ /* Function 30 */ -CONFIGRET -PNP_GetDeviceStatus(handle_t BindingHandle, - wchar_t *DeviceInstance, - unsigned long *pStatus, - unsigned long *pProblem, - DWORD Flags) +DWORD PNP_GetDeviceStatus( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD *pulStatus, + DWORD *pulProblem, + DWORD ulFlags) { PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; CONFIGRET ret = CR_SUCCESS; NTSTATUS Status; - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(Flags); + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_GetDeviceStatus() called\n"); RtlInitUnicodeString(&PlugPlayData.DeviceInstance, - DeviceInstance); + pDeviceID); PlugPlayData.Operation = 0; /* Get status */ Status = NtPlugPlayControl(PlugPlayControlDeviceStatus, @@ -1071,8 +1147,8 @@ sizeof(PLUGPLAY_CONTROL_STATUS_DATA)); if (NT_SUCCESS(Status)) { - *pStatus = PlugPlayData.DeviceStatus; - *pProblem = PlugPlayData.DeviceProblem; + *pulStatus = PlugPlayData.DeviceStatus; + *pulProblem = PlugPlayData.DeviceProblem; } else { @@ -1086,48 +1162,38 @@ /* Function 31 */ -CONFIGRET -PNP_SetDeviceProblem(handle_t BindingHandle, - wchar_t *DeviceInstance, - unsigned long Problem, - DWORD Flags) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(DeviceInstance); - UNREFERENCED_PARAMETER(Problem); - UNREFERENCED_PARAMETER(Flags); - - DPRINT1("PNP_SetDeviceProblem() called\n"); - - /* FIXME */ - - DPRINT1("PNP_SetDeviceProblem() done (returns %lx)\n", ret); - - return ret; -} - +DWORD PNP_SetDeviceProblem( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulProblem, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 32 */ +DWORD PNP_DisableDevInst( + handle_t hBinding, + LPWSTR pDeviceID, + PPNP_VETO_TYPE pVetoType, + LPWSTR pszVetoName, + DWORD ulNameLength, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} /* Function 33 */ -CONFIGRET -PNP_UninstallDevInst(handle_t BindingHandle, - wchar_t *DeviceInstance, - DWORD Flags) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(DeviceInstance); - UNREFERENCED_PARAMETER(Flags); - - DPRINT1("PNP_UninstallDevInst() called\n"); - - /* FIXME */ - - DPRINT1("PNP_UninstallDevInst() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_UninstallDevInst( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } @@ -1174,11 +1240,11 @@ /* Function 34 */ -CONFIGRET -PNP_AddID(handle_t BindingHandle, - wchar_t *DeviceInstance, - wchar_t *DeviceId, - DWORD Flags) +DWORD PNP_AddID( + handle_t hBinding, + LPWSTR pszDeviceID, + LPWSTR pszID, + DWORD ulFlags) { CONFIGRET ret = CR_SUCCESS; HKEY hDeviceKey; @@ -1186,15 +1252,15 @@ DWORD dwDeviceIdListSize; WCHAR szDeviceIdList[512]; - UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(hBinding); DPRINT("PNP_AddID() called\n"); - DPRINT(" DeviceInstance: %S\n", DeviceInstance); - DPRINT(" DeviceId: %S\n", DeviceId); - DPRINT(" Flags: %lx\n", Flags); + DPRINT(" DeviceInstance: %S\n", pszDeviceID); + DPRINT(" DeviceId: %S\n", pszID); + DPRINT(" Flags: %lx\n", ulFlags); if (RegOpenKeyExW(hEnumKey, - DeviceInstance, + pszDeviceID, 0, KEY_QUERY_VALUE | KEY_SET_VALUE, &hDeviceKey) != ERROR_SUCCESS) @@ -1203,7 +1269,7 @@ return CR_INVALID_DEVNODE; } - pszSubKey = (Flags & CM_ADD_ID_COMPATIBLE) ? L"CompatibleIDs" : L"HardwareID"; + pszSubKey = (ulFlags & CM_ADD_ID_COMPATIBLE) ? L"CompatibleIDs" : L"HardwareID"; dwDeviceIdListSize = 512 * sizeof(WCHAR); if (RegQueryValueExW(hDeviceKey, @@ -1219,7 +1285,7 @@ } /* Check whether the device ID is already in use */ - if (CheckForDeviceId(szDeviceIdList, DeviceId)) + if (CheckForDeviceId(szDeviceIdList, pszDeviceID)) { DPRINT("Device ID was found in the ID string!\n"); ret = CR_SUCCESS; @@ -1227,7 +1293,7 @@ } /* Append the Device ID */ - AppendDeviceId(szDeviceIdList, &dwDeviceIdListSize, DeviceId); + AppendDeviceId(szDeviceIdList, &dwDeviceIdListSize, pszID); if (RegSetValueExW(hDeviceKey, pszSubKey, @@ -1249,9 +1315,47 @@ } +/* Function 35 */ +DWORD PNP_RegisterDriver( + handle_t hBinding, + LPWSTR pszDeviceID, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 36 */ +DWORD PNP_QueryRemove( + handle_t hBinding, + LPWSTR pszDeviceID, + PPNP_VETO_TYPE pVetoType, + LPWSTR pszVetoName, + DWORD ulNameLength, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 37 */ +DWORD PNP_RequestDeviceEject( + handle_t hBinding, + LPWSTR pszDeviceID, + PPNP_VETO_TYPE pVetoType, + LPWSTR pszVetoName, + DWORD ulNameLength, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + /* Function 38 */ CONFIGRET -PNP_IsDockStationPresent(handle_t BindingHandle, +PNP_IsDockStationPresent(handle_t hBinding, BOOL *Present) { HKEY hKey; @@ -1260,7 +1364,7 @@ DWORD dwSize; CONFIGRET ret = CR_SUCCESS; - UNREFERENCED_PARAMETER(BindingHandle); + UNREFERENCED_PARAMETER(hBinding); DPRINT1("PNP_IsDockStationPresent() called\n"); @@ -1303,189 +1407,397 @@ /* Function 39 */ -CONFIGRET -PNP_RequestEjectPC(handle_t BindingHandle) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - - DPRINT1("PNP_RequestEjectPC() called\n"); - - ret = CR_FAILURE; /* FIXME */ - - DPRINT1("PNP_RequestEjectPC() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_RequestEjectPC( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 40 */ -CONFIGRET -PNP_HwProfFlags(handle_t BindingHandle, - DWORD Action, - wchar_t *DeviceId, - DWORD ProfileId, - DWORD *Value, // out - DWORD Flags) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(Action); - UNREFERENCED_PARAMETER(DeviceId); - UNREFERENCED_PARAMETER(ProfileId); - UNREFERENCED_PARAMETER(Value); - UNREFERENCED_PARAMETER(Flags); - - DPRINT1("PNP_HwProfFlags() called\n"); - - ret = CR_CALL_NOT_IMPLEMENTED; /* FIXME */ - - DPRINT1("PNP_HwProfFlags() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_HwProfFlags( + handle_t hBinding, + DWORD ulAction, + LPWSTR pDeviceID, + DWORD ulConfig, + DWORD *pulValue, + PPNP_VETO_TYPE pVetoType, + LPWSTR pszVetoName, + DWORD ulNameLength, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 41 */ +DWORD PNP_GetHwProfInfo( + handle_t hBinding, + DWORD ulIndex, + HWPROFILEINFO *pHWProfileInfo, + DWORD ulProfileInfoSize, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 42 */ -CONFIGRET -PNP_AddEmptyLogConf(handle_t BindingHandle, - wchar_t *DeviceInstance, - unsigned long ulPriority, - unsigned long *pulLogConfTag, - unsigned long ulFlags) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(DeviceInstance); - UNREFERENCED_PARAMETER(ulPriority); - UNREFERENCED_PARAMETER(ulFlags); - - DPRINT1("PNP_AddEmptyLogConf() called\n"); - - *pulLogConfTag = 0; /* FIXME */ - - DPRINT1("PNP_AddEmptyLogConf() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_AddEmptyLogConf( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulPriority, + DWORD *pulLogConfTag, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 43 */ -CONFIGRET -PNP_FreeLogConf(handle_t BindingHandle, - wchar_t *DeviceInstance, - unsigned long ulType, - unsigned long ulLogConfTag, - unsigned long ulFlags) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(DeviceInstance); - UNREFERENCED_PARAMETER(ulType); - UNREFERENCED_PARAMETER(ulLogConfTag); - UNREFERENCED_PARAMETER(ulFlags); - - DPRINT1("PNP_FreeLogConf() called\n"); - - - DPRINT1("PNP_FreeLogConf() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_FreeLogConf( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulLogConfType, + DWORD ulLogConfTag, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 44 */ -CONFIGRET -PNP_GetFirstLogConf(handle_t BindingHandle, - wchar_t *DeviceInstance, - unsigned long ulPriority, - unsigned long *pulLogConfTag, - unsigned long ulFlags) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(DeviceInstance); - UNREFERENCED_PARAMETER(ulPriority); - UNREFERENCED_PARAMETER(ulFlags); - - DPRINT1("PNP_GetFirstLogConf() called\n"); - - *pulLogConfTag = 0; /* FIXME */ - - DPRINT1("PNP_GetFirstLogConf() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_GetFirstLogConf( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulLogConfType, + DWORD *pulLogConfTag, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 45 */ -CONFIGRET -PNP_GetNextLogConf(handle_t BindingHandle, - wchar_t *DeviceInstance, - unsigned long ulLogConfType, - unsigned long ulCurrentTag, - unsigned long *pulNextTag, - unsigned long ulFlags) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(DeviceInstance); - UNREFERENCED_PARAMETER(ulLogConfType); - UNREFERENCED_PARAMETER(ulCurrentTag); - UNREFERENCED_PARAMETER(ulFlags); - - DPRINT1("PNP_GetNextLogConf() called\n"); - - *pulNextTag = 0; /* FIXME */ - - DPRINT1("PNP_GetNextLogConf() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_GetNextLogConf( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulLogConfType, + DWORD ulCurrentTag, + DWORD *pulNextTag, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 46 */ -CONFIGRET -PNP_GetLogConfPriority(handle_t BindingHandle, - wchar_t *DeviceInstance, - unsigned long ulLogConfType, - unsigned long ulCurrentTag, - unsigned long *pPriority, - unsigned long ulFlags) -{ - CONFIGRET ret = CR_SUCCESS; - - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(DeviceInstance); - UNREFERENCED_PARAMETER(ulLogConfType); - UNREFERENCED_PARAMETER(ulCurrentTag); - UNREFERENCED_PARAMETER(ulFlags); - - DPRINT1("PNP_GetLogConfPriority() called\n"); - - *pPriority = 0; /* FIXME */ - - DPRINT1("PNP_GetLogConfPriority() done (returns %lx)\n", ret); - - return ret; +DWORD PNP_GetLogConfPriority( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulType, + DWORD ulTag, + DWORD *pPriority, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 47 */ +DWORD PNP_AddResDes( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulLogConfTag, + DWORD ulLogConfType, + RESOURCEID ResourceID, + DWORD *pulResourceTag, + BYTE *ResourceData, + PNP_RPC_BUFFER_SIZE ResourceLen, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 48 */ +DWORD PNP_FreeResDes( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulLogConfTag, + DWORD ulLogConfType, + RESOURCEID ResourceID, + DWORD ulResourceTag, + DWORD *pulPreviousResType, + DWORD *pulPreviousResTag, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 49 */ +DWORD PNP_GetNextResDes( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulLogConfTag, + DWORD ulLogConfType, + RESOURCEID ResourceID, + DWORD ulResourceTag, + DWORD *pulNextResType, + DWORD *pulNextResTag, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 50 */ +DWORD PNP_GetResDesData( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulLogConfTag, + DWORD ulLogConfType, + RESOURCEID ResourceID, + DWORD ulResourceTag, + BYTE *Buffer, + PNP_RPC_BUFFER_SIZE BufferLen, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 51 */ +DWORD PNP_GetResDesDataSize( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulLogConfTag, + DWORD ulLogConfType, + RESOURCEID ResourceID, + DWORD ulResourceTag, + DWORD *pulSize, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 52 */ +DWORD PNP_ModifyResDes( + handle_t hBinding, + LPWSTR pDeviceID, + DWORD ulLogConfTag, + DWORD ulLogConfType, + RESOURCEID CurrentResourceID, + RESOURCEID NewResourceID, + DWORD ulResourceTag, + BYTE *ResourceData, + PNP_RPC_BUFFER_SIZE ResourceLen, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 53 */ +DWORD PNP_DetectResourceConflict( + handle_t hBinding, + LPWSTR pDeviceID, + RESOURCEID ResourceID, + BYTE *ResourceData, + PNP_RPC_BUFFER_SIZE ResourceLen, + BOOL *pbConflictDetected, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 54 */ +DWORD PNP_QueryResConfList( + handle_t hBinding, + LPWSTR pDeviceID, + RESOURCEID ResourceID, + BYTE *ResourceData, + PNP_RPC_BUFFER_SIZE ResourceLen, + BYTE *Buffer, + PNP_RPC_BUFFER_SIZE BufferLen, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 55 */ +DWORD PNP_Function55( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 56 */ +DWORD PNP_Function56( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 57 */ +DWORD PNP_Function57( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; } /* Function 58 */ CONFIGRET -PNP_RunDetection(handle_t BindingHandle, - unsigned long Flags) -{ - UNREFERENCED_PARAMETER(BindingHandle); - UNREFERENCED_PARAMETER(Flags); - - DPRINT("PNP_RunDetection() called\n"); +PNP_RunDetection( + handle_t BindingHandle, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 59 */ +DWORD PNP_Function59( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 60 */ +DWORD PNP_Function60( + handle_t hBinding) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 61 */ +DWORD PNP_GetCustomDevProp( + handle_t hBinding, + LPWSTR pDeviceID, + LPWSTR CustomPropName, + DWORD *pulRegDataType, + BYTE *Buffer, + PNP_RPC_STRING_LEN *pulTransferLen, + PNP_RPC_STRING_LEN *pulLength, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 62 */ +DWORD PNP_GetVersionInternal( + handle_t hBinding, + WORD *pwVersion) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 63 */ +DWORD PNP_GetBlockedDriverInfo( + handle_t hBinding, + BYTE *Buffer, + PNP_RPC_BUFFER_SIZE *pulTransferLen, + PNP_RPC_BUFFER_SIZE *pulLength, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 64 */ +DWORD PNP_GetServerSideDeviceInstallFlags( + handle_t hBinding, + DWORD *pulSSDIFlags, + DWORD ulFlags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 65 */ +DWORD PNP_GetObjectPropKeys( + handle_t hBinding, + LPWSTR ObjectName, + DWORD ObjectType, + LPWSTR PropertyCultureName, + PNP_PROP_COUNT *PropertyCount, + PNP_PROP_COUNT *TransferLen, + DEVPROPKEY *PropertyKeys, + DWORD Flags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 66 */ +DWORD PNP_GetObjectProp( + handle_t hBinding, + LPWSTR ObjectName, + DWORD ObjectType, + LPWSTR PropertyCultureName, + const DEVPROPKEY *PropertyKey, + DEVPROPTYPE *PropertyType, + PNP_PROP_SIZE *PropertySize, + PNP_PROP_SIZE *TransferLen, + BYTE *PropertyBuffer, + DWORD Flags) +{ + UNIMPLEMENTED; + return CR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 67 */ +DWORD PNP_SetObjectProp( + handle_t hBinding, + LPWSTR ObjectName, + DWORD ObjectType, + LPWSTR PropertyCultureName, + const DEVPROPKEY *PropertyKey, + DEVPROPTYPE PropertyType, + PNP_PROP_SIZE PropertySize, + BYTE *PropertyBuffer, + DWORD Flags) +{ + UNIMPLEMENTED; return CR_CALL_NOT_IMPLEMENTED; } Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Mon Apr 14 05:48:38 2008 @@ -810,7 +810,7 @@ } ret = PNP_EnumerateSubKeys(BindingHandle, - PNP_BRANCH_CLASS, + PNP_CLASS_SUBKEYS, ulClassIndex, szBuffer, MAX_GUID_STRING_LEN, @@ -933,7 +933,7 @@ } return PNP_EnumerateSubKeys(BindingHandle, - PNP_BRANCH_ENUM, + PNP_ENUMERATOR_SUBKEYS, ulEnumIndex, Buffer, *pulLength, @@ -1042,7 +1042,7 @@ RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; LPWSTR lpDevInst; - DWORD dwIndex; + DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN; CONFIGRET ret; TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); @@ -1079,10 +1079,10 @@ return CR_INVALID_DEVNODE; ret = PNP_GetRelatedDeviceInstance(BindingHandle, - PNP_DEVICE_CHILD, + PNP_GET_CHILD_DEVICE_INSTANCE, lpDevInst, szRelatedDevInst, - MAX_DEVICE_ID_LEN, + &dwLength, 0); if (ret != CR_SUCCESS) return ret; @@ -2181,8 +2181,8 @@ return CR_FAILURE; } - return PNP_HwProfFlags(BindingHandle, PNP_GET_HW_PROFILE_FLAGS, szDevInstName, - ulHardwareProfile, pulValue, 0); + return PNP_HwProfFlags(BindingHandle, PNP_GET_HWPROFFLAGS, szDevInstName, + ulHardwareProfile, pulValue, NULL, NULL, 0, 0); } @@ -2356,7 +2356,7 @@ RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; LPWSTR lpDevInst; - DWORD dwIndex; + DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN; CONFIGRET ret; TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); @@ -2393,10 +2393,10 @@ return CR_INVALID_DEVNODE; ret = PNP_GetRelatedDeviceInstance(BindingHandle, - PNP_DEVICE_PARENT, + PNP_GET_PARENT_DEVICE_INSTANCE, lpDevInst, szRelatedDevInst, - MAX_DEVICE_ID_LEN, + &dwLength, 0); if (ret != CR_SUCCESS) return ret; @@ -2434,7 +2434,7 @@ RPC_BINDING_HANDLE BindingHandle = NULL; HSTRING_TABLE StringTable = NULL; LPWSTR lpDevInst; - DWORD dwIndex; + DWORD dwIndex, dwLength = MAX_DEVICE_ID_LEN; CONFIGRET ret; TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); @@ -2471,10 +2471,10 @@ return CR_INVALID_DEVNODE; ret = PNP_GetRelatedDeviceInstance(BindingHandle, - PNP_DEVICE_SIBLING, + PNP_GET_SIBLING_DEVICE_INSTANCE, lpDevInst, szRelatedDevInst, - MAX_DEVICE_ID_LEN, + &dwLength, 0); if (ret != CR_SUCCESS) return ret; @@ -3407,7 +3407,7 @@ lpDevInst, ulProperty, ulType, - (char *)Buffer, + (BYTE *)Buffer, ulLength, ulFlags); } @@ -3502,8 +3502,8 @@ return CR_FAILURE; } - return PNP_HwProfFlags(BindingHandle, PNP_SET_HW_PROFILE_FLAGS, szDevInstName, - ulConfig, &ulValue, 0); + return PNP_HwProfFlags(BindingHandle, PNP_SET_HWPROFFLAGS, szDevInstName, + ulConfig, &ulValue, NULL, NULL, 0, 0); } Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Mon Apr 14 05:48:38 2008 @@ -4,7 +4,243 @@ #include "include/reactos/idl/wtypes.idl" -#define CONFIGRET unsigned long +const unsigned long PNP_MAX_STRING_LEN = 32767; +const unsigned long PNP_MAX_DEVICE_ID_LEN = 200; +const unsigned long PNP_MAX_GUID_STRING_LEN = 39; +const unsigned long PNP_MAX_DEVINTERFACE_LEN = PNP_MAX_STRING_LEN; +const unsigned long PNP_MAX_CULTURE_NAME_LEN = 85; +const unsigned long PNP_MAX_CM_PATH = 360; +const unsigned long PNP_MAX_PROP_SIZE = 65534; +const unsigned long PNP_MAX_PROP_COUNT = 32767; +const unsigned long PNP_MAX_BUFFER_SIZE = 16000000; + +typedef unsigned long RESOURCEID; +typedef unsigned long DEVPROPTYPE; +typedef [range(0, PNP_MAX_PROP_SIZE)] unsigned long PNP_PROP_SIZE, *PPNP_PROP_SIZE; +typedef [range(0, PNP_MAX_PROP_COUNT)] unsigned long PNP_PROP_COUNT, *PPNP_PROP_COUNT; +typedef [range(0, PNP_MAX_STRING_LEN)] unsigned long PNP_RPC_STRING_LEN, *PPNP_RPC_STRING_LEN; +typedef [range(0, PNP_MAX_BUFFER_SIZE)] unsigned long PNP_RPC_BUFFER_SIZE, *PPNP_RPC_BUFFER_SIZE; + +cpp_quote("#ifndef _CFG_INCLUDED_") + +typedef enum _PNP_VETO_TYPE { + PNP_VetoTypeUnknown = 0, + PNP_VetoLegacyDevice = 1, + PNP_VetoPendingClose = 2, + PNP_VetoWindowsApp = 3, + PNP_VetoWindowsService = 4, + PNP_VetoOutstandingOpen = 5, + PNP_VetoDevice = 6, + PNP_VetoDriver = 7, + PNP_VetoIllegalDeviceRequest = 8, + PNP_VetoInsufficientPower = 9, + PNP_VetoNonDisableable = 10, + PNP_VetoLegacyDriver = 11, + PNP_VetoInsufficientRights = 12, +} *PPNP_VETO_TYPE; + +cpp_quote("#endif") + +cpp_quote("#if 0") + +typedef struct _BUSNUMBER_DES { + DWORD BUSD_Count; + DWORD BUSD_Type; + DWORD BUSD_Flags; + DWORD BUSD_Alloc_Base; + DWORD BUSD_Alloc_End; +} BUSNUMBER_DES, *PBUSNUMBER_DES; + +typedef struct _BUSNUMBER_RANGE { + DWORD BUSR_Min; + DWORD BUSR_Max; + DWORD BUSR_nBusNumbers; + DWORD BUSR_Flags; +} BUSNUMBER_RANGE, *PBUSNUMBER_RANGE; + +typedef struct _BUSNUMBER_RESOURCE { + BUSNUMBER_DES BusNumber_Header; + BUSNUMBER_RANGE BusNumber_Data[1]; +} BUSNUMBER_RESOURCE, *PBUSNUMBER_RESOURCE; + +typedef struct _CS_DES { + DWORD CSD_SignatureLength; + DWORD CSD_LegacyDataOffset; + DWORD CSD_LegacyDataSize; + DWORD CSD_Flags; + GUID CSD_ClassGuid; + BYTE CSD_Signature[1]; +} CS_DES, *PCS_DES; + +typedef struct _CS_RESOURCE { + CS_DES CS_Header; +} CS_RESOURCE, *PCS_RESOURCE; + +typedef struct _DEVPRIVATE_DES { + DWORD PD_Count; + DWORD PD_Type; + DWORD PD_Data1; + DWORD PD_Data2; + DWORD PD_Data3; + DWORD PD_Flags; +} DEVPRIVATE_DES, *PDEVPRIVATE_DES; + +typedef struct _DEVPRIVATE_RANGE { + DWORD PR_Data1; + DWORD PR_Data2; + DWORD PR_Data3; +} DEVPRIVATE_RANGE, *PDEVPRIVATE_RANGE; + +typedef struct _DEVPRIVATE_RESOURCE { + DEVPRIVATE_DES PRV_Header; + DEVPRIVATE_RANGE PRV_Data[1]; +} DEVPRIVATE_RESOURCE, *PDEVPRIVATE_RESOURCE; + +typedef struct _DMA_DES { + DWORD DD_Count; + DWORD DD_Type; + DWORD DD_Flags; + unsigned long DD_Alloc_Chan; +} DMA_DES, *PDMA_DES; + +typedef struct _DMA_RANGE { + DWORD DR_Min; + DWORD DR_Max; + DWORD DR_Flags; +} DMA_RANGE, *PDMA_RANGE; + +typedef struct _DMA_RESOURCE { + DMA_DES DMA_Header; + DMA_RANGE DMA_Data[1]; +} DMA_RESOURCE, *PDMA_RESOURCE; + +typedef struct _IO_DES { + DWORD IOD_Count; + DWORD IOD_Type; + unsigned __int64 IOD_AllocBase; + unsigned __int64 IOD_AllocEnd; + DWORD IOD_DesFlags; +} IO_DES, *PIO_DES; + +typedef struct _IO_RANGE { + unsigned __int64 IOR_Align; + DWORD IOR_nPorts; + unsigned __int64 IOR_Min; + unsigned __int64 IOR_Max; + DWORD IOR_RangeFlags; + unsigned __int64 IOR_Alias; +} IO_RANGE, *PIO_RANGE; + +typedef struct _IO_RESOURCE { + IO_DES IO_Header; + IO_RANGE IO_Data[1]; +} IO_RESOURCE, *PIO_RESOURCE; + +typedef struct _IRQ_DES { + DWORD IRQD_Count; + DWORD IRQD_Type; + DWORD IRQD_Flags; + DWORD IRQD_Alloc_Num; + DWORD IRQD_Affinity; +} IRQ_DES, *PIRQ_DES; + +typedef struct _IRQ_RANGE { + DWORD IRQR_Min; + DWORD IRQR_Max; + DWORD IRQR_Flags; +} IRQ_RANGE, *PIRQ_RANGE; + +typedef struct _IRQ_RESOURCE { + IRQ_DES IO_Header; + IRQ_RANGE IO_Data[1]; +} IRQ_RESOURCE, *PIRQ_RESOURCE; + +typedef struct _MEM_DES { + DWORD MD_Count; + DWORD MD_Type; + unsigned __int64 MD_Alloc_Base; + unsigned __int64 MD_Alloc_End; + DWORD MD_Flags; + DWORD Reserved; +} MEM_DES, *PMEM_DES; + +typedef struct _MEM_RANGE { + __int64 MR_Align; + DWORD MR_nBytes; + __int64 MR_Min; + __int64 MR_Max; + DWORD MR_Flags; + DWORD MR_Reserved; +} MEM_RANGE, *PMEM_RANGE; + +typedef struct _MEM_RESOURCE { + MEM_DES MEM_Header; + MEM_RANGE MEM_Data[1]; +} MEM_RESOURCE, *PMEM_RESOURCE; + +typedef struct _MFCARD_DES { + DWORD PMF_Count; + DWORD PMF_Type; + DWORD PMF_Flags; + BYTE PMF_ConfigOptions; + BYTE PMF_IoResourceIndex; + BYTE PMF_Reserved[2]; + DWORD PMF_ConfigRegisterBase; +} MFCARD_DES, *PMFCARD_DES; + +typedef struct _MFCARD_RESOURCE { + MFCARD_DES MfCard_Header; +} MFCARD_RESOURCE, *PMFCARD_RESOURCE; + +typedef struct _PCCARD_DES { + DWORD PCD_Count; + DWORD PCD_Type; + DWORD PCD_Flags; + BYTE PCD_ConfigIndex; + BYTE PCD_Reserved[3]; + DWORD PCD_MemoryCardBase1; + DWORD PCD_MemoryCardBase2; +} PCCARD_DES, *PPCCARD_DES; + +typedef struct _PCCARD_RESOURCE { + PCCARD_DES PcCard_Header; +} PCCARD_RESOURCE, *PPCARD_RESOURCE; + +cpp_quote("#endif") + +typedef struct _PNP_CONFLICT_ENTRY { + DWORD DeviceInstance; + DWORD DeviceFlags; + DWORD ResourceType; + __int64 ResourceStart; + __int64 ResourceEnd; + DWORD ResourceFlags; +} PNP_CONFLICT_ENTRY, *PPNP_CONFLICT_ENTRY; + +typedef struct _PNP_CONFLICT_LIST { + DWORD Reserved1; + DWORD Reserved2; + DWORD ConflictsCounted; + DWORD ConflictsListed; + DWORD RequiredBufferSize; + PNP_CONFLICT_ENTRY ConflictEntry[1]; +} PNP_CONFLICT_LIST, *PPNP_CONFLICT_LIST; + +typedef struct _PNP_CONFLICT_STRINGS { + DWORD NullDeviceInstance; + WCHAR DeviceInstanceStrings[1]; +} PNP_CONFLICT_STRINGS, *PPNP_CONFLICT_STRINGS; + +typedef struct _DEVPROPKEY { + GUID fmtid; + DWORD pid; +} DEVPROPKEY; + +typedef struct _HWPROFILEINFO { + DWORD HWPI_ulHWProfile; + WCHAR HWPI_szFriendlyName[80]; + DWORD HWPI_dwFlags; +} HWPROFILEINFO; [ uuid (809F4e40-A03D-11CE-8F69-08003E30051B), @@ -17,222 +253,556 @@ interface pnp { /* Function 0 */ -// CONFIGRET PNP_Unknown0(handle_t BindingHandle); + DWORD PNP_Function0( + [in] handle_t hBinding); /* FIXME */ /* Function 1 */ -// CONFIGRET PNP_Unknown1(handle_t BindingHandle); + DWORD PNP_Function1( + [in] handle_t hBinding); /* FIXME */ /* Function 2 */ - CONFIGRET PNP_GetVersion(handle_t BindingHandle, - [out] WORD *Version); + DWORD PNP_GetVersion( + [in] handle_t hBinding, + [out] WORD *pVersion); /* Function 3 */ - CONFIGRET PNP_GetGlobalState(handle_t BindingHandle, - [out] unsigned long *State, - [in] unsigned long Flags); + DWORD PNP_GetGlobalState( + [in] handle_t hBinding, + [out] DWORD *pulState, + [in] DWORD ulFlags); /* Function 4 */ - CONFIGRET PNP_InitDetection(handle_t BindingHandle); + DWORD PNP_InitDetection( + [in] handle_t hBinding); /* Function 5 */ - CONFIGRET PNP_ReportLogOn(handle_t BindingHandle, - [in] BOOL Admin, - [in] DWORD ProcessId); + DWORD PNP_ReportLogOn( + [in] handle_t hBinding, + [in] BOOL Admin, + [in] DWORD ProcessId); /* Function 6 */ - CONFIGRET PNP_ValidateDeviceInstance(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] DWORD Flags); + DWORD PNP_ValidateDeviceInstance( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulFlags); /* Function 7 */ - CONFIGRET PNP_GetRootDeviceInstance(handle_t BindingHandle, - [out, string, size_is(Length)] wchar_t *DeviceInstance, - [in] DWORD Length); + DWORD PNP_GetRootDeviceInstance( + [in] handle_t hBinding, + [out, string, size_is(ulLength)] LPWSTR pDeviceID, + [in] PNP_RPC_STRING_LEN ulLength); /* Function 8 */ - cpp_quote("#define PNP_DEVICE_PARENT 1") - cpp_quote("#define PNP_DEVICE_CHILD 2") - cpp_quote("#define PNP_DEVICE_SIBLING 3") - CONFIGRET PNP_GetRelatedDeviceInstance(handle_t BindingHandle, - [in] DWORD Relationship, - [in, string] wchar_t *DeviceId, - [out, string, size_is(Length)] wchar_t *RelatedDeviceId, - [in] DWORD Length, - [in] DWORD Flags); + cpp_quote("#define PNP_GET_PARENT_DEVICE_INSTANCE 0x1"); + cpp_quote("#define PNP_GET_CHILD_DEVICE_INSTANCE 0x2"); + cpp_quote("#define PNP_GET_SIBLING_DEVICE_INSTANCE 0x3"); + DWORD PNP_GetRelatedDeviceInstance( + [in] handle_t hBinding, + [in] DWORD ulRelationship, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [out, string, size_is(*pulLength)] LPWSTR pRelatedDeviceId, + [in, out] PNP_RPC_STRING_LEN *pulLength, + [in] DWORD ulFlags); /* Function 9 */ - cpp_quote("#define PNP_BRANCH_ENUM 1") - cpp_quote("#define PNP_BRANCH_CLASS 2") - CONFIGRET PNP_EnumerateSubKeys(handle_t BindingHandle, - [in] DWORD Branch, - [in] DWORD Index, - [out, string, size_is(Length)] wchar_t *Buffer, - [in] DWORD Length, - [out] DWORD *RequiredLength, - [in] DWORD Flags); + cpp_quote("#define PNP_ENUMERATOR_SUBKEYS 0x1"); + cpp_quote("#define PNP_CLASS_SUBKEYS 0x2"); + DWORD PNP_EnumerateSubKeys( + [in] handle_t hBinding, + [in] DWORD ulBranch, + [in] DWORD ulIndex, + [out, string, size_is(ulLength)] LPWSTR Buffer, + [in] PNP_RPC_STRING_LEN ulLength, + [out] PNP_RPC_STRING_LEN *pulRequiredLen, + [in] DWORD ulFlags); /* Function 10 */ -// CONFIGRET PNP_GetDeviceList(handle_t BindingHandle, -// [in, unique, string] wchar_t *Filter, -// [out, string, size_is(*Length)] unsigned char *Buffer -// [in, out] unsigned long *Length, -// [in] DWORD Flags); + DWORD PNP_GetDeviceList( + [in] handle_t hBinding, + [in, string, unique, range(0, PNP_MAX_STRING_LEN)] LPWSTR pszFilter, + [out, size_is(*pulLength), length_is(*pulLength)] LPWSTR Buffer, + [in, out] PNP_RPC_STRING_LEN *pulLength, + [in] DWORD ulFlags); /* Function 11 */ - CONFIGRET PNP_GetDeviceListSize(handle_t BindingHandle, - [in, unique, string] wchar_t *Filter, - [out] unsigned long *Length, - [in] DWORD Flags); + DWORD PNP_GetDeviceListSize( + [in] handle_t hBinding, + [in, string, unique, range(0, PNP_MAX_STRING_LEN)] LPWSTR pszFilter, + [out] PNP_RPC_BUFFER_SIZE *pulLen, + [in] DWORD ulFlags); /* Function 12 */ - CONFIGRET PNP_GetDepth(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [out] unsigned long *Depth, - [in] DWORD Flags); + DWORD PNP_GetDepth( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [out] DWORD *pulDepth, + [in] DWORD ulFlags); /* Function 13 */ - CONFIGRET PNP_GetDeviceRegProp(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] DWORD Property, - [in, out] DWORD *DataType, - [out, size_is(*TransferLen)] char *Buffer, - [in, out] DWORD *TransferLen, - [in, out] DWORD *Length, - [in] DWORD Flags); + DWORD PNP_GetDeviceRegProp( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulProperty, + [in, out] DWORD *pulRegDataType, + [out, size_is(*pulTransferLen), length_is(*pulTransferLen)] BYTE *Buffer, + [in, out] PNP_PROP_SIZE *pulTransferLen, + [in, out] PNP_PROP_SIZE *pulLength, + [in] DWORD ulFlags); /* Function 14 */ - CONFIGRET PNP_SetDeviceRegProp(handle_t BindingHandle, - [in, string] wchar_t *DeviceId, - [in] unsigned long Property, - [in] unsigned long DataType, - [in, size_is(Length)] char *Buffer, - [in] unsigned long Length, - [in] unsigned long Flags); + DWORD PNP_SetDeviceRegProp( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceId, + [in] DWORD ulProperty, + [in] DWORD ulDataType, + [in, size_is(ulLength)] BYTE *Buffer, + [in] PNP_PROP_SIZE ulLength, + [in] DWORD ulFlags); /* Function 15 */ - CONFIGRET PNP_GetClassInstance(handle_t BindingHandle, - [in, string] wchar_t *DeviceId, - [out, string, size_is(Length)] wchar_t *Buffer, - [in] unsigned long Length); + DWORD PNP_GetClassInstance( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceId, + [out, string, size_is(ulLength)] LPWSTR pszClassInstance, + [in] PNP_RPC_STRING_LEN ulLength); /* Function 16 */ - CONFIGRET PNP_CreateKey(handle_t BindingHandle, - [in, string] wchar_t *SubKey, - [in] unsigned long DesiredAccess, - [in] unsigned long Flags); + DWORD PNP_CreateKey( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_CM_PATH)] LPWSTR pszSubKey, + [in] DWORD samDesired, + [in] DWORD ulFlags); /* Function 17 */ - CONFIGRET PNP_DeleteRegistryKey(handle_t BindingHandle, - [in, string] wchar_t *DeviceId, - [in, string] wchar_t *ParentKey, - [in, string] wchar_t *ChildKey, - [in] unsigned long Flags); + DWORD PNP_DeleteRegistryKey( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in, string, ref, range(0, PNP_MAX_CM_PATH)] LPWSTR pszParentKey, + [in, string, ref, range(0, PNP_MAX_CM_PATH)] LPWSTR pszChildKey, + [in] DWORD ulFlags); + + /* Function 18 */ + DWORD PNP_GetClassCount( + [in] handle_t hBinding, + [out] DWORD *pulClassCount, + [in] DWORD ulFlags); /* Function 19 */ - CONFIGRET PNP_GetClassName(handle_t BindingHandle, - [in, string] wchar_t *ClassGuid, - [out, string, size_is(*Length)] wchar_t *Buffer, - [in, out] unsigned long *Length, - [in] unsigned long Flags); + DWORD PNP_GetClassName( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_GUID_STRING_LEN)] LPWSTR pszClassGuid, + [out, string, size_is(*pulLength)] LPWSTR Buffer, + [in, out] PNP_RPC_STRING_LEN *pulLength, + [in] DWORD ulFlags); /* Function 20 */ - CONFIGRET PNP_DeleteClassKey(handle_t BindingHandle, - [in, string] wchar_t *ClassGuid, - [in] unsigned long Flags); + DWORD PNP_DeleteClassKey( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_GUID_STRING_LEN)] LPWSTR pszClassGuid, + [in] DWORD ulFlags); + + /* Function 21 */ + DWORD PNP_GetInterfaceDeviceAlias( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVINTERFACE_LEN)] LPWSTR pszInterfaceDevice, + [in] GUID *AliasInterfaceGuid, + [out, string, size_is(*pulTransferLen)] LPWSTR pszAliasInterfaceDevice, + [in, out] PNP_RPC_STRING_LEN *pulLength, + [in, out] PNP_RPC_STRING_LEN *pulTransferLen, + [in] DWORD ulFlags); + + /* Function 22 */ + DWORD PNP_GetInterfaceDeviceList( + [in] handle_t hBinding, + [in] GUID *InterfaceGuid, + [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [out, size_is(*pulLength), length_is(*pulLength)] BYTE *Buffer, + [in, out] PNP_RPC_BUFFER_SIZE *pulLength, + [in] DWORD ulFlags); + + /* Function 23 */ + DWORD PNP_GetInterfaceDeviceListSize( + [in] handle_t hBinding, + [out] PNP_RPC_BUFFER_SIZE *pulLen, + [in] GUID *InterfaceGuid, + [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in] DWORD ulFlags); + + /* Function 24 */ + DWORD PNP_RegisterDeviceClassAssociation( + [in] handle_t hBinding, + [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in] GUID *InterfaceGuid, + [in, string, unique, range(0, PNP_MAX_STRING_LEN)] LPWSTR pszReference, + [out, string, size_is(*pulTransferLen)] LPWSTR pszSymLink, + [in, out] PNP_RPC_STRING_LEN *pulLength, + [in, out] PNP_RPC_STRING_LEN *pulTransferLen, + [in] DWORD ulFlags); + + /* Function 25 */ + DWORD PNP_UnregisterDeviceClassAssociation( + [in] handle_t hBinding, + [in, string, unique, range(0, PNP_MAX_DEVINTERFACE_LEN)] LPWSTR pszInterfaceDevice, + [in] DWORD ulFlags); + + /* Function 26 */ + DWORD PNP_GetClassRegProp( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_GUID_STRING_LEN)] LPWSTR pszClassGuid, + [in] DWORD ulProperty, + [in, out] DWORD *pulRegDataType, + [out, size_is(*pulTransferLen), length_is(*pulTransferLen)] BYTE *Buffer, + [in, out] PNP_RPC_STRING_LEN *pulTransferLen, + [in, out] PNP_RPC_STRING_LEN *pulLength, + [in] DWORD ulFlags); + + /* Function 27 */ + DWORD PNP_SetClassRegProp( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_GUID_STRING_LEN)] LPWSTR *pszClassGuid, + [in] DWORD ulProperty, + [in] DWORD ulDataType, + [in, size_is(ulLength)] BYTE *Buffer, + [in] PNP_PROP_SIZE ulLength, + [in] DWORD ulFlags); /* Function 28 */ - CONFIGRET PNP_CreateDevInst(handle_t BindingHandle, - [in, out, string, size_is(Length)] wchar_t *DeviceId, - [in, string] wchar_t *ParentDeviceId, - [in] unsigned long Length, - [in] unsigned long Flags); + DWORD PNP_CreateDevInst( + [in] handle_t hBinding, + [in, out, string, size_is(ulLength)] LPWSTR pszDeviceID, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszParentDeviceID, + [in] PNP_RPC_STRING_LEN ulLength, + [in] DWORD ulFlags); /* Function 29 */ - CONFIGRET PNP_DeviceInstanceAction(handle_t BindingHandle, - [in] unsigned long MajorAction, - [in] unsigned long MinorAction, - [in, unique, string] wchar_t *DeviceInstance1, - [in, unique, string] wchar_t *DeviceInstance2); + DWORD PNP_DeviceInstanceAction( + [in] handle_t hBinding, + [in] DWORD ulMajorAction, + [in] DWORD ulMinorAction, + [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceInstance1, + [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceInstance2); /* Function 30 */ - CONFIGRET PNP_GetDeviceStatus(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [out] unsigned long *Status, - [out] unsigned long *Problem, - [in] DWORD Flags); + DWORD PNP_GetDeviceStatus( + [in] handle_t hBinding, + [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [out] DWORD *pulStatus, + [out] DWORD *pulProblem, + [in] DWORD ulFlags); /* Function 31 */ - CONFIGRET PNP_SetDeviceProblem(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] unsigned long Problem, - [in] DWORD Flags); + DWORD PNP_SetDeviceProblem( + [in] handle_t hBinding, + [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulProblem, + [in] DWORD ulFlags); + + /* Function 32 */ + DWORD PNP_DisableDevInst( + [in] handle_t hBinding, + [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, out, unique] PPNP_VETO_TYPE pVetoType, + [in, out, string, unique, size_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, + /* FIXME: should be [in, out, string, unique, max_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, */ + [in] DWORD ulNameLength, + [in] DWORD ulFlags); /* Function 33 */ - CONFIGRET PNP_UninstallDevInst(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] DWORD Flags); + DWORD PNP_UninstallDevInst( + [in] handle_t hBinding, + [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulFlags); /* Function 34 */ - CONFIGRET PNP_AddID(handle_t BindingHandle, - [in, string, unique] wchar_t *DeviceInstance, - [in, string] wchar_t *DeviceId, - [in] DWORD Flags); + DWORD PNP_AddID( + [in] handle_t hBinding, + [in, string, unique, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszID, + [in] DWORD ulFlags); + + /* Function 35 */ + DWORD PNP_RegisterDriver( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in] DWORD ulFlags); + + /* Function 36 */ + DWORD PNP_QueryRemove( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in, out, unique] PPNP_VETO_TYPE pVetoType, + [in, out, string, unique, size_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, + /* FIXME: should be [in, out, string, unique, max_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, */ + [in] DWORD ulNameLength, + [in] DWORD ulFlags); + + /* Function 37 */ + DWORD PNP_RequestDeviceEject( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pszDeviceID, + [in, out, unique] PPNP_VETO_TYPE pVetoType, + [in, out, string, unique, size_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, + /* FIXME: should be [in, out, string, unique, max_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, */ + [in] DWORD ulNameLength, + [in] DWORD ulFlags); /* Function 38 */ - CONFIGRET PNP_IsDockStationPresent(handle_t BindingHandle, - [out]PBOOL Present); + DWORD PNP_IsDockStationPresent( + [in] handle_t hBinding, + [in, out, unique] BOOL *Present); /* Function 39 */ - CONFIGRET PNP_RequestEjectPC(handle_t BindingHandle); + DWORD PNP_RequestEjectPC( + [in] handle_t hBinding); /* Function 40 */ - cpp_quote("#define PNP_SET_HW_PROFILE_FLAGS 0") - cpp_quote("#define PNP_GET_HW_PROFILE_FLAGS 1") - CONFIGRET PNP_HwProfFlags(handle_t BindingHandle, - [in] DWORD Action, - [in, string] wchar_t *DeviceId, - [in] DWORD ProfileId, - [in, out] DWORD *Value, - [in] DWORD Flags); + cpp_quote("#define PNP_GET_HWPROFFLAGS 0x1"); + cpp_quote("#define PNP_SET_HWPROFFLAGS 0x2"); + DWORD PNP_HwProfFlags( + [in] handle_t hBinding, + [in] DWORD ulAction, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulConfig, + [in, out] DWORD *pulValue, + [in, out, unique] PPNP_VETO_TYPE pVetoType, + [in, out, string, unique, size_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, + /* FIXME: should be [in, out, string, unique, max_is(ulNameLength), range(0, PNP_MAX_STRING_LEN)] LPWSTR pszVetoName, */ + [in] DWORD ulNameLength, + [in] DWORD ulFlags); + + /* Function 41 */ + DWORD PNP_GetHwProfInfo( + [in] handle_t hBinding, + [in] DWORD ulIndex, + [in, out, ref] HWPROFILEINFO *pHWProfileInfo, + [in, range(0, 168)] DWORD ulProfileInfoSize, + /* FIXME: should be [in, range(0, sizeof(HWPROFILEINFO))] DWORD ulProfileInfoSize, */ + [in] DWORD ulFlags); /* Function 42 */ - CONFIGRET PNP_AddEmptyLogConf(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] ULONG ulPriority, - [out] ULONG *pulLogConfTag, - [in] ULONG ulFlags); + DWORD PNP_AddEmptyLogConf( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulPriority, + [out] DWORD *pulLogConfTag, + [in] DWORD ulFlags); /* Function 43 */ - CONFIGRET PNP_FreeLogConf(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] ULONG ulType, - [in] ULONG ulLogConfTag, - [in] ULONG ulFlags); + DWORD PNP_FreeLogConf( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulLogConfType, + [in] DWORD ulLogConfTag, + [in] DWORD ulFlags); /* Function 44 */ - CONFIGRET PNP_GetFirstLogConf(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] ULONG ulPriority, - [out] ULONG *pulLogConfTag, - [in] ULONG ulFlags); + DWORD PNP_GetFirstLogConf( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulLogConfType, + [out] DWORD *pulLogConfTag, + [in] DWORD ulFlags); /* Function 45 */ - CONFIGRET PNP_GetNextLogConf(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] ULONG ulLogConfType, - [in] ULONG ulCurrentTag, - [out] ULONG *pulNextTag, - [in] ULONG ulFlags); + DWORD PNP_GetNextLogConf( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulLogConfType, + [in] DWORD ulCurrentTag, + [out] DWORD *pulNextTag, + [in] DWORD ulFlags); /* Function 46 */ - CONFIGRET PNP_GetLogConfPriority(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] ULONG ulLogConfType, - [in] ULONG ulCurrentTag, - [out] ULONG *pPriority, - [in] ULONG ulFlags); + DWORD PNP_GetLogConfPriority( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulType, + [in] DWORD ulTag, + [out] DWORD *pPriority, + [in] DWORD ulFlags); + + /* Function 47 */ + DWORD PNP_AddResDes( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulLogConfTag, + [in] DWORD ulLogConfType, + [in] RESOURCEID ResourceID, + [out] DWORD *pulResourceTag, + [in, size_is(ResourceLen)] BYTE *ResourceData, + [in] PNP_RPC_BUFFER_SIZE ResourceLen, + [in] DWORD ulFlags); + + /* Function 48 */ + DWORD PNP_FreeResDes( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulLogConfTag, + [in] DWORD ulLogConfType, + [in] RESOURCEID ResourceID, + [in] DWORD ulResourceTag, + [out] DWORD *pulPreviousResType, + [out] DWORD *pulPreviousResTag, + [in] DWORD ulFlags); + + /* Function 49 */ + DWORD PNP_GetNextResDes( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulLogConfTag, + [in] DWORD ulLogConfType, + [in] RESOURCEID ResourceID, + [in] DWORD ulResourceTag, + [out] DWORD *pulNextResType, + [out] DWORD *pulNextResTag, + [in] DWORD ulFlags); + + /* Function 50 */ + DWORD PNP_GetResDesData( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulLogConfTag, + [in] DWORD ulLogConfType, + [in] RESOURCEID ResourceID, + [in] DWORD ulResourceTag, + [out, size_is(BufferLen)] BYTE *Buffer, + [in] PNP_RPC_BUFFER_SIZE BufferLen, + [in] DWORD ulFlags); + + /* Function 51 */ + DWORD PNP_GetResDesDataSize( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulLogConfTag, + [in] DWORD ulLogConfType, + [in] RESOURCEID ResourceID, + [in] DWORD ulResourceTag, + [out] DWORD *pulSize, + [in] DWORD ulFlags); + + /* Function 52 */ + DWORD PNP_ModifyResDes( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] DWORD ulLogConfTag, + [in] DWORD ulLogConfType, + [in] RESOURCEID CurrentResourceID, + [in] RESOURCEID NewResourceID, + [in] DWORD ulResourceTag, + [in, size_is(ResourceLen)] BYTE *ResourceData, + [in] PNP_RPC_BUFFER_SIZE ResourceLen, + [in] DWORD ulFlags); + + /* Function 53 */ + DWORD PNP_DetectResourceConflict( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] RESOURCEID ResourceID, + [in, size_is(ResourceLen)] BYTE *ResourceData, + [in] PNP_RPC_BUFFER_SIZE ResourceLen, + [out] BOOL *pbConflictDetected, + [in] DWORD ulFlags); + + /* Function 54 */ + DWORD PNP_QueryResConfList( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in] RESOURCEID ResourceID, + [in, size_is(ResourceLen)] BYTE *ResourceData, + [in] PNP_RPC_BUFFER_SIZE ResourceLen, + [out, size_is(BufferLen)] BYTE *Buffer, + [in] PNP_RPC_BUFFER_SIZE BufferLen, + [in] DWORD ulFlags); + + /* Function 55 */ + DWORD PNP_Function55( + [in] handle_t hBinding); + + /* Function 56 */ + DWORD PNP_Function56( + [in] handle_t hBinding); + + /* Function 57 */ + DWORD PNP_Function57( + [in] handle_t hBinding); /* Function 58 */ - CONFIGRET PNP_RunDetection(handle_t BindingHandle, - [in] unsigned long Flags); + DWORD PNP_RunDetection( + [in] handle_t hBinding, + [in] DWORD ulFlags); + + /* Function 59 */ + DWORD PNP_Function59( + [in] handle_t hBinding); + + /* Function 60 */ + DWORD PNP_Function60( + [in] handle_t hBinding); + + /* Function 61 */ + DWORD PNP_GetCustomDevProp( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_DEVICE_ID_LEN)] LPWSTR pDeviceID, + [in, string, ref, range(0, PNP_MAX_STRING_LEN)] LPWSTR CustomPropName, + [out] DWORD *pulRegDataType, + [out, size_is(*pulLength), length_is(*pulTransferLen)] BYTE *Buffer, + [out] PNP_RPC_STRING_LEN *pulTransferLen, + [in, out] PNP_RPC_STRING_LEN *pulLength, + [in] DWORD ulFlags); + + /* Function 62 */ + DWORD PNP_GetVersionInternal( + [in] handle_t hBinding, + [in, out] WORD *pwVersion); + + /* Function 63 */ + DWORD PNP_GetBlockedDriverInfo( + [in] handle_t hBinding, + [out, size_is(*pulLength), length_is(*pulTransferLen)] BYTE *Buffer, + [out] PNP_RPC_BUFFER_SIZE *pulTransferLen, + [in, out] PNP_RPC_BUFFER_SIZE *pulLength, + [in] DWORD ulFlags); + + /* Function 64 */ + DWORD PNP_GetServerSideDeviceInstallFlags( + [in] handle_t hBinding, + [out] DWORD *pulSSDIFlags, + [in] DWORD ulFlags); + + /* Function 65 */ + DWORD PNP_GetObjectPropKeys( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_STRING_LEN)] LPWSTR ObjectName, + [in] DWORD ObjectType, + [in, string, unique, range(0, PNP_MAX_CULTURE_NAME_LEN)] LPWSTR PropertyCultureName, + [in, out] PNP_PROP_COUNT *PropertyCount, + [out] PNP_PROP_COUNT *TransferLen, + [out, size_is(*PropertyCount), length_is(*TransferLen)] DEVPROPKEY *PropertyKeys, + [in] DWORD Flags); + + /* Function 66 */ + DWORD PNP_GetObjectProp( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_STRING_LEN)] LPWSTR ObjectName, + [in] DWORD ObjectType, + [in, string, unique, range(0, PNP_MAX_CULTURE_NAME_LEN)] LPWSTR PropertyCultureName, + [in] const DEVPROPKEY *PropertyKey, + [out] DEVPROPTYPE *PropertyType, + [in, out] PNP_PROP_SIZE *PropertySize, + [out] PNP_PROP_SIZE *TransferLen, + [out, size_is(*PropertySize), length_is(*TransferLen)] BYTE *PropertyBuffer, + [in] DWORD Flags); + + /* Function 67 */ + DWORD PNP_SetObjectProp( + [in] handle_t hBinding, + [in, string, ref, range(0, PNP_MAX_STRING_LEN)] LPWSTR ObjectName, + [in] DWORD ObjectType, + [in, string, unique, range(0, PNP_MAX_CULTURE_NAME_LEN)] LPWSTR PropertyCultureName, + [in] const DEVPROPKEY *PropertyKey, + [in] DEVPROPTYPE PropertyType, + [in] PNP_PROP_SIZE PropertySize, + [in, unique, size_is(PropertySize)] BYTE *PropertyBuffer, + [in] DWORD Flags); }

1 0

[jimtabor] 32947: Add the start of server information structure.
by jimtabor＠svn.reactos.org 14 Apr '08

14 Apr '08

Author: jimtabor Date: Mon Apr 14 05:16:56 2008 New Revision: 32947 URL: http://svn.reactos.org/svn/reactos?rev=32947&view=rev Log: Add the start of server information structure. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Apr 14 05:16:56 2008 @@ -167,6 +167,12 @@ UINT HideAccel : 1; } WINDOW, *PWINDOW; +typedef struct _SERVERINFO +{ + DWORD SrvEventActivity; + +} SERVERINFO, *PSERVERINFO; + typedef struct _W32PROCESSINFO { PVOID UserHandleTable; @@ -178,6 +184,8 @@ PWINDOWCLASS SystemClassList; UINT RegisteredSysClasses : 1; + + PSERVERINFO psi; } W32PROCESSINFO, *PW32PROCESSINFO;

1 0

[dchapyshev] 32946: - Update headers
by dchapyshev＠svn.reactos.org 13 Apr '08

13 Apr '08

Author: dchapyshev Date: Sun Apr 13 13:21:20 2008 New Revision: 32946 URL: http://svn.reactos.org/svn/reactos?rev=32946&view=rev Log: - Update headers Added: trunk/reactos/include/dxsdk/qedit.idl (with props) Modified: trunk/reactos/include/dxsdk/aviriff.h trunk/reactos/include/dxsdk/dxsdk.rbuild trunk/reactos/include/dxsdk/ksuuids.h trunk/reactos/include/dxsdk/uuids.h trunk/reactos/include/psdk/mmsystem.h trunk/reactos/include/psdk/shlwapi.h trunk/reactos/include/reactos/wine/mmreg.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/dxsdk/aviriff.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/aviriff.h?re… Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… Modified: trunk/reactos/include/dxsdk/ksuuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ksuuids.h?re… Added: trunk/reactos/include/dxsdk/qedit.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/qedit.idl?re… Modified: trunk/reactos/include/dxsdk/uuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/uuids.h?rev=… Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… Modified: trunk/reactos/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev… Modified: trunk/reactos/include/reactos/wine/mmreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mmreg…

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2008