Ros-diffs

ros-diffs@reactos.org

81390 discussions

[chorns] 16608: Prepare cmd for testing
by chorns＠svn.reactos.com 17 Jul '05

17 Jul '05

Prepare cmd for testing Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.xml Added: trunk/reactos/subsys/system/cmd/main.c Added: trunk/reactos/subsys/system/cmd/tests/ Added: trunk/reactos/subsys/system/cmd/tests/cmd_test.xml Added: trunk/reactos/subsys/system/cmd/tests/setup.c Added: trunk/reactos/subsys/system/cmd/tests/stubs.xml _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-17 10:40:43 UTC (rev 16607) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-17 10:57:38 UTC (rev 16608) @@ -1528,9 +1528,9 @@ * main function */ #ifdef _UNICODE -int main(void) +int _main(void) #else -int main (int argc, char *argv[]) +int _main (int argc, char *argv[]) #endif { CONSOLE_SCREEN_BUFFER_INFO Info; _____ Modified: trunk/reactos/subsys/system/cmd/cmd.xml --- trunk/reactos/subsys/system/cmd/cmd.xml 2005-07-17 10:40:43 UTC (rev 16607) +++ trunk/reactos/subsys/system/cmd/cmd.xml 2005-07-17 10:57:38 UTC (rev 16608) @@ -1,10 +1,9 @@ -<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" usewrc="false"> +<module name="cmd_base" type="objectlibrary"> <include base="ReactOS">include/wine</include> - <include base="cmd">.</include> + <include base="cmd_base">.</include> <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> - <library>kernel32</library> <pch>precomp.h</pch> <file>alias.c</file> <file>attrib.c</file> @@ -59,5 +58,18 @@ <file>vol.c</file> <file>where.c</file> <file>window.c</file> +</module> +<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" usewrc="false"> + <include base="ReactOS">include/wine</include> + <include base="cmd">.</include> + <define name="__USE_W32API" /> + <define name="ANONYMOUSUNIONS" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>cmd_base</library> + <file>main.c</file> <file>cmd.rc</file> </module> +<directory name="tests"> + <xi:include href="tests/cmd_test.xml" /> +</directory> _____ Added: trunk/reactos/subsys/system/cmd/main.c --- trunk/reactos/subsys/system/cmd/main.c 2005-07-17 10:40:43 UTC (rev 16607) +++ trunk/reactos/subsys/system/cmd/main.c 2005-07-17 10:57:38 UTC (rev 16608) @@ -0,0 +1,26 @@ +#include <precomp.h> +#include "resource.h" + +#ifdef _UNICODE +extern int _main (void); +#else +extern int _main (int argc, char *argv[]); +#endif + +/* + * main function + */ +#ifdef _UNICODE +int main(void) +#else +int main (int argc, char *argv[]) +#endif +{ +#ifdef _UNICODE + return _main(void); +#else + return _main(argc, argv); +#endif +} + +/* EOF */ Property changes on: trunk/reactos/subsys/system/cmd/main.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/cmd/tests/cmd_test.xml --- trunk/reactos/subsys/system/cmd/tests/cmd_test.xml 2005-07-17 10:40:43 UTC (rev 16607) +++ trunk/reactos/subsys/system/cmd/tests/cmd_test.xml 2005-07-17 10:57:38 UTC (rev 16608) @@ -0,0 +1,15 @@ +<module name="cmd_test" type="test"> + <include base="rtshared">.</include> + <include base="ReactOS">include/wine</include> + <include base="cmd">.</include> + <define name="__USE_W32API" /> + <define name="ANONYMOUSUNIONS" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>rtshared</library> + <library>regtests</library> + <library>cmd_base</library> + <library>pseh</library> + <library>ntdll</library> + <file>setup.c</file> + <xi:include href="stubs.xml" /> +</module> Property changes on: trunk/reactos/subsys/system/cmd/tests/cmd_test.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/cmd/tests/setup.c --- trunk/reactos/subsys/system/cmd/tests/setup.c 2005-07-17 10:40:43 UTC (rev 16607) +++ trunk/reactos/subsys/system/cmd/tests/setup.c 2005-07-17 10:57:38 UTC (rev 16608) @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include <windows.h> +#include "regtests.h" + +_SetupOnce() +{ +} Property changes on: trunk/reactos/subsys/system/cmd/tests/setup.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/cmd/tests/stubs.xml --- trunk/reactos/subsys/system/cmd/tests/stubs.xml 2005-07-17 10:40:43 UTC (rev 16607) +++ trunk/reactos/subsys/system/cmd/tests/stubs.xml 2005-07-17 10:57:38 UTC (rev 16608) @@ -0,0 +1,84 @@ +<component name="kernel32.dll"> + <symbol>FindFirstFileA@8</symbol> + <symbol>GetLastError@0</symbol> + <symbol>FindNextFileA@8</symbol> + <symbol>FindClose@4</symbol> + <symbol>GetFileAttributesA@4</symbol> + <symbol>GetCurrentDirectoryA@8</symbol> + <symbol>GetFullPathNameA@16</symbol> + <symbol>CloseHandle@4</symbol> + <symbol>CreateFileA@28</symbol> + <symbol>Beep@8</symbol> + <symbol>LoadStringA@16</symbol> + <symbol>SetConsoleCP@4</symbol> + <symbol>SetConsoleOutputCP@4</symbol> + <symbol>WaitForSingleObject@8</symbol> + <symbol>ReadConsoleInputA@16</symbol> + <symbol>GetTickCount@0</symbol> + <symbol>GetConsoleScreenBufferInfo@8</symbol> + <symbol>FillConsoleOutputAttribute@20</symbol> + <symbol>FillConsoleOutputCharacterA@20</symbol> + <symbol>SetConsoleCursorPosition@8</symbol> + <symbol>LoadLibraryA@4</symbol> + <symbol>GetProcAddress@8</symbol> + <symbol>SetCurrentDirectoryA@4</symbol> + <symbol>SetConsoleMode@8</symbol> + <symbol>CreateProcessA@40</symbol> + <symbol>GetExitCodeProcess@8</symbol> + <symbol>GetConsoleOutputCP@0</symbol> + <symbol>GetTempPathA@8</symbol> + <symbol>GetTempFileNameA@16</symbol> + <symbol>GetCurrentProcess@0</symbol> + <symbol>DuplicateHandle@28</symbol> + <symbol>GetFileType@4</symbol> + <symbol>SetFilePointer@16</symbol> + <symbol>GetTimeFormatA@24</symbol> + <symbol>GetDateFormatA@24</symbol> + <symbol>GetEnvironmentVariableA@12</symbol> + <symbol>GenerateConsoleCtrlEvent@8</symbol> + <symbol>SetConsoleCtrlHandler@8</symbol> + <symbol>GetVersionExA@4</symbol> + <symbol>ExitProcess@4</symbol> + <symbol>GetModuleFileNameA@12</symbol> + <symbol>SetEnvironmentVariableA@8</symbol> + <symbol>SetConsoleTextAttribute@8</symbol> + <symbol>FlushConsoleInputBuffer@4</symbol> + <symbol>WriteFile@20</symbol> + <symbol>FormatMessageA@28</symbol> + <symbol>LocalFree@4</symbol> + <symbol>GetConsoleCP@0</symbol> + <symbol>GetStdHandle@4</symbol> + <symbol>FreeLibrary@4</symbol> + <symbol>SetLastError@4</symbol> + <symbol>SetStdHandle@8</symbol> + <symbol>DeleteFileA@4</symbol> + <symbol>FileTimeToLocalFileTime@8</symbol> + <symbol>GetVolumeInformationA@32</symbol> + <symbol>RemoveDirectoryA@4</symbol> + <symbol>CreateDirectoryA@8</symbol> + <symbol>GetLocaleInfoA@16</symbol> + <symbol>GlobalMemoryStatus@4</symbol> + <symbol>GetEnvironmentStrings@0</symbol> + <symbol>FreeEnvironmentStringsA@4</symbol> + <symbol>LocalFree</symbol> + <symbol>SetLocalTime@4</symbol> + <symbol>GetLocalTime@4</symbol> + <symbol>SetFileAttributesA@8</symbol> + <symbol>SetFileApisToOEM@0</symbol> + <symbol>GetConsoleMode@8</symbol> + <symbol>SetConsoleCursorInfo@8</symbol> + <symbol>ReadFile@20</symbol> + <symbol>SetFileTime@16</symbol> + <symbol>FileTimeToSystemTime@8</symbol> + <symbol>GetDiskFreeSpaceA@20</symbol> + <symbol>SetVolumeLabelA@8</symbol> + <symbol>SetConsoleTitleA@4</symbol> + <symbol>MoveFileExA@12</symbol> + <symbol>GetFileTime@16</symbol> + <symbol>Sleep@4</symbol> + <symbol>MoveFileA@8</symbol> + <symbol>CreateSemaphoreA@16</symbol> + <symbol>InterlockedIncrement@4</symbol> + <symbol>InterlockedDecrement@4</symbol> + <symbol>ReleaseSemaphore@12</symbol> +</component> Property changes on: trunk/reactos/subsys/system/cmd/tests/stubs.xml ___________________________________________________________________ Name: svn:eol-style + native

1 0

[mf] 16607: add explorer-ro.rc
by mf＠svn.reactos.com 17 Jul '05

17 Jul '05

add explorer-ro.rc Modified: trunk/reactos/subsys/system/explorer/explorer.dsp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.dsp --- trunk/reactos/subsys/system/explorer/explorer.dsp 2005-07-17 10:39:01 UTC (rev 16606) +++ trunk/reactos/subsys/system/explorer/explorer.dsp 2005-07-17 10:40:43 UTC (rev 16607) @@ -436,6 +436,11 @@ # End Source File # Begin Source File +SOURCE=".\explorer-ro.rc" +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + SOURCE=".\explorer-ru.rc" # PROP Exclude_From_Build 1 # End Source File

1 0

[mf] 16606: ignore logfile
by mf＠svn.reactos.com 17 Jul '05

17 Jul '05

ignore logfile Property changes on: trunk/rosapps/packmgr/gui ___________________________________________________________________ Name: svn:ignore - *.d *.a *.o *.dll *.exe *.coff *.map + *.d *.a *.o *.dll *.exe *.coff *.map logfile.html

1 0

[chorns] 16605: Fix building of tests
by chorns＠svn.reactos.com 17 Jul '05

17 Jul '05

Fix building of tests Modified: trunk/reactos/lib/kernel32/tests/setup.c Modified: trunk/reactos/subsys/win32k/tests/stubs.xml Modified: trunk/reactos/subsys/win32k/tests/win32k.xml Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp _____ Modified: trunk/reactos/lib/kernel32/tests/setup.c --- trunk/reactos/lib/kernel32/tests/setup.c 2005-07-17 09:56:38 UTC (rev 16604) +++ trunk/reactos/lib/kernel32/tests/setup.c 2005-07-17 10:20:18 UTC (rev 16605) @@ -1,6 +1,12 @@ #include <windows.h> #include "regtests.h" +int +mainCRTStartup(int argc, char *argv[]) +{ + return WinMain(NULL, NULL, NULL, 0); +} + _SetupOnce() { } _____ Modified: trunk/reactos/subsys/win32k/tests/stubs.xml --- trunk/reactos/subsys/win32k/tests/stubs.xml 2005-07-17 09:56:38 UTC (rev 16604) +++ trunk/reactos/subsys/win32k/tests/stubs.xml 2005-07-17 10:20:18 UTC (rev 16605) @@ -138,6 +138,16 @@ <symbol>IoDeviceObjectType</symbol> <symbol>@KfReleaseSpinLock@8</symbol> <symbol>@KfAcquireSpinLock@4</symbol> + <symbol>KeEnterCriticalRegion@0</symbol> + <symbol>KeLeaveCriticalRegion@0</symbol> + <symbol>KeGetCurrentIrql@0</symbol> + <symbol>ExFreePoolWithTag@8</symbol> + <symbol>PsGetProcessWin32Process@4</symbol> + <symbol>ObFindHandleForObject@20</symbol> + <symbol>PsSetProcessWin32Process@8</symbol> + <symbol>PsGetThreadWin32Thread@4</symbol> + <symbol>PsEstablishWin32Callouts@4</symbol> + <symbol>PsSetThreadWin32Thread@8</symbol> </component> <component name="freetype.dll"> <symbol>FT_Init_FreeType</symbol> _____ Modified: trunk/reactos/subsys/win32k/tests/win32k.xml --- trunk/reactos/subsys/win32k/tests/win32k.xml 2005-07-17 09:56:38 UTC (rev 16604) +++ trunk/reactos/subsys/win32k/tests/win32k.xml 2005-07-17 10:20:18 UTC (rev 16605) @@ -2,11 +2,12 @@ <include base="rtshared">.</include> <include base="win32k">.</include> <include base="win32k">include</include> + <include base="ntoskrnl">include</include> + <include base="freetype">include</include> <define name="UNICODE" /> <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0501</define> <define name="WINVER">0x600</define> - <define name="_DISABLE_TIDENTS" /> <define name="_SEH_NO_NATIVE_NLG" /> <define name="_WIN32K_" /> <library>rtshared</library> @@ -14,10 +15,6 @@ <library>win32k_base</library> <library>pseh</library> <library>rosrtl</library> - <library>msvcrt</library> - <linkerflag>-lgcc</linkerflag> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> <directory name="tests"> <file>DIB_24BPP_ColorFill-performance.c</file> </directory> _____ Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp --- trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-07-17 09:56:38 UTC (rev 16604) +++ trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-07-17 10:20:18 UTC (rev 16605) @@ -376,8 +376,9 @@ s = s + sprintf ( s, "}\n" ); s = s + sprintf ( s, "\n" ); s = s + sprintf ( s, "int\n" ); - s = s + sprintf ( s, "mainCRTStartup(HANDLE hInstance,\n" ); - s = s + sprintf ( s, " HANDLE hPrevInstance,\n" ); + s = s + sprintf ( s, "STDCALL\n" ); + s = s + sprintf ( s, "WinMain(HINSTANCE hInstance,\n" ); + s = s + sprintf ( s, " HINSTANCE hPrevInstance,\n" ); s = s + sprintf ( s, " LPSTR lpszCmdParam,\n" ); s = s + sprintf ( s, " int nCmdShow)\n" ); s = s + sprintf ( s, "{\n" );

1 0

[mf] 16604: remove winfile - it's superseded by winefile.
by mf＠svn.reactos.com 17 Jul '05

17 Jul '05

remove winfile - it's superseded by winefile. Modified: trunk/rosapps/directory.xml Deleted: trunk/rosapps/winfile/ _____ Modified: trunk/rosapps/directory.xml --- trunk/rosapps/directory.xml 2005-07-17 09:43:54 UTC (rev 16603) +++ trunk/rosapps/directory.xml 2005-07-17 09:56:38 UTC (rev 16604) @@ -50,6 +50,3 @@ <xi:include href="welcome/welcome.xml" /> </directory> --> -<directory name="winfile"> - <xi:include href="winfile/winfile.xml" /> -</directory>

1 0

[ekohl] 16603: - Implement CM_Locate_DevNode_ExW, CM_Get_Device_ID_Size[_Ex] and CM_Get_Device_ID[_Ex]W.
by ekohl＠svn.reactos.com 17 Jul '05

17 Jul '05

- Implement CM_Locate_DevNode_ExW, CM_Get_Device_ID_Size[_Ex] and CM_Get_Device_ID[_Ex]W. - Add flags for CM_Get_Global_State[_Ex]. Modified: trunk/reactos/include/idl/pnp.idl Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/rpc.c Modified: trunk/reactos/lib/setupapi/rpc_private.h Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/ddk/cfg.h Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/include/idl/pnp.idl --- trunk/reactos/include/idl/pnp.idl 2005-07-17 07:02:20 UTC (rev 16602) +++ trunk/reactos/include/idl/pnp.idl 2005-07-17 09:43:54 UTC (rev 16603) @@ -21,7 +21,7 @@ [out] unsigned long *State, [in] unsigned long Flags); -// CONFIGRET PNP_GetRootDeviceInstance(handle_t BindingHandle, -// [out, string, size_is(Length)] wchar_t *DeviceInstance, -// [in] DWORD Length); + CONFIGRET PNP_ValidateDeviceInstance(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] DWORD Flags); } _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-07-17 07:02:20 UTC (rev 16602) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-07-17 09:43:54 UTC (rev 16603) @@ -81,6 +81,12 @@ CONFIGRET WINAPI CM_Enumerate_Classes_Ex( ULONG, LPGUID, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Child( PDEVINST, DEVINST, ULONG ); CONFIGRET WINAPI CM_Get_Child_Ex( PDEVINST, DEVINST, ULONG, HMACHINE ); +CONFIGRET WINAPI CM_Get_Device_IDA( DEVINST, PCHAR, ULONG, ULONG ); +CONFIGRET WINAPI CM_Get_Device_IDW( DEVINST, PWCHAR, ULONG, ULONG ); +#define CM_Get_Device_ID WINELIB_NAME_AW(CM_Get_Device_ID) +CONFIGRET WINAPI CM_Get_Device_ID_ExW( DEVINST, PWCHAR, ULONG, ULONG, HMACHINE ); +CONFIGRET WINAPI CM_Get_Device_ID_ExA( DEVINST, PCHAR, ULONG, ULONG, HMACHINE ); +#define CM_Get_Device_ID_Ex WINELIB_NAME_AW(CM_Get_Device_ID_Ex) CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR, PCHAR, ULONG, ULONG ); CONFIGRET WINAPI CM_Get_Device_ID_ListW( PCWSTR, PWCHAR, ULONG, ULONG ); #define CM_Get_Device_ID_List WINELIB_NAME_AW(CM_Get_Device_ID_List) @@ -93,6 +99,8 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExA( PULONG, PCSTR, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExW( PULONG, PCWSTR, ULONG, HMACHINE ); #define CM_Get_Device_ID_List_Size_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Size_Ex) +CONFIGRET WINAPI CM_Get_Device_ID_Size( PULONG, DEVINST, ULONG ); +CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex( PULONG, DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Global_State( PULONG, ULONG ); CONFIGRET WINAPI CM_Get_Global_State_Ex( PULONG, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Get_Parent( PDEVINST, DEVINST, ULONG ); _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-17 07:02:20 UTC (rev 16602) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-07-17 09:43:54 UTC (rev 16603) @@ -49,7 +49,9 @@ typedef struct _MACHINE_INFO { - RPC_BINDING_HANDLE BindingHandle; + WCHAR szMachineName[MAX_PATH]; + RPC_BINDING_HANDLE BindingHandle; + HSTRING_TABLE StringTable; } MACHINE_INFO, *PMACHINE_INFO; @@ -86,13 +88,25 @@ TRACE("%s %p\n", debugstr_w(UNCServerName), phMachine); - pMachine = (PMACHINE_INFO)GlobalAlloc(GPTR, sizeof(MACHINE_INFO)); + pMachine = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MACHINE_INFO)); if (pMachine == NULL) return CR_OUT_OF_MEMORY; + lstrcpyW(pMachine->szMachineName, UNCServerName); + + pMachine->StringTable = StringTableInitialize(); + if (pMachine->StringTable == NULL) + { + HeapFree(GetProcessHeap(), 0, pMachine); + return CR_FAILURE; + } + + StringTableAddString(pMachine->StringTable, L"PLT", 1); + if (!PnpBindRpc(UNCServerName, &pMachine->BindingHandle)) { - GlobalFree(pMachine); + StringTableDestroy(pMachine->StringTable); + HeapFree(GetProcessHeap(), 0, pMachine); return CR_INVALID_MACHINENAME; } @@ -111,14 +125,17 @@ TRACE("%lx\n", hMachine); - if (hMachine == NULL) + pMachine = (PMACHINE_INFO)hMachine; + if (pMachine == NULL) return CR_SUCCESS; - pMachine = (PMACHINE_INFO)hMachine; + if (pMachine->StringTable != NULL) + StringTableDestroy(pMachine->StringTable); + if (!PnpUnbindRpc(pMachine->BindingHandle)) return CR_ACCESS_DENIED; - GlobalFree(pMachine); + HeapFree(GetProcessHeap(), 0, pMachine); return CR_SUCCESS; } @@ -240,10 +257,84 @@ /*********************************************************************** + * CM_Get_Device_IDA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_IDA( + DEVINST dnDevInst, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags) +{ + TRACE("%lx %p %ld %ld\n", + dnDevInst, Buffer, BufferLen, ulFlags); + return CM_Get_Device_ID_ExA(dnDevInst, Buffer, BufferLen, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Get_Device_IDW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_IDW( + DEVINST dnDevInst, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags) +{ + TRACE("%lx %p %ld %ld\n", + dnDevInst, Buffer, BufferLen, ulFlags); + return CM_Get_Device_ID_ExW(dnDevInst, Buffer, BufferLen, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Get_Device_ID_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_ExA( + DEVINST dnDevInst, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags, + HMACHINE hMachine) +{ + FIXME("%lx %p %ld %ld %lx\n", + dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Get_Device_ID_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_ExW( + DEVINST dnDevInst, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags, + HMACHINE hMachine) +{ + HSTRING_TABLE StringTable = NULL; + + TRACE("%lx %p %ld %ld %lx\n", + dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + + if (hMachine != NULL) + { + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(NULL, &StringTable)) + return CR_FAILURE; + } + + if (!StringTableStringFromIdEx(StringTable, + dnDevInst, + Buffer, + &BufferLen)) + { + return CR_FAILURE; + } + + return CR_SUCCESS; +} + + +/********************************************************************** * * CM_Get_Device_ID_ListA [SETUPAPI.@] */ CONFIGRET WINAPI CM_Get_Device_ID_ListA( - PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) + PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags) { TRACE("%p %p %ld %ld\n", pszFilter, Buffer, BufferLen, ulFlags); return CM_Get_Device_ID_List_ExA(pszFilter, Buffer, BufferLen, @@ -255,7 +346,7 @@ * CM_Get_Device_ID_ListW [SETUPAPI.@] */ CONFIGRET WINAPI CM_Get_Device_ID_ListW( - PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) + PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags) { TRACE("%p %p %ld %ld\n", pszFilter, Buffer, BufferLen, ulFlags); return CM_Get_Device_ID_List_ExW(pszFilter, Buffer, BufferLen, @@ -268,7 +359,7 @@ */ CONFIGRET WINAPI CM_Get_Device_ID_List_ExA( PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags, - HMACHINE hMachine ) + HMACHINE hMachine) { FIXME("%p %p %ld %ld %lx\n", pszFilter, Buffer, BufferLen, ulFlags, hMachine); @@ -282,7 +373,7 @@ */ CONFIGRET WINAPI CM_Get_Device_ID_List_ExW( PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags, - HMACHINE hMachine ) + HMACHINE hMachine) { FIXME("%p %p %ld %ld %lx\n", pszFilter, Buffer, BufferLen, ulFlags, hMachine); @@ -338,6 +429,53 @@ /*********************************************************************** + * CM_Get_Device_ID_Size [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_Size( + PULONG pulLen, DEVINST dnDevInst, ULONG ulFlags) +{ + TRACE("%p %p %lx\n", pulLen, dnDevInst, ulFlags); + return CM_Get_Device_ID_Size_Ex(pulLen, dnDevInst, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Get_Device_ID_Size_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex( + PULONG pulLen, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +{ + HSTRING_TABLE StringTable = NULL; + LPWSTR DeviceId; + + TRACE("%p %p %lx %lx\n", pulLen, dnDevInst, ulFlags, hMachine); + + if (hMachine != NULL) + { + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(NULL, &StringTable)) + return CR_FAILURE; + } + + DeviceId = StringTableStringFromId(StringTable, dnDevInst); + if (DeviceId == NULL) + { + *pulLen = 0; + return CR_SUCCESS; + } + + *pulLen = lstrlenW(DeviceId); + + return CR_SUCCESS; +} + + +/********************************************************************** * * CM_Get_Global_State [SETUPAPI.@] */ CONFIGRET WINAPI CM_Get_Global_State( @@ -355,7 +493,6 @@ PULONG pulState, ULONG ulFlags, HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; - RPC_STATUS Status; TRACE("%p %lx %lx\n", pulState, ulFlags, hMachine); @@ -373,8 +510,7 @@ } else { - Status = PnpGetLocalBindingHandle(&BindingHandle); - if (Status != RPC_S_OK) + if (!PnpGetLocalHandles(&BindingHandle, NULL)) return CR_FAILURE; } @@ -442,7 +578,6 @@ WORD WINAPI CM_Get_Version_Ex(HMACHINE hMachine) { RPC_BINDING_HANDLE BindingHandle = NULL; - RPC_STATUS Status; WORD Version = 0; TRACE("%lx\n", hMachine); @@ -455,9 +590,8 @@ } else { - Status = PnpGetLocalBindingHandle(&BindingHandle); - if (Status != RPC_S_OK) - return 0; + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; } if (PNP_GetVersion(BindingHandle, &Version) != CR_SUCCESS) @@ -521,6 +655,49 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW( PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %s %lu %lx\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine); - return CR_SUCCESS; + WCHAR DeviceIdBuffer[MAX_DEVICE_ID_LEN]; + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + CONFIGRET rc = CR_SUCCESS; + + TRACE("%p %s %lu %lx\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine); + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + if (pDeviceID != NULL && wcslen(pDeviceID) != 0) + { + lstrcpyW(DeviceIdBuffer, pDeviceID); + } + else + { + /* Get the root device ID */ + lstrcpyW(DeviceIdBuffer, L"HTREE\\ROOT\\0"); + } + + /* Validate the device ID */ + rc = PNP_ValidateDeviceInstance(BindingHandle, + DeviceIdBuffer, + ulFlags); + if (rc == CR_SUCCESS) + { + *pdnDevInst = StringTableAddString(StringTable, DeviceIdBuffer, 1); + if (*pdnDevInst == -1) + rc = CR_FAILURE; + } + + return rc; } _____ Modified: trunk/reactos/lib/setupapi/rpc.c --- trunk/reactos/lib/setupapi/rpc.c 2005-07-17 07:02:20 UTC (rev 16602) +++ trunk/reactos/lib/setupapi/rpc.c 2005-07-17 09:43:54 UTC (rev 16603) @@ -21,10 +21,12 @@ #include <windows.h> #include <rpc.h> #include <rpcdce.h> +#include <setupapi.h> #include "rpc_private.h" static RPC_BINDING_HANDLE LocalBindingHandle = NULL; +static HSTRING_TABLE LocalStringTable = NULL; RPC_STATUS @@ -65,22 +67,48 @@ } -RPC_STATUS -PnpGetLocalBindingHandle(RPC_BINDING_HANDLE *BindingHandle) +BOOL +PnpGetLocalHandles(RPC_BINDING_HANDLE *BindingHandle, + HSTRING_TABLE *StringTable) { if (LocalBindingHandle != NULL) { - BindingHandle = LocalBindingHandle; - return RPC_S_OK; + if (BindingHandle != NULL) + *BindingHandle = LocalBindingHandle; + + if (StringTable != NULL) + *StringTable = LocalStringTable; + + return TRUE; } - return PnpBindRpc(NULL, BindingHandle); + LocalStringTable = StringTableInitialize(); + if (LocalStringTable == NULL) + return FALSE; + + if (PnpBindRpc(NULL, &LocalBindingHandle) != RPC_S_OK) + { + StringTableDestroy(LocalStringTable); + return FALSE; + } + + StringTableAddString(LocalStringTable, L"PLT", 1); + + if (BindingHandle != NULL) + *BindingHandle = LocalBindingHandle; + + if (StringTable != NULL) + *StringTable = LocalStringTable; + + return TRUE; } RPC_STATUS PnpUnbindLocalBindingHandle(VOID) { + StringTableDestroy(LocalStringTable); + LocalStringTable = NULL; return PnpUnbindRpc(&LocalBindingHandle); } _____ Modified: trunk/reactos/lib/setupapi/rpc_private.h --- trunk/reactos/lib/setupapi/rpc_private.h 2005-07-17 07:02:20 UTC (rev 16602) +++ trunk/reactos/lib/setupapi/rpc_private.h 2005-07-17 09:43:54 UTC (rev 16603) @@ -23,7 +23,9 @@ RPC_BINDING_HANDLE* BindingHandle); RPC_STATUS PnpUnbindRpc(RPC_BINDING_HANDLE *BindingHandle); -RPC_STATUS PnpGetLocalBindingHandle(RPC_BINDING_HANDLE *BindingHandle); +BOOL +PnpGetLocalHandles(RPC_BINDING_HANDLE *BindingHandle, + HSTRING_TABLE *StringTable); RPC_STATUS PnpUnbindLocalHandles(VOID); #endif /* __RPC_PRIVATE_H */ _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-07-17 07:02:20 UTC (rev 16602) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-07-17 09:43:54 UTC (rev 16603) @@ -71,10 +71,10 @@ @ stub CM_Get_DevNode_Registry_Property_ExW @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex -@ stub CM_Get_Device_IDA -@ stub CM_Get_Device_IDW -@ stub CM_Get_Device_ID_ExA -@ stub CM_Get_Device_ID_ExW +@ stdcall CM_Get_Device_IDA(long str long long) +@ stdcall CM_Get_Device_IDW(long wstr long long) +@ stdcall CM_Get_Device_ID_ExA(long str long long long) +@ stdcall CM_Get_Device_ID_ExW(long wstr long long long) @ stdcall CM_Get_Device_ID_ListA(str str long long) @ stdcall CM_Get_Device_ID_ListW(wstr wstr long long) @ stdcall CM_Get_Device_ID_List_ExA(str str long long long) @@ -83,8 +83,8 @@ @ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) @ stdcall CM_Get_Device_ID_List_Size_ExA(ptr str long long) @ stdcall CM_Get_Device_ID_List_Size_ExW(ptr wstr long long) -@ stub CM_Get_Device_ID_Size -@ stub CM_Get_Device_ID_Size_Ex +@ stdcall CM_Get_Device_ID_Size(ptr long long) +@ stdcall CM_Get_Device_ID_Size_Ex(ptr long long long) @ stub CM_Get_Device_Interface_AliasA @ stub CM_Get_Device_Interface_AliasW @ stub CM_Get_Device_Interface_Alias_ExA @@ -128,6 +128,7 @@ @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List @ stub CM_Is_Dock_Station_Present +@ stub CM_Is_Dock_Station_Present_Ex @ stdcall CM_Locate_DevNodeA(ptr str long) @ stdcall CM_Locate_DevNodeW(ptr wstr long) @ stdcall CM_Locate_DevNode_ExA(ptr str long long) _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-07-17 07:02:20 UTC (rev 16602) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-07-17 09:43:54 UTC (rev 16603) @@ -31,6 +31,7 @@ #include <ndk/ntndk.h> #include <ndk/sysguid.h> #include <ddk/wdmguid.h> +#include <ddk/cfgmgr32.h> #include <rpc.h> #include <rpcdce.h> @@ -107,25 +108,74 @@ } -//CONFIRET PNP_GetVersion(RPC_BINDING_HANDLE BindingHandle, -// WORD *Version) -unsigned long PNP_GetVersion(handle_t BindingHandle, - unsigned short *Version) +CONFIGRET +PNP_GetVersion(handle_t BindingHandle, + unsigned short *Version) { - *Version = 0x0400; - return 0; /* CR_SUCCESS */ + *Version = 0x0400; + return CR_SUCCESS; } -unsigned long PNP_GetGlobalState(handle_t BindingHandle, - unsigned long *State, - unsigned long Flags) +CONFIGRET +PNP_GetGlobalState(handle_t BindingHandle, + unsigned long *State, + unsigned long Flags) { - *State = 5; - return 0; /* CR_SUCCESS */ + *State = CM_GLOBAL_STATE_CAN_DO_UI | CM_GLOBAL_STATE_SERVICES_AVAILABLE; + return CR_SUCCESS; } +CONFIGRET +PNP_ValidateDeviceInstance(handle_t BindingHandle, + wchar_t *DeviceInstance, + unsigned long Flags) +{ + CONFIGRET ret = CR_SUCCESS; + HKEY hEnumKey = NULL; + HKEY hDeviceKey = NULL; + + DPRINT("PNP_ValidateDeviceInstance(%S %lx) called\n", + DeviceInstance, Flags); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Enum", + 0, + KEY_ALL_ACCESS, + &hEnumKey)) + { + DPRINT("Could not open the Enum Key!\n"); + ret = CR_FAILURE; + goto Done; + } + + if (RegOpenKeyExW(hEnumKey, + DeviceInstance, + 0, + KEY_READ, + &hDeviceKey)) + { + DPRINT("Could not open the Device Key!\n"); + ret = CR_NO_SUCH_DEVNODE; + goto Done; + } + + /* FIXME: add more tests */ + +Done: + if (hDeviceKey != NULL) + RegCloseKey(hDeviceKey); + + if (hEnumKey != NULL) + RegCloseKey(hEnumKey); + + DPRINT("PNP_ValidateDeviceInstance() done (returns %lx)\n", ret); + + return ret; +} + + static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { _____ Modified: trunk/reactos/w32api/include/ddk/cfg.h --- trunk/reactos/w32api/include/ddk/cfg.h 2005-07-17 07:02:20 UTC (rev 16602) +++ trunk/reactos/w32api/include/ddk/cfg.h 2005-07-17 09:43:54 UTC (rev 16603) @@ -132,6 +132,12 @@ PNP_VetoLegacyDriver } PNP_VETO_TYPE, *PPNP_VETO_TYPE; +#define CM_GLOBAL_STATE_CAN_DO_UI 0x00000001 +#define CM_GLOBAL_STATE_ON_BIG_STACK 0x00000002 +#define CM_GLOBAL_STATE_SERVICES_AVAILABLE 0x00000004 +#define CM_GLOBAL_STATE_SHUTTING_DOWN 0x00000008 +#define CM_GLOBAL_STATE_DETECTION_PENDING 0x00000010 + #ifdef __cplusplus } #endif _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-07-17 07:02:20 UTC (rev 16602) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-07-17 09:43:54 UTC (rev 16603) @@ -243,9 +243,9 @@ } DEVPRIVATE_DES, *PDEVPRIVATE_DES; typedef struct DevPrivate_Range_s { - DWORD PR_Data1; - DWORD PR_Data2; - DWORD PR_Data3; + DWORD PR_Data1; + DWORD PR_Data2; + DWORD PR_Data3; } DEVPRIVATE_RANGE, *PDEVPRIVATE_RANGE; #define PType_Range sizeof(DEVPRIVATE_RANGE) @@ -293,16 +293,16 @@ } DMA_RESOURCE, *PDMA_RESOURCE; /* IO_DES.Type constants and masks */ -#define fIOD_PortType 0x1 -#define fIOD_Memory 0x0 -#define fIOD_IO 0x1 -#define fIOD_DECODE 0x00fc -#define fIOD_10_BIT_DECODE 0x0004 -#define fIOD_12_BIT_DECODE 0x0008 -#define fIOD_16_BIT_DECODE 0x0010 -#define fIOD_POSITIVE_DECODE 0x0020 -#define fIOD_PASSIVE_DECODE 0x0040 -#define fIOD_WINDOW_DECODE 0x0080 +#define fIOD_PortType 0x1 +#define fIOD_Memory 0x0 +#define fIOD_IO 0x1 +#define fIOD_DECODE 0x00fc +#define fIOD_10_BIT_DECODE 0x0004 +#define fIOD_12_BIT_DECODE 0x0008 +#define fIOD_16_BIT_DECODE 0x0010 +#define fIOD_POSITIVE_DECODE 0x0020 +#define fIOD_PASSIVE_DECODE 0x0040 +#define fIOD_WINDOW_DECODE 0x0080 typedef struct IO_Des_s { DWORD IOD_Count; @@ -313,10 +313,10 @@ } IO_DES, *PIO_DES; /* IO_RANGE.IOR_Alias constants */ -#define IO_ALIAS_10_BIT_DECODE 0x00000004 -#define IO_ALIAS_12_BIT_DECODE 0x00000010 -#define IO_ALIAS_16_BIT_DECODE 0x00000000 -#define IO_ALIAS_POSITIVE_DECODE 0x000000FF +#define IO_ALIAS_10_BIT_DECODE 0x00000004 +#define IO_ALIAS_12_BIT_DECODE 0x00000010 +#define IO_ALIAS_16_BIT_DECODE 0x00000000 +#define IO_ALIAS_POSITIVE_DECODE 0x000000FF typedef struct IO_Range_s { DWORDLONG IOR_Align; @@ -335,16 +335,16 @@ } IO_RESOURCE, *PIO_RESOURCE; /* IRQ_DES.IRQD_flags constants */ -#define mIRQD_Share 0x1 -#define fIRQD_Exclusive 0x0 -#define fIRQD_Share 0x1 +#define mIRQD_Share 0x1 +#define fIRQD_Exclusive 0x0 +#define fIRQD_Share 0x1 -#define fIRQD_Share_Bit 0 -#define fIRQD_Level_Bit 1 +#define fIRQD_Share_Bit 0 +#define fIRQD_Level_Bit 1 -#define mIRQD_Edge_Level 0x2 -#define fIRQD_Level 0x0 -#define fIRQD_Edge 0x2 +#define mIRQD_Edge_Level 0x2 +#define fIRQD_Level 0x0 +#define fIRQD_Edge 0x2 typedef struct IRQ_Des_32_s { DWORD IRQD_Count; @@ -469,51 +469,51 @@ DWORD PCD_MemoryCardBase2; } PCCARD_DES, *PPCCARD_DES; -#define mPCD_IO_8_16 0x1 -#define fPCD_IO_8 0x0 -#define fPCD_IO_16 0x1 -#define mPCD_MEM_8_16 0x2 -#define fPCD_MEM_8 0x0 -#define fPCD_MEM_16 0x2 -#define mPCD_MEM_A_C 0xC -#define fPCD_MEM1_A 0x4 -#define fPCD_MEM2_A 0x8 -#define fPCD_IO_ZW_8 0x10 -#define fPCD_IO_SRC_16 0x20 -#define fPCD_IO_WS_16 0x40 -#define mPCD_MEM_WS 0x300 -#define fPCD_MEM_WS_ONE 0x100 -#define fPCD_MEM_WS_TWO 0x200 -#define fPCD_MEM_WS_THREE 0x300 +#define mPCD_IO_8_16 0x1 +#define fPCD_IO_8 0x0 +#define fPCD_IO_16 0x1 +#define mPCD_MEM_8_16 0x2 +#define fPCD_MEM_8 0x0 +#define fPCD_MEM_16 0x2 +#define mPCD_MEM_A_C 0xC +#define fPCD_MEM1_A 0x4 +#define fPCD_MEM2_A 0x8 +#define fPCD_IO_ZW_8 0x10 +#define fPCD_IO_SRC_16 0x20 +#define fPCD_IO_WS_16 0x40 +#define mPCD_MEM_WS 0x300 +#define fPCD_MEM_WS_ONE 0x100 +#define fPCD_MEM_WS_TWO 0x200 +#define fPCD_MEM_WS_THREE 0x300 -#define fPCD_MEM_A 0x4 +#define fPCD_MEM_A 0x4 -#define fPCD_ATTRIBUTES_PER_WINDOW 0x8000 +#define fPCD_ATTRIBUTES_PER_WINDOW 0x8000 -#define fPCD_IO1_16 0x00010000 -#define fPCD_IO1_ZW_8 0x00020000 -#define fPCD_IO1_SRC_16 0x00040000 -#define fPCD_IO1_WS_16 0x00080000 +#define fPCD_IO1_16 0x00010000 +#define fPCD_IO1_ZW_8 0x00020000 +#define fPCD_IO1_SRC_16 0x00040000 +#define fPCD_IO1_WS_16 0x00080000 -#define fPCD_IO2_16 0x00100000 -#define fPCD_IO2_ZW_8 0x00200000 -#define fPCD_IO2_SRC_16 0x00400000 -#define fPCD_IO2_WS_16 0x00800000 +#define fPCD_IO2_16 0x00100000 +#define fPCD_IO2_ZW_8 0x00200000 +#define fPCD_IO2_SRC_16 0x00400000 +#define fPCD_IO2_WS_16 0x00800000 -#define mPCD_MEM1_WS 0x03000000 -#define fPCD_MEM1_WS_ONE 0x01000000 -#define fPCD_MEM1_WS_TWO 0x02000000 -#define fPCD_MEM1_WS_THREE 0x03000000 -#define fPCD_MEM1_16 0x04000000 +#define mPCD_MEM1_WS 0x03000000 +#define fPCD_MEM1_WS_ONE 0x01000000 +#define fPCD_MEM1_WS_TWO 0x02000000 +#define fPCD_MEM1_WS_THREE 0x03000000 +#define fPCD_MEM1_16 0x04000000 -#define mPCD_MEM2_WS 0x30000000 -#define fPCD_MEM2_WS_ONE 0x10000000 -#define fPCD_MEM2_WS_TWO 0x20000000 -#define fPCD_MEM2_WS_THREE 0x30000000 -#define fPCD_MEM2_16 0x40000000 +#define mPCD_MEM2_WS 0x30000000 +#define fPCD_MEM2_WS_ONE 0x10000000 +#define fPCD_MEM2_WS_TWO 0x20000000 +#define fPCD_MEM2_WS_THREE 0x30000000 +#define fPCD_MEM2_16 0x40000000 -#define PCD_MAX_MEMORY 2 -#define PCD_MAX_IO 2 +#define PCD_MAX_MEMORY 2 +#define PCD_MAX_IO 2 typedef struct PcCard_Resource_s { PCCARD_DES PcCard_Header; @@ -521,16 +521,16 @@ /* CONFLICT_DETAILS.CD.ulMask constants */ -#define CM_CDMASK_DEVINST 0x00000001 -#define CM_CDMASK_RESDES 0x00000002 -#define CM_CDMASK_FLAGS 0x00000004 -#define CM_CDMASK_DESCRIPTION 0x00000008 -#define CM_CDMASK_VALID 0x0000000F +#define CM_CDMASK_DEVINST 0x00000001 +#define CM_CDMASK_RESDES 0x00000002 +#define CM_CDMASK_FLAGS 0x00000004 +#define CM_CDMASK_DESCRIPTION 0x00000008 +#define CM_CDMASK_VALID 0x0000000F /* CONFLICT_DETAILS.CD.ulFlags constants */ -#define CM_CDFLAGS_DRIVER 0x00000001 -#define CM_CDFLAGS_ROOT_OWNED 0x00000002 -#define CM_CDFLAGS_RESERVED 0x00000004 +#define CM_CDFLAGS_DRIVER 0x00000001 +#define CM_CDFLAGS_ROOT_OWNED 0x00000002 +#define CM_CDFLAGS_RESERVED 0x00000004 typedef struct _CONFLICT_DETAILS_A { ULONG CD_ulSize; @@ -561,9 +561,9 @@ /* CM_Add_Empty_Log_Conf.ulFlags constants */ -#define PRIORITY_EQUAL_FIRST 0x00000008 -#define PRIORITY_EQUAL_LAST 0x00000000 -#define PRIORITY_BIT 0x00000008 +#define PRIORITY_EQUAL_FIRST 0x00000008 +#define PRIORITY_EQUAL_LAST 0x00000000 +#define PRIORITY_BIT 0x00000008 CMAPI CONFIGRET

1 0

[hbirr] 16602: Fixed the determining of the file from the output redirection.
by hbirr＠svn.reactos.com 17 Jul '05

17 Jul '05

Fixed the determining of the file from the output redirection. Modified: trunk/reactos/subsys/system/cmd/redir.c _____ Modified: trunk/reactos/subsys/system/cmd/redir.c --- trunk/reactos/subsys/system/cmd/redir.c 2005-07-17 00:44:33 UTC (rev 16601) +++ trunk/reactos/subsys/system/cmd/redir.c 2005-07-17 07:02:20 UTC (rev 16602) @@ -129,32 +129,24 @@ *ofn = _T('\0'); } - else if (*sp == _T('1')) + else if (*sp == _T('1')) { - /* error redirection */ + /* output redirection */ sp++; if (*sp == _T('>')) { /* output redirection */ - *lpnFlags |= OUTPUT_REDIRECTION; - sp++; + *lpnFlags |= OUTPUT_REDIRECTION; + sp++; - /* append request ? */ - if (*sp == _T('>')) - { - *lpnFlags |= OUTPUT_APPEND; - sp++; + /* append request ? */ + if (*sp == _T('>')) + { + *lpnFlags |= OUTPUT_APPEND; + sp++; + } } - - while (_istspace (*sp)) - sp++; - - /* copy file name */ - while (*sp && !IsRedirection (*sp) && !_istspace (*sp)) - *ofn++ = *sp++; - *ofn = _T('\0'); - } else { /* no redirection!! copy the '1' character! */ @@ -168,8 +160,8 @@ /* copy file name */ while (*sp && !IsRedirection (*sp) && !_istspace (*sp)) - *efn++ = *sp++; - *efn = _T('\0'); + *ofn++ = *sp++; + *ofn = _T('\0'); } else if (*sp == _T('2'))

1 0

[greatlrd] 16601: /D /Z are implement in ros cmd copy by BrandonTurner but reactos CopyFile and CopyFileEx does not support it yet, for /D are COPY_FILE_ALLOW_DECRYPTED_DESTNATION for decypt the file when it copy to dest and /Z are COPY_FILE_RESTARTABLE for network. so it is working in windows
by greatlrd＠svn.reactos.com 17 Jul '05

17 Jul '05

/D /Z are implement in ros cmd copy by BrandonTurner but reactos CopyFile and CopyFileEx does not support it yet, for /D are COPY_FILE_ALLOW_DECRYPTED_DESTNATION for decypt the file when it copy to dest and /Z are COPY_FILE_RESTARTABLE for network. so it is working in windows Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-16 23:44:16 UTC (rev 16600) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-17 00:44:33 UTC (rev 16601) @@ -34,20 +34,20 @@ enum { - COPY_ASCII = 0x001, /* /A */ - COPY_DECRYPT = 0x004, /* /D : Not Impleneted */ + COPY_ASCII = 0x001, /* /A */ + COPY_DECRYPT = 0x004, /* /D */ COPY_VERIFY = 0x008, /* /V : Dummy, Never will be Impleneted */ COPY_SHORTNAME = 0x010, /* /N : Not Impleneted */ COPY_NO_PROMPT = 0x020, /* /Y */ COPY_PROMPT = 0x040, /* /-Y */ - COPY_RESTART = 0x080, /* /Z : Not Impleneted */ - COPY_BINARY = 0x100, /* /B */ + COPY_RESTART = 0x080, /* /Z */ + COPY_BINARY = 0x100, /* /B */ }; #define BUFF_SIZE 16384 /* 16k = max buffer size */ -int copy (LPTSTR source, LPTSTR dest, int append, DWORD lpdwFlags) +int copy (TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], int append, DWORD lpdwFlags) { TCHAR szMsg[RC_STRING_MAX_SIZE]; FILETIME srctime; @@ -59,6 +59,9 @@ DWORD dwWritten; DWORD i; BOOL bEof = FALSE; + TCHAR TrueDest[MAX_PATH]; + TCHAR TempSrc[MAX_PATH]; + TCHAR * FileName; #ifdef _DEBUG DebugPrintf (_T("checking mode\n")); @@ -84,9 +87,46 @@ #ifdef _DEBUG DebugPrintf (_T("copy: flags has %s\n"), - *lpdwFlags & ASCII ? "ASCII" : "BINARY"); + *lpdwFlags & COPY_ASCII ? "ASCII" : "BINARY"); #endif + /* Check to see if /D or /Z are true, if so we need a middle + man to copy the file too to allow us to use CopyFileEx later */ + if(lpdwFlags & COPY_DECRYPT) + { + GetEnvironmentVariable(_T("TEMP"),TempSrc,MAX_PATH); + _tcscat(TempSrc,_T("\\")); + FileName = _tcsrchr(source,_T('\\')); + FileName++; + _tcscat(TempSrc,FileName); + /* This is needed to be on the end to prevent an error + if the user did "copy /D /Z foo bar then it would be copied + too %TEMP%\foo here and when %TEMP%\foo when it sets it up + for COPY_RESTART, this would mean it is copying to itself + which would error when it tried to open the handles for ReadFile + and WriteFile */ + _tcscat(TempSrc,_T(".decrypt")); + if(!CopyFileEx(source, TempSrc, NULL, NULL, FALSE, COPY_FILE_ALLOW_DECRYPTED_DESTINATION)) + { + nErrorLevel = 1; + return 0; + } + _tcscpy(source, TempSrc); + } + + + if(lpdwFlags & COPY_RESTART) + { + _tcscpy(TrueDest, dest); + GetEnvironmentVariable(_T("TEMP"),dest,MAX_PATH); + _tcscat(dest,_T("\\")); + FileName = _tcsrchr(TrueDest,_T('\\')); + FileName++; + _tcscat(dest,FileName); + } + + + if (!IsExistingFile (dest)) { #ifdef _DEBUG @@ -216,6 +256,25 @@ #endif SetFileAttributes (dest, dwAttrib); + /* Now finish off the copy if needed with CopyFileEx */ + if(lpdwFlags & COPY_RESTART) + { + if(!CopyFileEx(dest, TrueDest, NULL, NULL, FALSE, COPY_FILE_RESTARTABLE)) + { + nErrorLevel = 1; + DeleteFile(dest); + return 0; + } + /* Take care of file in the temp folder */ + DeleteFile(dest); + + } + + if(lpdwFlags & COPY_DECRYPT) + DeleteFile(TempSrc); + + + return 1; }

1 0

[greatlrd] 16600: add CopyFileEx flags #define COPY_FILE_ALLOW_DECRYPTED_DESTINATION, COPY_FILE_FAIL_IF_EXISTS, COPY_FILE_RESTARTABLE, COPY_FILE_OPEN_SOURCE_FOR_WRITE
by greatlrd＠svn.reactos.com 16 Jul '05

16 Jul '05

add CopyFileEx flags #define COPY_FILE_ALLOW_DECRYPTED_DESTINATION, COPY_FILE_FAIL_IF_EXISTS, COPY_FILE_RESTARTABLE, COPY_FILE_OPEN_SOURCE_FOR_WRITE Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2005-07-16 23:21:36 UTC (rev 16599) +++ trunk/reactos/w32api/include/winbase.h 2005-07-16 23:44:16 UTC (rev 16600) @@ -181,6 +181,10 @@ #define OPEN_EXISTING 3 #define OPEN_ALWAYS 4 #define TRUNCATE_EXISTING 5 +#define COPY_FILE_ALLOW_DECRYPTED_DESTINATION 0x00000008 +#define COPY_FILE_FAIL_IF_EXISTS 0x00000001 +#define COPY_FILE_RESTARTABLE 0x00000002 +#define COPY_FILE_OPEN_SOURCE_FOR_WRITE 0x00000004 #define FILE_FLAG_WRITE_THROUGH 0x80000000 #define FILE_FLAG_OVERLAPPED 1073741824 #define FILE_FLAG_NO_BUFFERING 536870912

1 0

[ekohl] 16599: - For bugs for in-string parameters.
by ekohl＠svn.reactos.com 16 Jul '05

16 Jul '05

- For bugs for in-string parameters. - Implement out-string parameters (untested). Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-07-16 15:19:52 UTC (rev 16598) +++ trunk/reactos/tools/widl/ChangeLog 2005-07-16 23:21:36 UTC (rev 16599) @@ -1,12 +1,20 @@ ChangeLog -2004-05-08 weiden +2005-07-17 ekohl + tools/widl/client.c tools/widl/server.c +Fix bugs for in-string parameters. +Implement out-string parameters (untested). + +2005-05-08 weiden + + tools/widl/server.c + Don't generate lvalue assignment code. -2004-05-08 weiden +2005-05-08 weiden tools/widl/client.c tools/widl/proxy.c @@ -154,7 +162,7 @@ tools/widl/server.h tools/widl/client.h - tools/widl/proxy.h + tools/widl/proxy.h Deleted unneeded headers. _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-07-16 15:19:52 UTC (rev 16598) +++ trunk/reactos/tools/widl/client.c 2005-07-16 23:21:36 UTC (rev 16599) @@ -56,6 +56,130 @@ } +static unsigned int +get_var_stack_offset_32(func_t *func, char *name) +{ + unsigned int offset = 0; + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return offset; + + if (var->type->type == RPC_FC_DOUBLE || + var->type->type == RPC_FC_HYPER) + offset += 8; + else + offset += 4; + + var = PREV_LINK(var); + } + + return 0; +} + + +static unsigned int +get_var_stack_offset_64(func_t *func, char *name) +{ + unsigned int offset = 0; + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return offset; + + offset += 8; + + var = PREV_LINK(var); + } + + return 0; +} + + +static unsigned int +get_var_type_offset(var_t *var) +{ + unsigned int toffset = 0; + void *size_is_attr; + int string_attr; + + if (var->ptr_level == 0) + { + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + + toffset += tsize; + } + } + else if (var->ptr_level == 1) + { + size_is_attr = get_attrp(var->attrs, ATTR_SIZEIS); + string_attr = is_attr(var->attrs, ATTR_STRING); + + if (size_is_attr) + { + if (string_attr) + { + if (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR) + toffset += 10; + } + else + { + if (is_base_type(var->type)) + toffset += 14; + } + } + else + { + if (is_base_type(var->type)) + toffset += 4; + } + } + + return toffset; +} + + +static type_t *get_type_by_name(func_t *func, char *name) +{ + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return var->type; + + var = PREV_LINK(var); + } + + return NULL; +} + + static unsigned char get_base_type(unsigned char type) { @@ -134,6 +258,45 @@ } +static int get_type_alignment(type_t *type) +{ + int size; + + switch(type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + break; + + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, type->type); + return 0; + } + + return size; +} + + static void write_procformatstring(type_t *iface) { func_t *func = iface->funcs; @@ -281,9 +444,11 @@ { func_t *func = iface->funcs; var_t *var; + type_t *type; int in_attr, out_attr; int string_attr; int ptr_attr, ref_attr, unique_attr; + void *sizeis_attr; print_client("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_client("{\n"); @@ -361,12 +526,59 @@ ptr_attr = is_attr(var->attrs, ATTR_PTR); ref_attr = is_attr(var->attrs, ATTR_REF); unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); if (ptr_attr + ref_attr + unique_attr == 0) ref_attr = 1; - if (is_base_type(var->type)) + if (sizeis_attr && out_attr) { + unsigned char type_type = 0; + + type = get_type_by_name(func, ((expr_t *)sizeis_attr)->u.sval); + if (type != NULL) + type_type = type->type; + + print_client("0x11, 0x00, /* FC_RP */\n"); + print_client("NdrFcShort(0x02),\n"); + + if (string_attr) + { + if (var->type->type == RPC_FC_WCHAR) + print_client("0x25, /* FC_C_WSTRING */\n"); + else + print_client("0x22, /* FC_C_CSTRING */\n"); + print_client("0x44, /* FC_STRING_SIZED */\n"); + print_client("0x%02x,\n", 0x20 + type_type); + print_client("0x00,\n"); + + fprintf(client, "#ifndef _APLHA_\n"); + print_client("NdrFcShort(0x%02X),\n", + get_var_stack_offset_32(func, ((expr_t *)sizeis_attr)->u.sval)); + fprintf(client, "#else\n"); + print_client("NdrFcShort(0x%02X),\n", + get_var_stack_offset_64(func, ((expr_t *)sizeis_attr)->u.sval)); + fprintf(client, "#endif\n"); + } + else + { + print_client("0x1b, /* FC_CARRAY */\n"); + print_client("0x%02x,\n", get_type_alignment(var->type) - 1); + print_client("NdrFcShort(0x%02x),\n", get_type_size(var->type, 1)); + print_client("0x%02x,\n", 0x20 + type_type); + print_client("0x00,\n"); + + fprintf(client, "#ifndef _APLHA_\n"); + print_client("NdrFcShort(0x04),\n"); + fprintf(client, "#else\n"); + print_client("NdrFcShort(0x08),\n"); + fprintf(client, "#endif\n"); + print_client("0x%02x,\n", get_base_type(var->type->type)); + print_client("0x5b, /* FC_END */\n"); + } + } + else if (is_base_type(var->type)) + { if (out_attr) print_client("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); else @@ -401,8 +613,6 @@ } } - - func = PREV_LINK(func); } @@ -695,30 +905,7 @@ } /* calculate the next type offset */ - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - local_type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - local_type_offset += 4; - } + local_type_offset += get_var_type_offset(var); } if (nothing_printed) @@ -783,6 +970,8 @@ print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", *type_offset + 2); indent--; fprintf(client, "\n"); + print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(client, "\n"); } else { @@ -946,30 +1135,7 @@ } /* calculate the next type offset */ - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - local_type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - local_type_offset += 4; - } + local_type_offset += get_var_type_offset(var); } } @@ -980,6 +1146,8 @@ unsigned int size; unsigned int last_size = 0; int out_attr; + int string_attr; + void *sizeis_attr; var_t *var; var_t *def; unsigned int local_type_offset = *type_offset; @@ -994,6 +1162,9 @@ for (; var; var = PREV_LINK(var)) { out_attr = is_attr(var->attrs, ATTR_OUT); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + string_attr = is_attr(var->attrs, ATTR_STRING); + if (out_attr) { if (var->ptr_level > 1) @@ -1003,8 +1174,39 @@ return; } - if (is_base_type(var->type)) + if (sizeis_attr != NULL) { + if (string_attr) + { + fprintf(client, "\n"); + print_client("NdrConformantStringUnmarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", + *type_offset + 4); + print_client("(unsigned char)0);\n"); + indent--; + fprintf(client, "\n"); + print_client("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(client, "\n"); + } + else + { + fprintf(client, "\n"); + print_client("NdrConformantArrayUnmarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", + *type_offset + 4); + print_client("(unsigned char)0);\n"); + indent--; + fprintf(client, "\n"); + } + } + else if (is_base_type(var->type)) + { alignment = 0; switch (var->type->type) { @@ -1095,30 +1297,7 @@ } /* calculate the next type offset */ - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - local_type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - local_type_offset += 4; - } + local_type_offset += get_var_type_offset(var); } } @@ -1394,30 +1573,8 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; + type_offset += get_var_type_offset(var); - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - type_offset += 4; - } var = PREV_LINK(var); } } @@ -1596,30 +1753,7 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - if (var->ptr_level == 0) - { - if (var->type->type == RPC_FC_RP) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize ++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - size += tsize; - } - } - else if (var->ptr_level == 1) - { - if (is_base_type(var->type)) - size += 4; - } - + size += get_var_type_offset(var); var = PREV_LINK(var); } } _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-07-16 15:19:52 UTC (rev 16598) +++ trunk/reactos/tools/widl/server.c 2005-07-16 23:21:36 UTC (rev 16599) @@ -61,6 +61,130 @@ } +static unsigned int +get_var_stack_offset_32(func_t *func, char *name) +{ + unsigned int offset = 0; + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return offset; + + if (var->type->type == RPC_FC_DOUBLE || + var->type->type == RPC_FC_HYPER) + offset += 8; + else + offset += 4; + + var = PREV_LINK(var); + } + + return 0; +} + + +static unsigned int +get_var_stack_offset_64(func_t *func, char *name) +{ + unsigned int offset = 0; + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return offset; + + offset += 8; + + var = PREV_LINK(var); + } + + return 0; +} + + +static unsigned int +get_var_type_offset(var_t *var) +{ + unsigned int toffset = 0; + void *size_is_attr; + int string_attr; + + if (var->ptr_level == 0) + { + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + + toffset += tsize; + } + } + else if (var->ptr_level == 1) + { + size_is_attr = get_attrp(var->attrs, ATTR_SIZEIS); + string_attr = is_attr(var->attrs, ATTR_STRING); + + if (size_is_attr) + { + if (string_attr) + { + if (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR) + toffset += 10; + } + else + { + if (is_base_type(var->type)) + toffset += 14; + } + } + else + { + if (is_base_type(var->type)) + toffset += 4; + } + } + + return toffset; +} + + +static type_t *get_type_by_name(func_t *func, char *name) +{ + var_t *var; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (!strcmp(var->name, name)) + return var->type; + + var = PREV_LINK(var); + } + + return NULL; +} + + static unsigned char get_base_type(unsigned char type) { @@ -139,6 +263,45 @@ } +static int get_type_alignment(type_t *type) +{ + int size; + + switch(type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + break; + + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, type->type); + return 0; + } + + return size; +} + + static void write_procformatstring(type_t *iface) { func_t *func = iface->funcs; @@ -278,9 +441,11 @@ { func_t *func = iface->funcs; var_t *var; + type_t *type; int in_attr, out_attr; int string_attr; int ptr_attr, ref_attr, unique_attr; + void *sizeis_attr; print_server("const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); print_server("{\n"); @@ -358,12 +523,59 @@ ptr_attr = is_attr(var->attrs, ATTR_PTR); ref_attr = is_attr(var->attrs, ATTR_REF); unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); if (ptr_attr + ref_attr + unique_attr == 0) ref_attr = 1; - if (is_base_type(var->type)) + if (sizeis_attr != NULL && out_attr) { + unsigned char type_type = 0; + + type = get_type_by_name(func, ((expr_t *)sizeis_attr)->u.sval); + if (type != NULL) + type_type = type->type; + + print_server("0x11, 0x00, /* FC_RP */\n"); + print_server("NdrFcShort(0x02),\n"); + + if (string_attr) + { + if (var->type->type == RPC_FC_WCHAR) + print_server("0x25, /* FC_C_WSTRING */\n"); + else + print_server("0x22, /* FC_C_CSTRING */\n"); + print_server("0x44, /* FC_STRING_SIZED */\n"); + print_server("0x%02x,\n", 0x20 + type_type); + print_server("0x00,\n"); + + fprintf(server, "#ifndef _APLHA_\n"); + print_server("NdrFcShort(0x%02X),\n", + get_var_stack_offset_32(func, ((expr_t *)sizeis_attr)->u.sval)); + fprintf(server, "#else\n"); + print_server("NdrFcShort(0x%02X),\n", + get_var_stack_offset_64(func, ((expr_t *)sizeis_attr)->u.sval)); + fprintf(server, "#endif\n"); + } + else + { + print_server("0x1b, /* FC_CARRAY */\n"); + print_server("0x%02x,\n", get_type_alignment(var->type) - 1); + print_server("NdrFcShort(0x%02x),\n", get_type_size(var->type, 1)); + print_server("0x%02x,\n", 0x20 + type_type); + print_server("0x00,\n"); + + fprintf(server, "#ifndef _APLHA_\n"); + print_server("NdrFcShort(0x04),\n"); + fprintf(server, "#else\n"); + print_server("NdrFcShort(0x08),\n"); + fprintf(server, "#endif\n"); + print_server("0x%02x,\n", get_base_type(var->type->type)); + print_server("0x5b, /* FC_END */\n"); + } + } + else if (is_base_type(var->type)) + { if (out_attr) print_server("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); else @@ -420,9 +632,11 @@ int in_attr; int out_attr; int string_attr; + void *sizeis_attr; int empty_line; var_t *var; + int add_return = 0; int start_new_line = 0; int add_plus = 0; @@ -437,10 +651,27 @@ for (; var; var = PREV_LINK(var)) { out_attr = is_attr(var->attrs, ATTR_OUT); + string_attr = is_attr(var->attrs, ATTR_STRING); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + if (out_attr) { - if (is_base_type(var->type)) + if (var->ptr_level == 1 && + string_attr && + sizeis_attr != NULL && + (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR)) { + fprintf(server, " 12U"); + add_return = 6; + if (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR) + add_return++; + add_plus = 1; + } + else if (is_base_type(var->type)) + { if (start_new_line) { print_server("_StubMsg.BufferLength +="); @@ -519,30 +750,7 @@ } /* calculate the next type offset */ - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - local_type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - local_type_offset += 4; - } + local_type_offset += get_var_type_offset(var); } } } @@ -588,10 +796,60 @@ if (add_plus) fprintf(server, " +"); - fprintf(server, " %dU", (size == 0) ? 0 : size + alignment); + fprintf(server, " %dU", (size == 0) ? 0 : size + alignment + add_return); } fprintf(server, ";\n"); + + if (func->args) + { + local_type_offset = *type_offset; + + empty_line = 0; + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + for (; var; var = PREV_LINK(var)) + { + out_attr = is_attr(var->attrs, ATTR_OUT); + in_attr = is_attr(var->attrs, ATTR_IN); + string_attr = is_attr(var->attrs, ATTR_STRING); + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + + /* set 'in' attribute if neither 'in' nor 'out' is found */ + if (!out_attr && !in_attr) + in_attr = 1; + + if (out_attr) + { + if (var->ptr_level == 1 && + string_attr && + sizeis_attr != NULL && + (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR)) + { + print_server("_StubMsg.MaxCount = %s;\n", ((expr_t *)sizeis_attr)->u.sval); + fprintf(server, "\n"); + print_server("NdrConformantStringBufferSize(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 4); + indent--; + + empty_line = 1; + } + + /* calculate the next type offset */ + local_type_offset += get_var_type_offset(var); + } + } + + if (empty_line) + fprintf(server, "\n"); + } + /* get string size */ if (func->args) { @@ -610,7 +868,9 @@ if (var->ptr_level == 1 && string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + (var->type->type == RPC_FC_BYTE || + var->type->type == RPC_FC_CHAR || + var->type->type == RPC_FC_WCHAR)) { print_server("_StubMsg.BufferLength += 16;\n"); empty_line = 1; @@ -645,9 +905,9 @@ } else if (var->ptr_level == 1) { - print_server("*("); + print_server("("); write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR *)&%s = 0;\n", var->name); + fprintf(server, " __RPC_FAR *)%s = 0;\n", var->name); } else if (var->ptr_level > 1) { @@ -711,6 +971,8 @@ print_server("(unsigned char)0);\n"); indent--; fprintf(server, "\n"); + print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)(((long)_StubMsg.Buffer + 3) & ~0x3);\n"); + fprintf(server, "\n"); } else { @@ -874,30 +1136,7 @@ } /* calculate the next type offset */ - if (var->ptr_level == 0) - { - if ((var->type->type == RPC_FC_RP) && - (var->type->ref->ref->type == RPC_FC_STRUCT)) - { - var_t *field = var->type->ref->ref->fields; - int tsize = 9; - - while (NEXT_LINK(field)) field = NEXT_LINK(field); - while (field) - { - tsize++; - field = PREV_LINK(field); - } - if (tsize % 2) - tsize++; - - local_type_offset += tsize; - } - } - else if (var->ptr_level == 1) - { - local_type_offset += 4; - } + local_type_offset += get_var_type_offset(var); } } @@ -910,6 +1149,8 @@ var_t *var; var_t *def; int out_attr; + int string_attr; + void *sizeis_attr; unsigned int local_type_offset = *type_offset; def = func->def; @@ -924,8 +1165,30 @@ out_attr = is_attr(var->attrs, ATTR_OUT); if (out_attr) { - if (is_base_type(var->type)) + sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); + string_attr = is_attr(var->attrs, ATTR_STRING); + + if (sizeis_attr != NULL) { [truncated at 1000 lines; 306 more skipped]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs