Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[weiden] 20983: set a last error code in case translating the path failed in InternalFindFirstFile()

by weiden＠svn.reactos.org

set a last error code in case translating the path failed in InternalFindFirstFile() Modified: trunk/reactos/lib/kernel32/file/find.c _____ Modified: trunk/reactos/lib/kernel32/file/find.c --- trunk/reactos/lib/kernel32/file/find.c 2006-01-22 15:40:43 UTC (rev 20982) +++ trunk/reactos/lib/kernel32/file/find.c 2006-01-22 15:55:14 UTC (rev 20983) @@ -49,20 +49,6 @@ /* FUNCTIONS ****************************************************************/ -static __inline PKERNEL32_FIND_FILE_DATA -HandleToFindData(IN HANDLE Handle) -{ - PKERNEL32_FIND_DATA_HEADER FindData = (PKERNEL32_FIND_DATA_HEADER)Handle; - - if (Handle != NULL && Handle != INVALID_HANDLE_VALUE && - FindData->Type == FileFind) - { - return (PKERNEL32_FIND_FILE_DATA)(FindData + 1); - } - - return NULL; -} - VOID InternalCopyFindDataW(LPWIN32_FIND_DATAW lpFindFileData, PFILE_BOTH_DIR_INFORMATION lpFileInfo) @@ -335,6 +321,7 @@ 0, SlashlessFileName); } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; }

18 years, 11 months

[mbosma] 20982: Add high resolution of computer.ico and replace regedit.ico with the tango config one. (was just a generic application icon)

by mbosma＠svn.reactos.org

Add high resolution of computer.ico and replace regedit.ico with the tango config one. (was just a generic application icon) Modified: trunk/reactos/subsys/system/regedit/res/computer.ico Modified: trunk/reactos/subsys/system/regedit/res/regedit.ico Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/res/computer.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/regedit/res/regedit.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2006-01-22 15:14:43 UTC (rev 20981) +++ trunk/reactos/subsys/system/regedit/treeview.c 2006-01-22 15:40:43 UTC (rev 20982) @@ -414,7 +414,7 @@ /* Create the image list. */ if ((himl = ImageList_Create(CX_ICON, CY_ICON, - ILC_MASK, 0, NUM_ICONS)) == NULL) + ILC_MASK|ILC_COLOR32, 0, NUM_ICONS)) == NULL) return FALSE; /* Add the open file, closed file, and document bitmaps. */

18 years, 11 months

[gedmurphy] 20981: I have no excuse. It's not even early or late ....

by gedmurphy＠svn.reactos.org

I have no excuse. It's not even early or late .... Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2006-01-22 15:05:43 UTC (rev 20980) +++ trunk/reactos/bootdata/hivesys.inf 2006-01-22 15:14:43 UTC (rev 20981) @@ -693,7 +693,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00 000010 ; RPC service -HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000 ,"HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000 ,"Enables a computer to recognize and adapt to hardware changes with little or no user input" +HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000 ,"Enables a computer to recognize and adapt to hardware changes with little or no user input" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001 ,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"% SystemRoot%\system32\rpcss.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x0000 0004

18 years, 11 months

[gedmurphy] 20980: put brain into gear ....

by gedmurphy＠svn.reactos.org

put brain into gear .... Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2006-01-22 14:57:33 UTC (rev 20979) +++ trunk/reactos/bootdata/hivesys.inf 2006-01-22 15:05:43 UTC (rev 20980) @@ -685,7 +685,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x0000 0001 ; Plug and Play manager -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "Enables a computer to recognize and adapt to hardware changes with little or no user input. Stopping or disabling this service will result in system instability." +HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Description",0x00000 000,"Enables a computer to recognize and adapt to hardware changes with little or no user input. Stopping or disabling this service will result in system instability." HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Group",0x00000000,"Pl ugPlay" HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ImagePath",0x00020000 ,"%SystemRoot%\system32\umpnpmgr.exe" @@ -693,7 +693,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00 000010 ; RPC service -HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "Enables a computer to recognize and adapt to hardware changes with little or no user input" +HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000 ,"HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000 ,"Enables a computer to recognize and adapt to hardware changes with little or no user input" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001 ,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"% SystemRoot%\system32\rpcss.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x0000 0004

18 years, 11 months

[gedmurphy] 20979: add some descriptions for listed services

by gedmurphy＠svn.reactos.org

add some descriptions for listed services Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2006-01-22 14:33:04 UTC (rev 20978) +++ trunk/reactos/bootdata/hivesys.inf 2006-01-22 14:57:33 UTC (rev 20979) @@ -534,6 +534,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x000000 01 ; Event logging service +HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Description",0x00000 000,"Enables event log messages issued by Windows-based programs and components to be viewed in Event Viewer. This service cannot be stopped" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Group",0x00000000,"Ev ent log" HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ImagePath",0x00020000 ,"%SystemRoot%\system32\eventlog.exe" @@ -541,6 +542,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Type",0x00010001,0x00 000010 ; DHCP client service +HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "Manages network configuration by registering and updating IP addresses and DNS names" HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ErrorControl",0x00010001, 0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Group",0x00000000,"Networ k" HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ImagePath",0x00020000,"%S ystemRoot%\system32\dhcp.exe" @@ -683,6 +685,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x0000 0001 ; Plug and Play manager +HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "Enables a computer to recognize and adapt to hardware changes with little or no user input. Stopping or disabling this service will result in system instability." HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Group",0x00000000,"Pl ugPlay" HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ImagePath",0x00020000 ,"%SystemRoot%\system32\umpnpmgr.exe" @@ -690,6 +693,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00 000010 ; RPC service +HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000, "Enables a computer to recognize and adapt to hardware changes with little or no user input" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001 ,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"% SystemRoot%\system32\rpcss.exe" HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x0000 0004 @@ -766,7 +770,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDr ivers",0x00010000,"vgaddi" ; Windows Installer Service - HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Description",0x00000 000,"Adds, modifies, and removes applications provided as a Windows Installer (*.msi) package. If this service is disabled, any services that explicitly depend on it will fail to start." HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","Group",0x00000000,"W indows Installer" HKLM,"SYSTEM\CurrentControlSet\Services\MSIserver","ErrorControl",0x0001 0001,0x00000001

18 years, 11 months

[ekohl] 20978: Forward CM_Create_DevNode[_Ex]A/W to umpnpmgr.

by ekohl＠svn.reactos.org

Forward CM_Create_DevNode[_Ex]A/W to umpnpmgr. Modified: trunk/reactos/include/idl/pnp.idl Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/cfgmgr32/cfgmgr32.def Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/include/idl/pnp.idl --- trunk/reactos/include/idl/pnp.idl 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/include/idl/pnp.idl 2006-01-22 14:33:04 UTC (rev 20978) @@ -16,163 +16,170 @@ ] interface pnp { - /* Function 0 */ -// CONFIGRET PNP_Unknown0(handle_t BindingHandle); + /* Function 0 */ +// CONFIGRET PNP_Unknown0(handle_t BindingHandle); - /* Function 1 */ -// CONFIGRET PNP_Unknown1(handle_t BindingHandle); + /* Function 1 */ +// CONFIGRET PNP_Unknown1(handle_t BindingHandle); - /* Function 2 */ - CONFIGRET PNP_GetVersion(handle_t BindingHandle, - [out] WORD *Version); + /* Function 2 */ + CONFIGRET PNP_GetVersion(handle_t BindingHandle, + [out] WORD *Version); - /* Function 3 */ - CONFIGRET PNP_GetGlobalState(handle_t BindingHandle, - [out] unsigned long *State, - [in] unsigned long Flags); + /* Function 3 */ + CONFIGRET PNP_GetGlobalState(handle_t BindingHandle, + [out] unsigned long *State, + [in] unsigned long Flags); - /* Function 4 */ - CONFIGRET PNP_InitDetection(handle_t BindingHandle); + /* Function 4 */ + CONFIGRET PNP_InitDetection(handle_t BindingHandle); - /* Function 5 */ - CONFIGRET PNP_ReportLogOn(handle_t BindingHandle, - [in] BOOL Admin, - [in] DWORD ProcessId); + /* Function 5 */ + CONFIGRET PNP_ReportLogOn(handle_t BindingHandle, + [in] BOOL Admin, + [in] DWORD ProcessId); - /* Function 6 */ - CONFIGRET PNP_ValidateDeviceInstance(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] DWORD Flags); + /* Function 6 */ + CONFIGRET PNP_ValidateDeviceInstance(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] DWORD Flags); - /* Function 7 */ - CONFIGRET PNP_GetRootDeviceInstance(handle_t BindingHandle, - [out, string, size_is(Length)] wchar_t *DeviceInstance, - [in] DWORD Length); + /* Function 7 */ + CONFIGRET PNP_GetRootDeviceInstance(handle_t BindingHandle, + [out, string, size_is(Length)] wchar_t *DeviceInstance, + [in] DWORD Length); - /* 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); + /* 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); - /* Function 9 */ - cpp_quote("#define PNP_BRANCH_ENUM 1") - cpp_quote("#define PNP_BRANCH_CLASS 2") - CONFIGRET PNP_EnumerateSubKeys(handle_t BindingHandle, - [in] unsigned long Branch, - [in] unsigned long Index, - [out, string, size_is(Length)] wchar_t *Buffer, - [in] unsigned long Length, - [out] unsigned long *RequiredLength, - [in] DWORD Flags); + /* Function 9 */ + cpp_quote("#define PNP_BRANCH_ENUM 1") + cpp_quote("#define PNP_BRANCH_CLASS 2") + CONFIGRET PNP_EnumerateSubKeys(handle_t BindingHandle, + [in] unsigned long Branch, + [in] unsigned long Index, + [out, string, size_is(Length)] wchar_t *Buffer, + [in] unsigned long Length, + [out] unsigned long *RequiredLength, + [in] DWORD Flags); - /* 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); + /* 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); - /* Function 11 */ - CONFIGRET PNP_GetDeviceListSize(handle_t BindingHandle, - [in, unique, string] wchar_t *Filter, - [out] unsigned long *Length, - [in] DWORD Flags); + /* Function 11 */ + CONFIGRET PNP_GetDeviceListSize(handle_t BindingHandle, + [in, unique, string] wchar_t *Filter, + [out] unsigned long *Length, + [in] DWORD Flags); - /* Function 12 */ - CONFIGRET PNP_GetDepth(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [out] unsigned long *Depth, - [in] DWORD Flags); + /* Function 12 */ + CONFIGRET PNP_GetDepth(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [out] unsigned long *Depth, + [in] DWORD Flags); - /* Function 13 */ - CONFIGRET PNP_GetDeviceRegProp(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] unsigned long Property, - [in, out] unsigned long *DataType, - [out, size_is(*TransferLen)] char *Buffer, - [in, out] unsigned long *TransferLen, - [in, out] unsigned long *Length, - [in] DWORD Flags); + /* Function 13 */ + CONFIGRET PNP_GetDeviceRegProp(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] unsigned long Property, + [in, out] unsigned long *DataType, + [out, size_is(*TransferLen)] char *Buffer, + [in, out] unsigned long *TransferLen, + [in, out] unsigned long *Length, + [in] DWORD Flags); - /* 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); + /* 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); - /* 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); + /* 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); - /* Function 16 */ - CONFIGRET PNP_CreateKey(handle_t BindingHandle, - [in, string] wchar_t *SubKey, - [in] unsigned long DesiredAccess, - [in] unsigned long Flags); + /* Function 16 */ + CONFIGRET PNP_CreateKey(handle_t BindingHandle, + [in, string] wchar_t *SubKey, + [in] unsigned long DesiredAccess, + [in] unsigned long Flags); - /* 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); + /* 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); - /* 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); - - /* Function 20 */ - CONFIGRET PNP_DeleteClassKey(handle_t BindingHandle, + /* 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); - /* 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); + /* Function 20 */ + CONFIGRET PNP_DeleteClassKey(handle_t BindingHandle, + [in, string] wchar_t *ClassGuid, + [in] unsigned long Flags); - /* Function 30 */ - CONFIGRET PNP_GetDeviceStatus(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [out] unsigned long *Status, - [out] unsigned long *Problem, - [in] DWORD Flags); + /* 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); - /* Function 31 */ - CONFIGRET PNP_SetDeviceProblem(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] unsigned long Problem, - [in] DWORD Flags); + /* 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); - /* Function 33 */ - CONFIGRET PNP_UninstallDevInst(handle_t BindingHandle, - [in, string] wchar_t *DeviceInstance, - [in] DWORD Flags); + /* Function 30 */ + CONFIGRET PNP_GetDeviceStatus(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [out] unsigned long *Status, + [out] unsigned long *Problem, + [in] DWORD Flags); - /* Function 38 */ - CONFIGRET PNP_IsDockStationPresent(handle_t BindingHandle, - [out]PBOOL Present); + /* Function 31 */ + CONFIGRET PNP_SetDeviceProblem(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] unsigned long Problem, + [in] DWORD Flags); - /* Function 39 */ - CONFIGRET PNP_RequestEjectPC(handle_t BindingHandle); + /* Function 33 */ + CONFIGRET PNP_UninstallDevInst(handle_t BindingHandle, + [in, string] wchar_t *DeviceInstance, + [in] DWORD Flags); - /* Function 58 */ - CONFIGRET PNP_RunDetection(handle_t BindingHandle, - [in] unsigned long Flags); + /* Function 38 */ + CONFIGRET PNP_IsDockStationPresent(handle_t BindingHandle, + [out]PBOOL Present); + + /* Function 39 */ + CONFIGRET PNP_RequestEjectPC(handle_t BindingHandle); + + /* Function 58 */ + CONFIGRET PNP_RunDetection(handle_t BindingHandle, + [in] unsigned long Flags); } _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/include/wine/cfgmgr32.h 2006-01-22 14:33:04 UTC (rev 20978) @@ -163,6 +163,22 @@ #define CM_SETUP_DEVINST_RESET CM_SETUP_DEVNODE_RESET #define CM_SETUP_BITS 0x00000007 +/* ulFlags for CM_Create_DevNode[_Ex]A/W */ +#define CM_CREATE_DEVNODE_NORMAL 0x00000000 +#define CM_CREATE_DEVNODE_NO_WAIT_INSTALL 0x00000001 +#define CM_CREATE_DEVNODE_PHANTOM 0x00000002 +#define CM_CREATE_DEVNODE_GENERATE_ID 0x00000004 +#define CM_CREATE_DEVNODE_DO_NOT_INSTALL 0x00000008 +#define CM_CREATE_DEVNODE_BITS 0x0000000F + +#define CM_CREATE_DEVINST_NORMAL CM_CREATE_DEVNODE_NORMAL +#define CM_CREATE_DEVINST_NO_WAIT_INSTALL CM_CREATE_DEVNODE_NO_WAIT_INSTALL +#define CM_CREATE_DEVINST_PHANTOM CM_CREATE_DEVNODE_PHANTOM +#define CM_CREATE_DEVINST_GENERATE_ID CM_CREATE_DEVNODE_GENERATE_ID +#define CM_CREATE_DEVINST_DO_NOT_INSTALL CM_CREATE_DEVNODE_DO_NOT_INSTALL +#define CM_CREATE_DEVINST_BITS CM_CREATE_DEVNODE_BITS + + #define CMP_MAGIC 0x01234567 @@ -172,6 +188,12 @@ CONFIGRET WINAPI CM_Connect_MachineA( PCSTR, PHMACHINE ); CONFIGRET WINAPI CM_Connect_MachineW( PCWSTR, PHMACHINE ); #define CM_Connect_Machine WINELIB_NAME_AW(CM_Connect_Machine) +CONFIGRET WINAPI CM_Create_DevNodeA( PDEVINST, DEVINSTID_A, DEVINST, ULONG ); +CONFIGRET WINAPI CM_Create_DevNodeW( PDEVINST, DEVINSTID_W, DEVINST, ULONG ); +#define CM_Create_DevNode WINELIB_NAME_AW(CM_Create_DevNode) +CONFIGRET WINAPI CM_Create_DevNode_ExA( PDEVINST, DEVINSTID_A, DEVINST, ULONG, HANDLE ); +CONFIGRET WINAPI CM_Create_DevNode_ExW( PDEVINST, DEVINSTID_W, DEVINST, ULONG, HANDLE ); +#define CM_Create_DevNode_Ex WINELIB_NAME_AW(CM_Create_DevNode_Ex) CONFIGRET WINAPI CM_Delete_Class_Key( LPGUID, ULONG ); CONFIGRET WINAPI CM_Delete_Class_Key_Ex( LPGUID, ULONG, HANDLE ); CONFIGRET WINAPI CM_Disable_DevNode( DEVINST, ULONG ); _____ Modified: trunk/reactos/lib/cfgmgr32/cfgmgr32.def --- trunk/reactos/lib/cfgmgr32/cfgmgr32.def 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/lib/cfgmgr32/cfgmgr32.def 2006-01-22 14:33:04 UTC (rev 20978) @@ -36,10 +36,10 @@ ;CM_Add_Res_Des_Ex CM_Connect_MachineA(a)8=SETUPAPI.CM_Connect_MachineA CM_Connect_MachineW(a)8=SETUPAPI.CM_Connect_MachineW -;CM_Create_DevNodeA -;CM_Create_DevNodeW -;CM_Create_DevNode_ExA -;CM_Create_DevNode_ExW +CM_Create_DevNodeA(a)16=SETUPAPI.CM_Create_DevNodeA +CM_Create_DevNodeW(a)16=SETUPAPI.CM_Create_DevNodeW +CM_Create_DevNode_ExA(a)20=SETUPAPI.CM_Create_DevNode_ExA +CM_Create_DevNode_ExW(a)20=SETUPAPI.CM_Create_DevNode_ExW ;CM_Create_Range_List CM_Delete_Class_Key(a)8=SETUPAPI.CM_Delete_Class_Key CM_Delete_Class_Key_Ex(a)12=SETUPAPI.CM_Delete_Class_Key_Ex @@ -48,12 +48,12 @@ ;CM_Delete_Range ;CM_Detect_Resource_Conflict ;CM_Detect_Resource_Conflict_Ex -;CM_Disable_DevNode -;CM_Disable_DevNode_Ex +CM_Disable_DevNode(a)8=SETUPAPI.CM_Disable_DevNode +CM_Disable_DevNode_Ex(a)12=SETUPAPI.CM_Disable_DevNode_Ex CM_Disconnect_Machine(a)4=SETUPAPI.CM_Disconnect_Machine ;CM_Dup_Range_List -;CM_Enable_DevNode -;CM_Enable_DevNode_Ex +CM_Enable_DevNode(a)8=SETUPAPI.CM_Enable_DevNode +CM_Enable_DevNode_Ex(a)12=SETUPAPI.CM_Enable_DevNode_Ex CM_Enumerate_Classes(a)12=SETUPAPI.CM_Enumerate_Classes CM_Enumerate_Classes_Ex(a)16=SETUPAPI.CM_Enumerate_Classes_Ex CM_Enumerate_EnumeratorsA(a)16=SETUPAPI.CM_Enumerate_EnumeratorsA @@ -143,8 +143,8 @@ CM_Get_Version_Ex(a)4=SETUPAPI.CM_Get_Version_Ex ;CM_Intersect_Range_List ;CM_Invert_Range_List -;CM_Is_Dock_Station_Present -;CM_Is_Dock_Station_Present_Ex +CM_Is_Dock_Station_Present(a)4=SETUPAPI.CM_Is_Dock_Station_Present +CM_Is_Dock_Station_Present_Ex(a)8=SETUPAPI.CM_Is_Dock_Station_Present_Ex CM_Locate_DevNodeA(a)12=SETUPAPI.CM_Locate_DevNodeA CM_Locate_DevNodeW(a)12=SETUPAPI.CM_Locate_DevNodeW CM_Locate_DevNode_ExA(a)16=SETUPAPI.CM_Locate_DevNode_ExA @@ -181,11 +181,12 @@ ;CM_Remove_Unmarked_Children_Ex ;CM_Request_Device_EjectA ;CM_Request_Device_EjectW -;CM_Request_Eject_PC +CM_Request_Eject_PC(a)0=SETUPAPI.CM_Request_Eject_PC +CM_Request_Eject_PC_Ex(a)4=SETUPAPI.CM_Request_Eject_PC_Ex ;CM_Reset_Children_Marks ;CM_Reset_Children_Marks_Ex -;CM_Run_Detection -;CM_Run_Detection_Ex +CM_Run_Detection(a)4=SETUPAPI.CM_Run_Detection +CM_Run_Detection_Ex(a)8=SETUPAPI.CM_Run_Detection_Ex CM_Set_DevNode_Problem(a)12=SETUPAPI.CM_Set_DevNode_Problem CM_Set_DevNode_Problem_Ex(a)16=SETUPAPI.CM_Set_DevNode_Problem_Ex CM_Set_DevNode_Registry_PropertyA(a)20=SETUPAPI.CM_Set_DevNode_Registry_Pr opertyA _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2006-01-22 14:33:04 UTC (rev 20978) @@ -2,7 +2,7 @@ * Configuration manager functions * * Copyright 2000 James Hatheway - * Copyright 2005 Eric Kohl + * Copyright 2005, 2006 Eric Kohl * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -185,6 +185,125 @@ /*********************************************************************** + * CM_Create_DevNodeA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Create_DevNodeA( + PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, DEVINST dnParent, + ULONG ulFlags) +{ + TRACE("%p %s %p %lx\n", + pdnDevInst, debugstr_a(pDeviceID), dnParent, ulFlags); + return CM_Create_DevNode_ExA(pdnDevInst, pDeviceID, dnParent, + ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Create_DevNodeW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Create_DevNodeW( + PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, DEVINST dnParent, + ULONG ulFlags) +{ + TRACE("%p %s %p %lx\n", + pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags); + return CM_Create_DevNode_ExW(pdnDevInst, pDeviceID, dnParent, + ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Create_DevNode_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Create_DevNode_ExA( + PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, DEVINST dnParent, + ULONG ulFlags, HANDLE hMachine) +{ + DEVINSTID_W pDeviceIDW; + CONFIGRET ret; + + TRACE("%p %s %p %lx %p\n", + pdnDevInst, debugstr_a(pDeviceID), dnParent, ulFlags, hMachine); + + if (CaptureAndConvertAnsiArg(pDeviceID, &pDeviceIDW)) + return CR_INVALID_DATA; + + ret = CM_Create_DevNode_ExW(pdnDevInst, pDeviceIDW, dnParent, ulFlags, + hMachine); + + MyFree(pDeviceIDW); + + return ret; +} + + +/********************************************************************** * + * CM_Create_DevNode_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Create_DevNode_ExW( + PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, DEVINST dnParent, + ULONG ulFlags, HANDLE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpParentDevInst; + CONFIGRET ret = CR_SUCCESS; + + FIXME("%p %s %p %lx %p\n", + pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags, hMachine); + + if (!IsUserAdmin()) + return CR_ACCESS_DENIED; + + if (pdnDevInst == NULL) + return CR_INVALID_POINTER; + + if (pDeviceID == NULL || wcslen(pDeviceID) == 0) + return CR_INVALID_DEVICE_ID; + + if (dnParent == 0) + return CR_INVALID_DEVNODE; + + if (ulFlags & ~CM_CREATE_DEVNODE_BITS) + return CR_INVALID_FLAG; + + 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; + } + + lpParentDevInst = StringTableStringFromId(StringTable, dnParent); + if (lpParentDevInst == NULL) + return CR_INVALID_DEVNODE; + + ret = PNP_CreateDevInst(BindingHandle, + pDeviceID, + lpParentDevInst, + MAX_DEVICE_ID_LEN, + ulFlags); + if (ret == CR_SUCCESS) + { + *pdnDevInst = StringTableAddString(StringTable, pDeviceID, 1); + if (*pdnDevInst == 0) + ret = CR_NO_SUCH_DEVNODE; + } + + return ret; +} + + +/********************************************************************** * * CM_Delete_Class_Key [SETUPAPI.@] */ CONFIGRET WINAPI CM_Delete_Class_Key( _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/lib/setupapi/setupapi.spec 2006-01-22 14:33:04 UTC (rev 20978) @@ -20,10 +20,10 @@ @ stub CM_Add_Res_Des_Ex @ stdcall CM_Connect_MachineA(str ptr) @ stdcall CM_Connect_MachineW(wstr ptr) -@ stub CM_Create_DevNodeA -@ stub CM_Create_DevNodeW -@ stub CM_Create_DevNode_ExA -@ stub CM_Create_DevNode_ExW +@ stdcall CM_Create_DevNodeA(ptr str long long) +@ stdcall CM_Create_DevNodeW(ptr wstr long long) +@ stdcall CM_Create_DevNode_ExA(ptr str long long long) +@ stdcall CM_Create_DevNode_ExW(ptr wstr long long long) @ stub CM_Create_Range_List @ stdcall CM_Delete_Class_Key(ptr long) @ stdcall CM_Delete_Class_Key_Ex(ptr long long) _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2006-01-22 14:33:04 UTC (rev 20978) @@ -893,6 +893,24 @@ } +/* 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; + + DPRINT1("PNP_CreateDevInst() called\n"); + + DPRINT1("PNP_CreateDevInst() done (returns %lx)\n", ret); + + return ret; +} + + /* Function 29 */ CONFIGRET PNP_DeviceInstanceAction(handle_t BindingHandle, _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2006-01-22 14:08:06 UTC (rev 20977) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2006-01-22 14:33:04 UTC (rev 20978) @@ -736,8 +736,75 @@ #define CM_Connect_Machine CM_Connect_MachineA #endif /* UNICODE */ -/* FIXME: Obsolete CM_Create_DevNode */ -/* FIXME: Obsolete CM_Create_DevNodeEx */ +/* Flags for CM_Create_DevNode[_Ex].ulFlags constants */ +#define CM_CREATE_DEVNODE_NORMAL 0x00000000 +#define CM_CREATE_DEVNODE_NO_WAIT_INSTALL 0x00000001 +#define CM_CREATE_DEVNODE_PHANTOM 0x00000002 +#define CM_CREATE_DEVNODE_GENERATE_ID 0x00000004 +#define CM_CREATE_DEVNODE_DO_NOT_INSTALL 0x00000008 +#define CM_CREATE_DEVNODE_BITS 0x0000000F + +#define CM_CREATE_DEVINST_NORMAL CM_CREATE_DEVNODE_NORMAL +#define CM_CREATE_DEVINST_NO_WAIT_INSTALL CM_CREATE_DEVNODE_NO_WAIT_INSTALL +#define CM_CREATE_DEVINST_PHANTOM CM_CREATE_DEVNODE_PHANTOM +#define CM_CREATE_DEVINST_GENERATE_ID CM_CREATE_DEVNODE_GENERATE_ID +#define CM_CREATE_DEVINST_DO_NOT_INSTALL CM_CREATE_DEVNODE_DO_NOT_INSTALL +#define CM_CREATE_DEVINST_BITS CM_CREATE_DEVNODE_BITS + +CMAPI +CONFIGRET +WINAPI +CM_Create_DevNodeA( + OUT PDEVINST pdnDevInst, + IN DEVINSTID_A pDeviceID, + IN DEVINST dnParent, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Create_DevNodeW( + OUT PDEVINST pdnDevInst, + IN DEVINSTID_W pDeviceID, + IN DEVINST dnParent, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Create_DevNode_ExA( + OUT PDEVINST pdnDevInst, + IN DEVINSTID_A pDeviceID, + IN DEVINST dnParent, + IN ULONG ulFlags, + IN HANDLE hMachine); + +CMAPI +CONFIGRET +WINAPI +CM_Create_DevNode_ExW( + OUT PDEVINST pdnDevInst, + IN DEVINSTID_W pDeviceID, + IN DEVINST dnParent, + IN ULONG ulFlags, + IN HANDLE hMachine); + +#define CM_Create_DevInstW CM_Create_DevNodeW +#define CM_Create_DevInstA CM_Create_DevNodeA +#define CM_Create_DevInst_ExW CM_Create_DevNode_ExW +#define CM_Create_DevInst_ExA CM_Create_DevNode_ExA +#ifdef UNICODE +#define CM_Create_DevNode CM_Create_DevNodeW +#define CM_Create_DevInst CM_Create_DevNodeW +#define CM_Create_DevNode_Ex CM_Create_DevNode_ExW +#define CM_Create_DevInst_Ex CM_Create_DevInst_ExW +#else +#define CM_Create_DevNode CM_Create_DevNodeA +#define CM_Create_DevInst CM_Create_DevNodeA +#define CM_Create_DevNode_Ex CM_Create_DevNode_ExA +#define CM_Create_DevInst_Ex CM_Create_DevNode_ExA +#endif /* UNICODE */ + /* FIXME: Obsolete CM_Create_Range_List */ /* Flags for CM_Delete_Class_Key.ulFlags constants */

18 years, 11 months

[mbosma] 20977: DJ_Smith (dj_smith_reactos(at)online(dot)de): Updated and added german translations.

by mbosma＠svn.reactos.org

DJ_Smith (dj_smith_reactos(at)online(dot)de): Updated and added german translations. Modified: trunk/reactos/lib/comdlg32/cdlg_De.rc Modified: trunk/reactos/lib/devmgr/De.rc Modified: trunk/reactos/lib/msacm/msacm.rc Added: trunk/reactos/lib/msacm/msacm_De.rc Modified: trunk/reactos/lib/setupapi/De.rc _____ Modified: trunk/reactos/lib/comdlg32/cdlg_De.rc --- trunk/reactos/lib/comdlg32/cdlg_De.rc 2006-01-22 14:03:12 UTC (rev 20976) +++ trunk/reactos/lib/comdlg32/cdlg_De.rc 2006-01-22 14:08:06 UTC (rev 20977) @@ -29,19 +29,19 @@ FONT 8, "MS Shell Dlg" { LTEXT "Datei&name:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&Verzeichnisse:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Liste der Datei&typen:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "&Laufwerke:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Íffnen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Íffnen", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Schreibgesch³tzt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Schreibgesch³tzt", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -51,19 +51,19 @@ FONT 8, "MS Shell Dlg" { LTEXT "Datei&name:", 1090, 6, 6, 76, 9 - EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "&Verzeichnisse:", -1, 110, 6, 92, 9 LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP LTEXT "Liste der Datei&typen:", 1089, 6, 104, 90, 9 - COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP LTEXT "&Laufwerke:", 1091, 110, 104, 92, 9 - COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Speichern als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Speichern als", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "&Schreibgesch³tzt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Schreibgesch³tzt", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -74,19 +74,19 @@ { LTEXT "Drucker:", 1088, 6, 6, 40, 9 LTEXT "", 1089, 60, 6, 150, 9 - GROUPBOX "Druckbereicht", 1072, 6, 30, 160, 65, BS_GROUPBOX + GROUPBOX "Druckbereicht", grp1, 6, 30, 160, 65, BS_GROUPBOX RADIOBUTTON "&Alles", rad1, 16, 45, 60, 12 RADIOBUTTON "A&uswahl", rad2, 16, 60, 60, 12 RADIOBUTTON "&Seiten", rad3, 16, 75, 60, 12 - DEFPUSHBUTTON "Drucken", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Drucken", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Einrichten", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "&Von:", 1090, 60, 80, 30, 9 LTEXT "&Bis:", 1091, 120, 80, 30, 9 LTEXT "Druck&qualitõt:", 1092, 6, 100, 76, 9 - COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - CHECKBOX "In &Datei drucken", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Verdichtet", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + CHECKBOX "In &Datei drucken", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Verdichtet", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -95,80 +95,50 @@ CAPTION "Druckereinrichtung" FONT 8, "MS Shell Dlg" { - GROUPBOX "Drucker", 1072, 6, 10, 180, 65, BS_GROUPBOX + GROUPBOX "Drucker", grp1, 6, 10, 180, 65, BS_GROUPBOX RADIOBUTTON "&Standarddrucker", rad1, 16, 20, 80, 12 LTEXT "[keiner]", 1088, 35, 35, 120, 9 RADIOBUTTON "Bestimmter &Drucker", rad2, 16, 50, 80, 12 - COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Einrichten", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP - GROUPBOX "Orientierung", 1073, 6, 85, 100, 50, BS_GROUPBOX + GROUPBOX "Orientierung", grp2, 6, 85, 100, 50, BS_GROUPBOX RADIOBUTTON "&Hochformat", rad3, 50, 100, 40, 12 RADIOBUTTON "&Querformat", rad4, 50, 115, 40, 12 - ICON "LANDSCAP", 1097, 10, 95, 32, 32 - ICON "PORTRAIT", 1098, 10, 95, 32, 32 - GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX + ICON "LANDSCAP", stc10, 10, 95, 32, 32 + ICON "PORTRAIT", stc11, 10, 95, 32, 32 + GROUPBOX "Paper", grp3, 120, 85, 180, 50, BS_GROUPBOX LTEXT "&Gr÷?e", 1089, 130, 95, 30, 9 LTEXT "P&apierquelle", 1090, 130, 110, 30, 9 - COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP - COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP } -PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Seite einrichten" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 - CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 - CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 - GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX - LTEXT "&Gr÷?e:", stc2, 16, 112, 36, 8 - COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - LTEXT "&Zufuhr:", stc3, 16, 132, 36, 8 - COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL - GROUPBOX "Format", grp1, 8, 156, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Hochformat", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Querformat", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Rõnder", grp4, 80, 156, 152, 56, BS_GROUPBOX - LTEXT "&Links:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - LTEXT "&Rechts:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - LTEXT "&Oben:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - LTEXT "&Unten:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER - DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Abbrechen", IDCANCEL, 126, 220, 50, 14 - PUSHBUTTON "&Drucker...", psh3, 184, 220, 48, 14 -END - CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Schriftart" FONT 8, "MS Shell Dlg" { - LTEXT "Schrift&art:",1088 ,6,3,40,9 - COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "Schrift&art:",stc1 ,6,3,40,9 + COMBOBOX cmb1 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "Schrift&stil:",1089 ,108,3,44,9 - COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "Schrift&stil:",stc2 ,108,3,44,9 + COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "Schrift&gr÷?e:",1090,179,3,30,9 - COMBOBOX 1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + LTEXT "Schrift&gr÷?e:",stc3,179,3,30,9 + COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT - DEFPUSHBUTTON "OK",IDOK,218,6,40,14,WS_GROUP - PUSHBUTTON "Abbrechen",IDCANCEL,218,23,40,14,WS_GROUP - PUSHBUTTON "&Zuweisen", psh3,218,40,40,14,WS_GROUP - PUSHBUTTON "&Hilfe" , pshHelp,218,57,40,14,WS_GROUP - GROUPBOX "Darstellung",1072,6,72,84,34,WS_GROUP - CHECKBOX "&Durchgestrichen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Unterstrichen", 1041, 10,94,50,10, BS_AUTOCHECKBOX - LTEXT "&Farbe:", 1091 ,6,110,30,9 - COMBOBOX 1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Abbrechen",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Zuweisen", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hilfe" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP + GROUPBOX "Darstellung",grp1,6,72,84,34,WS_GROUP + CHECKBOX "&Durchgestrichen", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Unterstrichen", chx2, 10,94,50,10, BS_AUTOCHECKBOX + LTEXT "&Farbe:", stc4 ,6,110,30,9 + COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Muster",grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE @@ -186,29 +156,29 @@ LTEXT "Gr&undfarben:", 1088, 4, 4, 140, 10 LTEXT "Selbs&tdefinierte Farben:", 1089, 4, 106, 140, 10 LTEXT "Farbe | B&asis", 1090, 150, 151, 48, 10 - LTEXT "&Rot:", 726 ,249,126,24,10 - EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Rot:", 726 /*1094*/,249,126,24,10 + EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Gr³n:",727/*1095*/,249,140,24,10 - EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Blau:",728 /*1096*/,249,154,24,10 - EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Farbe:" ,723 /*1091*/,202,126,22,10 - EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Sõtt:" ,724 /*1092*/,202,140,22,10 - EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "H&ell:" ,725 /*1093*/,202,154,22,10 - EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116 CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26 - DEFPUSHBUTTON "Ok", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Ok", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp,100,166, 44, 14 PUSHBUTTON "Farbe hin&zuf³gen", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Farben &definieren >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&a",713,300,200,4,14 /* just a dummy: 'a' is like &a in "B&asis" */ + PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */ } @@ -218,13 +188,14 @@ FONT 8, "MS Shell Dlg" { LTEXT "S&uchen nach:", -1, 4, 8, 42, 8 - EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nur ganze &Worte", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Beachte Gro?/Kleinschreibung", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Richtung", 1072, 107, 26, 68, 28 + EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Nur ganze &Worte", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Beachte Gro?/Kleinschreibung", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Richtung", grp1, 107, 26, 68, 28 CONTROL "H&och", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 CONTROL "&Runter", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - DEFPUSHBUTTON "&Nõchsten finden", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP + + DEFPUSHBUTTON "&Nõchsten finden", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Abbrechen", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Hilfe", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP } @@ -236,42 +207,20 @@ FONT 8, "MS Shell Dlg" { LTEXT "S&uchen nach:", -1, 4, 9, 48, 8 - EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "Ersetzen &durch:", -1, 4, 26, 48, 8 - EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP - CHECKBOX "Nur ganze &Worte", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Beachte Gro?/Kleinschreibung", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "&Nõchsten finden", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Ersetzen", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Alle ersetzen", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Abbrechen", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Hilfe", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP + EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "Nur ganze &Worte", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Beachte Gro?/Kleinschreibung", chx1, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + + DEFPUSHBUTTON "&Nõchsten finden", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "&Ersetzen", psh1 , 174,21, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Alle ersetzen", psh2 , 174,38, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL , 174,55, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Hilfe", pshHelp , 174,75, 50, 14, WS_GROUP | WS_TABSTOP } -NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN -CAPTION "Íffnen" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&Suche in",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY - COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE - LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE - - LTEXT "Datei&name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY - EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - - LTEXT "Datei&typen",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - - CONTROL "&Schreibgesch³tzt",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 - - DEFPUSHBUTTON "Í&ffnen", IDOK,222,110,50,14 - PUSHBUTTON "Abbrechen", IDCANCEL,222,128,50,14 - PUSHBUTTON "&Hilfe", pshHelp,222,145,50,14 -} - PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK @@ -308,8 +257,8 @@ CONTROL "Aus&wahl", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER - RTEXT "&von:", stc2, 52,124, 20,8 - RTEXT "&bis:", stc3, 100,124, 16,8 + RTEXT "&von:", stc2, 52,124, 20,8 + RTEXT "&bis:", stc3, 100,124, 16,8 } PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178 @@ -347,6 +296,60 @@ CONTROL "&Querformat", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 END +PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Seite einrichten" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&Gr÷?e:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "&Zufuhr:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Format", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Hochformat", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Querformat", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Rõnder", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&Links:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Rechts:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Oben:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + LTEXT "&Unten:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Abbrechen", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "&Drucker...", psh3, 184, 220, 48, 14 +END + +NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "Íffnen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Suche in",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE + LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE + + LTEXT "Datei&name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY + EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL + + LTEXT "Datei&typen",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + CONTROL "&Schreibgesch³tzt",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 + + DEFPUSHBUTTON "Í&ffnen", IDOK,222,110,50,14 + PUSHBUTTON "Abbrechen", IDCANCEL,222,128,50,14 + PUSHBUTTON "&Hilfe", pshHelp,222,145,50,14 +} + STRINGTABLE DISCARDABLE { IDS_ABOUTBOX "?&ber den Folderpicker" _____ Modified: trunk/reactos/lib/devmgr/De.rc --- trunk/reactos/lib/devmgr/De.rc 2006-01-22 14:03:12 UTC (rev 20976) +++ trunk/reactos/lib/devmgr/De.rc 2006-01-22 14:08:06 UTC (rev 20977) @@ -1,4 +1,4 @@ -// German language resource file (David Hinz (fRy2oo5), 2005-12-04) +// German language resource file (David Hinz (fRy2oo5), 2005-12-04) ( and Friedrich Stange (dj_smith_reactos(a)online.de), 2006-1-20 ) // This is incomplete, IDS_DEV_UNKNOWN_RESOURCE still needs to be translated LANGUAGE LANG_GERMAN, SUBLANG_GERMAN @@ -25,6 +25,9 @@ IDS_PROPERTIES "&Eigenschaften" IDS_UPDATEDRV "Treiber &aktualisieren..." IDS_REBOOT "Computer neusta&rten..." + IDS_NOTAVAILABLE "Nicht verf³gbar" + IDS_NOTDIGITALLYSIGNED "Nicht digital signierte" + IDS_NODRIVERS "Es werden keine Treiber f³r dieses Gerõt ben÷tigt oder es wurden keine Treiber geladen." END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -111,7 +114,7 @@ IDD_DEVICEGENERAL DIALOG DISCARDABLE 0, 0, 252, 218 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -142,5 +145,33 @@ EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Treiberversion:", -1, 37, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Signaturgeber:", -1, 37, 81, 60, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Treiberdetails...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "Einzelheiten ³ber die Treiberdateien anzeigen.", -1, 91, 110, 154, 17, SS_NOPREFIX END +IDD_DRIVERDETAILS DIALOG DISCARDABLE 0, 0, 224, 250 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Treiberdateidetails" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX + LTEXT "&Treiberdateien:", -1, 7, 36, 204, 8 + CONTROL "", IDC_DRIVERFILES, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 209, 80 + LTEXT "Anbieter:", -1, 14, 134, 50, 8 + LTEXT "", IDC_FILEPROVIDER, 66, 134, 155, 8 + LTEXT "Dateiversion:", -1, 14, 150, 50, 8 + LTEXT "", IDC_FILEVERSION, 66, 150, 155, 8 + LTEXT "Copyright:", -1, 14, 166, 50, 8 + LTEXT "", IDC_FILECOPYRIGHT, 66, 166, 155, 8 + LTEXT "Signaturgeber:", -1, 14, 182, 50, 8 + LTEXT "", IDC_DIGITALSIGNER, 66, 182, 155, 8 + PUSHBUTTON "OK", IDOK, 167, 228, 50, 14 +END + + + _____ Modified: trunk/reactos/lib/msacm/msacm.rc --- trunk/reactos/lib/msacm/msacm.rc 2006-01-22 14:03:12 UTC (rev 20976) +++ trunk/reactos/lib/msacm/msacm.rc 2006-01-22 14:08:06 UTC (rev 20977) @@ -24,6 +24,7 @@ #include "wineacm.h" #include "msacm_En.rc" +#include "msacm_De.rc" #include "msacm_Es.rc" #include "msacm_Fr.rc" #include "msacm_It.rc" _____ Added: trunk/reactos/lib/msacm/msacm_De.rc --- trunk/reactos/lib/msacm/msacm_De.rc 2006-01-22 14:03:12 UTC (rev 20976) +++ trunk/reactos/lib/msacm/msacm_De.rc 2006-01-22 14:08:06 UTC (rev 20977) @@ -0,0 +1,56 @@ +/* + * German resource file for MS ACM + * + * by Friedrich Stange (dj_smith_reactos(a)online.de) + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Sound auswahl" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Name:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&Speichern als...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&L÷schen", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Eigenschaften:", -1, 5, 59, 44, 8, NOT WS_GROUP + +#if 0 + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | + CBS_OWNERDRAWFIXED | CBS_HASSTRINGS +#else + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +#endif + DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Hilfe", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END _____ Modified: trunk/reactos/lib/setupapi/De.rc --- trunk/reactos/lib/setupapi/De.rc 2006-01-22 14:03:12 UTC (rev 20976) +++ trunk/reactos/lib/setupapi/De.rc 2006-01-22 14:08:06 UTC (rev 20977) @@ -1,7 +1,7 @@ /* * German resources for SETUPAPI * - * Copyright 2004 Henning Gerhardt + * Copyright 2004 Henning Gerhardt ( added some stuff in 2006-1-20 by Friedrich Stange (dj_smith_reactos(a)online.de) ) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,3 +32,9 @@ LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUERY_REBOOT_TEXT "Ihr Computer muss zum Beenden der Installation neugestartet werden. Wollen Sie fortfahren?" + IDS_QUERY_REBOOT_CAPTION "Neustarten" +END

18 years, 11 months

[weiden] 20976: - fixed a possible endless loop in GetSecurityInfo()

by weiden＠svn.reactos.org

- fixed a possible endless loop in GetSecurityInfo() - implemented the SE_REGISTRY_KEY, SE_FILE_OBJECT, SE_KERNEL_OBJECT, SE_SERVICE and SE_WINDOW_OBJECT object types for SetSecurityInfo() Modified: trunk/reactos/lib/ntmarta/ntmarta.c _____ Modified: trunk/reactos/lib/ntmarta/ntmarta.c --- trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 13:41:39 UTC (rev 20975) +++ trunk/reactos/lib/ntmarta/ntmarta.c 2006-01-22 14:03:12 UTC (rev 20976) @@ -52,13 +52,15 @@ ULONG SDSize = 0; NTSTATUS Status; DWORD LastErr; - DWORD Ret = ERROR_SUCCESS; + DWORD Ret; /* save the last error code */ LastErr = GetLastError(); do { + Ret = ERROR_SUCCESS; + /* allocate a buffer large enough to hold the security descriptor we need to return */ SDSize += 0x100; @@ -89,14 +91,15 @@ { case SE_REGISTRY_KEY: { - Ret = RegGetKeySecurity((HKEY)handle, - SecurityInfo, - pSD, - &SDSize); + Ret = (DWORD)RegGetKeySecurity((HKEY)handle, + SecurityInfo, + pSD, + &SDSize); break; } case SE_FILE_OBJECT: + /* FIXME - handle console handles? */ case SE_KERNEL_OBJECT: { Status = NtQuerySecurityObject(handle, @@ -104,27 +107,36 @@ pSD, SDSize, &SDSize); - Ret = RtlNtStatusToDosError(Status); + if (!NT_SUCCESS(Status)) + { + Ret = RtlNtStatusToDosError(Status); + } break; } case SE_SERVICE: { - Ret = QueryServiceObjectSecurity((SC_HANDLE)handle, - SecurityInfo, - pSD, - SDSize, - &SDSize); + if (!QueryServiceObjectSecurity((SC_HANDLE)handle, + SecurityInfo, + pSD, + SDSize, + &SDSize)) + { + Ret = GetLastError(); + } break; } case SE_WINDOW_OBJECT: { - Ret = GetUserObjectSecurity(handle, - &SecurityInfo, - pSD, - SDSize, - &SDSize); + if (!GetUserObjectSecurity(handle, + &SecurityInfo, + pSD, + SDSize, + &SDSize)) + { + Ret = GetLastError(); + } break; } @@ -221,8 +233,73 @@ SECURITY_INFORMATION SecurityInfo, PSECURITY_DESCRIPTOR pSecurityDescriptor) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; + NTSTATUS Status; + DWORD LastErr; + DWORD Ret = ERROR_SUCCESS; + + /* save the last error code */ + LastErr = GetLastError(); + + /* set the security according to the object type */ + switch (ObjectType) + { + case SE_REGISTRY_KEY: + { + Ret = (DWORD)RegSetKeySecurity((HKEY)handle, + SecurityInfo, + pSecurityDescriptor); + break; + } + + case SE_FILE_OBJECT: + /* FIXME - handle console handles? */ + case SE_KERNEL_OBJECT: + { + Status = NtSetSecurityObject(handle, + SecurityInfo, + pSecurityDescriptor); + if (!NT_SUCCESS(Status)) + { + Ret = RtlNtStatusToDosError(Status); + } + break; + } + + case SE_SERVICE: + { + if (!SetServiceObjectSecurity((SC_HANDLE)handle, + SecurityInfo, + pSecurityDescriptor)) + { + Ret = GetLastError(); + } + break; + } + + case SE_WINDOW_OBJECT: + { + if (!SetUserObjectSecurity(handle, + &SecurityInfo, + pSecurityDescriptor)) + { + Ret = GetLastError(); + } + break; + } + + default: + { + UNIMPLEMENTED; + Ret = ERROR_CALL_NOT_IMPLEMENTED; + break; + } + } + + + /* restore the last error code */ + SetLastError(LastErr); + + return Ret; } @@ -362,9 +439,9 @@ { case DLL_PROCESS_ATTACH: hDllInstance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); break; - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: break; }

18 years, 11 months

[weiden] 20975: don't free the string allocated by RtlDosPathNameToNtPathName_U using RtlFreeUnicodeString because the string isn't allocated with the USTR tag

by weiden＠svn.reactos.org

don't free the string allocated by RtlDosPathNameToNtPathName_U using RtlFreeUnicodeString because the string isn't allocated with the USTR tag Modified: trunk/reactos/lib/kernel32/file/cnotify.c Modified: trunk/reactos/lib/kernel32/file/create.c Modified: trunk/reactos/lib/kernel32/file/delete.c Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/file/find.c Modified: trunk/reactos/lib/kernel32/file/hardlink.c Modified: trunk/reactos/lib/kernel32/file/mailslot.c Modified: trunk/reactos/lib/kernel32/file/move.c Modified: trunk/reactos/lib/kernel32/file/npipe.c Modified: trunk/reactos/lib/kernel32/file/volume.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/subsys/smss/initpage.c Modified: trunk/reactos/subsys/smss/initwkdll.c _____ Modified: trunk/reactos/lib/kernel32/file/cnotify.c --- trunk/reactos/lib/kernel32/file/cnotify.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/cnotify.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -99,18 +99,12 @@ -Gunnar */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); - /* FIXME: We free the string alloced by RtlDosPathNameToNtPathName_U, but what - * about the special case where the user can pass a \\?\ path? We must not free - * the users buffer!. But should we even call RtlDosPathNameToNtPathName_U in that - * case??? -Gunnar - */ - RtlFreeUnicodeString( &NtPathU); - - - if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status); _____ Modified: trunk/reactos/lib/kernel32/file/create.c --- trunk/reactos/lib/kernel32/file/create.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/create.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -104,19 +104,6 @@ return (INVALID_HANDLE_VALUE); } - /* validate & translate the filename */ - if (!RtlDosPathNameToNtPathName_U (lpFileName, - &NtPathU, - NULL, - NULL)) - { - DPRINT("Invalid path\n"); - SetLastError(ERROR_PATH_NOT_FOUND); - return INVALID_HANDLE_VALUE; - } - - DPRINT("NtPathU \'%S\'\n", NtPathU.Buffer); - /* validate & translate the flags */ /* translate the flags that need no validation */ @@ -209,6 +196,19 @@ } } + /* validate & translate the filename */ + if (!RtlDosPathNameToNtPathName_U (lpFileName, + &NtPathU, + NULL, + NULL)) + { + DPRINT("Invalid path\n"); + SetLastError(ERROR_PATH_NOT_FOUND); + return INVALID_HANDLE_VALUE; + } + + DPRINT("NtPathU \'%wZ\'\n", &NtPathU); + if (hTemplateFile != NULL) { FILE_EA_INFORMATION EaInformation; @@ -230,6 +230,10 @@ EaInformation.EaSize); if (EaBuffer == NULL) { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); + /* the template file handle is valid and has extended attributes, however we seem to lack some memory here. We should fail here! */ SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -309,7 +313,9 @@ EaBuffer, EaLength); - RtlFreeUnicodeString(&NtPathU); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); /* free the extended attributes buffer if allocated */ if (EaBuffer != NULL) @@ -370,7 +376,7 @@ HANDLE hSymlink = NULL; UNICODE_STRING SymlinkFileName = { 0, 0, NULL }; UNICODE_STRING TargetFileName = { 0, 0, NULL }; - BOOLEAN bRelativePath = FALSE; + BOOLEAN bAllocatedTarget = FALSE, bRelativePath = FALSE; LPWSTR lpTargetFullFileName = NULL; SIZE_T cbPrintName; SIZE_T cbReparseData; @@ -439,6 +445,7 @@ default: if(!RtlDosPathNameToNtPathName_U(lpTargetFileName, &TargetFileName, NULL, NULL)) { + bAllocatedTarget = TRUE; dwErr = ERROR_INVALID_PARAMETER; goto Cleanup; } @@ -535,7 +542,12 @@ NtClose(hSymlink); RtlFreeUnicodeString(&SymlinkFileName); - RtlFreeUnicodeString(&TargetFileName); + if (bAllocatedTarget) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + TargetFileName.Buffer); + } if(lpTargetFullFileName) RtlFreeHeap(RtlGetProcessHeap(), 0, lpTargetFullFileName); _____ Modified: trunk/reactos/lib/kernel32/file/delete.c --- trunk/reactos/lib/kernel32/file/delete.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/delete.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -84,7 +84,9 @@ NULL, 0); - RtlFreeUnicodeString(&NtPathU); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/file.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -309,7 +309,9 @@ if ((uStyle & OF_PARSE) == OF_PARSE) { - RtlFreeUnicodeString(&FileNameString); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FileNameString.Buffer); return (HFILE)NULL; } @@ -327,7 +329,9 @@ FILE_SHARE_READ, FILE_NON_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT); - RtlFreeUnicodeString(&FileNameString); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FileNameString.Buffer); lpReOpenBuff->nErrCode = RtlNtStatusToDosError(errCode); _____ Modified: trunk/reactos/lib/kernel32/file/find.c --- trunk/reactos/lib/kernel32/file/find.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/find.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -877,7 +877,9 @@ NtClose(FileHandle); } - RtlFreeUnicodeString(&NtPathU); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/lib/kernel32/file/hardlink.c --- trunk/reactos/lib/kernel32/file/hardlink.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/hardlink.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -181,7 +181,7 @@ { SetLastError(ERROR_INVALID_NAME); } - RtlFreeUnicodeString(&LinkTarget); + RtlFreeHeap(RtlGetProcessHeap(), 0, LinkTarget.Buffer); } else { _____ Modified: trunk/reactos/lib/kernel32/file/mailslot.c --- trunk/reactos/lib/kernel32/file/mailslot.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/mailslot.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -99,7 +99,9 @@ nMaxMessageSize, &DefaultTimeOut); - RtlFreeUnicodeString(&MailslotName); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + MailslotName.Buffer); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/move.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -81,7 +81,7 @@ UNICODE_STRING nameW, source_name, dest_name; KEY_VALUE_PARTIAL_INFORMATION *info; BOOL rc = FALSE; - HANDLE Reboot = 0; + HANDLE Reboot = NULL; DWORD len1, len2; DWORD DataSize = 0; BYTE *Buffer = NULL; @@ -98,7 +98,7 @@ dest_name.Buffer = NULL; if (dest && !RtlDosPathNameToNtPathName_U( dest, &dest_name, NULL, NULL )) { - RtlFreeUnicodeString( &source_name ); + RtlFreeHeap( RtlGetProcessHeap(), 0, source_name.Buffer ); SetLastError( ERROR_PATH_NOT_FOUND ); return FALSE; } @@ -120,8 +120,8 @@ if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateKey() failed (Status 0x%lx)\n", Status); - RtlFreeUnicodeString( &source_name ); - RtlFreeUnicodeString( &dest_name ); + RtlFreeHeap( RtlGetProcessHeap(), 0, source_name.Buffer ); + RtlFreeHeap( RtlGetProcessHeap(), 0, dest_name.Buffer ); return FALSE; } @@ -176,11 +176,11 @@ *p = 0; DataSize += sizeof(WCHAR); - rc = !NtSetValueKey(Reboot, &nameW, 0, REG_MULTI_SZ, Buffer + info_size, DataSize - info_size); + rc = NT_SUCCESS(NtSetValueKey(Reboot, &nameW, 0, REG_MULTI_SZ, Buffer + info_size, DataSize - info_size)); Quit: - RtlFreeUnicodeString( &source_name ); - RtlFreeUnicodeString( &dest_name ); + RtlFreeHeap( RtlGetProcessHeap(), 0, source_name.Buffer ); + RtlFreeHeap( RtlGetProcessHeap(), 0, dest_name.Buffer ); if (Reboot) NtClose(Reboot); HeapFree( GetProcessHeap(), 0, Buffer ); return(rc); _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/npipe.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -215,7 +215,9 @@ } /* Free the name */ - RtlFreeUnicodeString(&NamedPipeName); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NamedPipeName.Buffer); /* Check status */ if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/lib/kernel32/file/volume.c --- trunk/reactos/lib/kernel32/file/volume.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/kernel32/file/volume.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -66,7 +66,9 @@ NULL, 0); - RtlFreeUnicodeString(&NtPathU); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); if (!NT_SUCCESS(errCode)) { _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -640,10 +640,14 @@ { DPRINT1("Dll open of %wZ failed: Status = 0x%08lx\n", &FullNtFileName, Status); - RtlFreeUnicodeString (&FullNtFileName); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + FullNtFileName.Buffer); return Status; } - RtlFreeUnicodeString (&FullNtFileName); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + FullNtFileName.Buffer); Status = NtReadFile(FileHandle, NULL, _____ Modified: trunk/reactos/subsys/smss/initpage.c --- trunk/reactos/subsys/smss/initpage.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/subsys/smss/initpage.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -162,7 +162,9 @@ NULL, 0); - RtlFreeUnicodeString(&NtPathU); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + NtPathU.Buffer); if (!NT_SUCCESS(Status)) { @@ -230,7 +232,9 @@ } Cleanup: - RtlFreeUnicodeString(&FileName); + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FileName.Buffer); return STATUS_SUCCESS; } _____ Modified: trunk/reactos/subsys/smss/initwkdll.c --- trunk/reactos/subsys/smss/initwkdll.c 2006-01-22 13:06:23 UTC (rev 20974) +++ trunk/reactos/subsys/smss/initwkdll.c 2006-01-22 13:41:39 UTC (rev 20975) @@ -203,9 +203,14 @@ &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + DllNtPath.Buffer); + if (!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile(%wZ) failed (Status %lx)\n", &DllNtPath, Status); + DPRINT1("NtOpenFile failed (Status %lx)\n", Status); return Status; }

18 years, 11 months

[weiden] 20974: don't free the string allocated by RtlDosPathNameToNtPathName_U using RtlFreeUnicodeString because the string isn't allocated with the USTR tag

by weiden＠svn.reactos.org

18 years, 11 months

← Newer
1
...
8
9
10
11
12
13
14
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006