Ros-diffs March 2005

ros-diffs@reactos.org

26 participants
609 discussions

[ros-diffs] [ekohl] 14235: - Add stubs: CM_GetChild, CM_GetChild_Ex, CM_GetParent, CM_GetPaarent_Ex, CM_GetSibling, CM_GetSibling_Ex, CM_Locate_DevNodeA, CM_Locate_DevNodeW, CM_Locate_DevNode_ExA, CM_Locate_DevNode_ExW

by ekohl＠svn.reactos.com

- Add stubs: CM_GetChild, CM_GetChild_Ex, CM_GetParent, CM_GetPaarent_Ex, CM_GetSibling, CM_GetSibling_Ex, CM_Locate_DevNodeA, CM_Locate_DevNodeW, CM_Locate_DevNode_ExA, CM_Locate_DevNode_ExW - Implement: CM_GetVersion, CM_GetVersion_Ex, CM_Connect_MachineA, CM_Connect_MachineW, CM_Disconnect_Machine. - Implement RPC server in umpnpmgr.dll to reply to calls to CM_GetVersion/CM_GetVersion_Ex. Added: trunk/reactos/include/idl/ Added: trunk/reactos/include/idl/pnp.idl Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/include/wine/setupapi.h Modified: trunk/reactos/lib/setupapi/Makefile.in Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/makefile Added: trunk/reactos/lib/setupapi/rpc.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/services/umpnpmgr/makefile Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/setupapi.h _____ Added: trunk/reactos/include/idl/pnp.idl --- trunk/reactos/include/idl/pnp.idl 2005-03-20 20:28:19 UTC (rev 14234) +++ trunk/reactos/include/idl/pnp.idl 2005-03-20 20:43:46 UTC (rev 14235) @@ -0,0 +1,19 @@ +/* + * Plug and Play Manager interface definition + */ + +#define WORD unsigned short + +[ + uuid (809F4e40-A03D-11CE-8F69-08003E30051B), + version(1.0), + pointer_default(unique), + explicit_handle +] +interface pnp +{ +// unsigned long PNP_GetRootDeviceInstance(handle_t BindingHandle, +// [out, string, size_is(Length)] wchar_t *DeviceInstance, +// [in] unsigned long Length); + WORD PNP_GetVersion(handle_t BindingHandle); +} _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-03-20 20:28:19 UTC (rev 14234) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-03-20 20:43:46 UTC (rev 14235) @@ -19,21 +19,39 @@ #ifndef _CFGMGR32_H_ #define _CFGMGR32_H_ +/* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */ +#ifdef __WINESRC__ +# define DECL_WINELIB_CFGMGR32_TYPE_AW(type) /* nothing */ +#else /* __WINESRC__ */ +# define DECL_WINELIB_CFGMGR32_TYPE_AW(type) typedef WINELIB_NAME_AW(type##_) type; +#endif /* __WINESRC__ */ + typedef DWORD CONFIGRET; typedef HANDLE HMACHINE; typedef HMACHINE *PHMACHINE; +typedef DWORD DEVINST; +typedef DEVINST *PDEVINST; -#define CR_SUCCESS 0x00000000 -#define CR_INVALID_DATA 0x0000001F -#define CR_ACCESS_DENIED 0x00000033 +typedef CHAR *DEVINSTID_A; +typedef WCHAR *DEVINSTID_W; +DECL_WINELIB_CFGMGR32_TYPE_AW(DEVINSTID) +#define CR_SUCCESS 0x00000000 +#define CR_OUT_OF_MEMORY 0x00000002 +#define CR_INVALID_DATA 0x0000001F +#define CR_INVALID_MACHINENAME 0x0000002F +#define CR_ACCESS_DENIED 0x00000033 + + 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_Disconnect_Machine( HMACHINE ); +CONFIGRET WINAPI CM_Get_Child( PDEVINST, DEVINST, ULONG ); +CONFIGRET WINAPI CM_Get_Child_Ex( PDEVINST, DEVINST, ULONG, HMACHINE ); 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) @@ -46,5 +64,18 @@ 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_Parent( PDEVINST, DEVINST, ULONG ); +CONFIGRET WINAPI CM_Get_Parent_Ex( PDEVINST, DEVINST, ULONG, HMACHINE ); +CONFIGRET WINAPI CM_Get_Sibling( PDEVINST, DEVINST, ULONG ); +CONFIGRET WINAPI CM_Get_Sibling_Ex( PDEVINST, DEVINST, ULONG, HMACHINE ); +WORD WINAPI CM_Get_Version( VOID ); +WORD WINAPI CM_Get_Version_Ex( HMACHINE ); +CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST, DEVINSTID_A, ULONG); +CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST, DEVINSTID_W, ULONG); +#define CM_Locate_DevNode WINELIB_NAME_AW(CM_Locate_DevNode) +CONFIGRET WINAPI CM_Locate_DevNode_ExA(PDEVINST, DEVINSTID_A, ULONG, HMACHINE); +CONFIGRET WINAPI CM_Locate_DevNode_ExW(PDEVINST, DEVINSTID_W, ULONG, HMACHINE); +#define CM_Locate_DevNode_Ex WINELIB_NAME_AW(CM_Locate_DevNode_Ex) + #endif /* _CFGMGR32_H_ */ _____ Modified: trunk/reactos/include/wine/setupapi.h --- trunk/reactos/include/wine/setupapi.h 2005-03-20 20:28:19 UTC (rev 14234) +++ trunk/reactos/include/wine/setupapi.h 2005-03-20 20:43:46 UTC (rev 14235) @@ -666,6 +666,8 @@ LONG WINAPI AddTagToGroupOrderList(PCWSTR lpGroupName, DWORD dwUnknown2, DWORD dwUnknown3); +DWORD WINAPI CaptureAndConvertAnsiArg(PCSTR lpSrc, PWSTR *lpDst); +DWORD WINAPI CaptureStringArg(PCWSTR lpSrc, PWSTR *lpDst); BOOL WINAPI DelayedMove(PCWSTR lpExistingFileName, PCWSTR lpNewFileName); BOOL WINAPI DoesUserHavePrivilege(PCWSTR lpPrivilegeName); PWSTR WINAPI DuplicateString(PCWSTR lpSrc); _____ Modified: trunk/reactos/lib/setupapi/Makefile.in --- trunk/reactos/lib/setupapi/Makefile.in 2005-03-20 20:28:19 UTC (rev 14234) +++ trunk/reactos/lib/setupapi/Makefile.in 2005-03-20 20:43:46 UTC (rev 14235) @@ -18,7 +18,9 @@ parser.c \ queue.c \ setupcab.c \ - stubs.c + stubs.c \ + rpc.c \ + pnp_c.c C_SRCS16 = \ devinst16.c \ _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-03-20 20:28:19 UTC (rev 14234) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-03-20 20:43:46 UTC (rev 14235) @@ -31,11 +31,20 @@ #include "cfgmgr32.h" #include "setupapi_private.h" +#include "rpc.h" + +#include "pnp.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +typedef struct _MACHINE_INFO +{ + RPC_BINDING_HANDLE BindingHandle; +} MACHINE_INFO, *PMACHINE_INFO; + /*********************************************************************** * CM_Connect_MachineA [SETUPAPI.@] */ @@ -47,14 +56,10 @@ TRACE("%s %p\n", UNCServerName, phMachine); if (UNCServerName == NULL || *UNCServerName == 0) - { return CM_Connect_MachineW(NULL, phMachine); - } if (CaptureAndConvertAnsiArg(UNCServerName, &pServerNameW)) - { return CR_INVALID_DATA; - } ret = CM_Connect_MachineW(pServerNameW, phMachine); @@ -69,8 +74,23 @@ */ CONFIGRET WINAPI CM_Connect_MachineW(PCWSTR UNCServerName, PHMACHINE phMachine) { - FIXME("%s %p\n", debugstr_w(UNCServerName), phMachine); - return CR_ACCESS_DENIED; + PMACHINE_INFO pMachine; + + TRACE("%s %p\n", debugstr_w(UNCServerName), phMachine); + + pMachine = (PMACHINE_INFO)GlobalAlloc(GPTR, sizeof(MACHINE_INFO)); + if (pMachine == NULL) + return CR_OUT_OF_MEMORY; + + if (!PnpBindRpc(UNCServerName, &pMachine->BindingHandle)) + { + GlobalFree(pMachine); + return CR_INVALID_MACHINENAME; + } + + phMachine = (PHMACHINE)pMachine; + + return CR_SUCCESS; } @@ -79,12 +99,46 @@ */ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE hMachine) { - FIXME("%lx\n", hMachine); + PMACHINE_INFO pMachine; + + TRACE("%lx\n", hMachine); + + if (hMachine == NULL) + return CR_SUCCESS; + + pMachine = (PMACHINE_INFO)hMachine; + if (!PnpUnbindRpc(pMachine->BindingHandle)) + return CR_ACCESS_DENIED; + + GlobalFree(pMachine); + return CR_SUCCESS; } /*********************************************************************** + * CM_Get_Child [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Child( + PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) +{ + TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags); + return CM_Get_Sibling_Ex(pdnDevInst, dnDevInst, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Get_Child_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Child_Ex( + PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +{ + TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + return CR_SUCCESS; +} + + +/********************************************************************** * * CM_Get_Device_ID_ListA [SETUPAPI.@] */ CONFIGRET WINAPI CM_Get_Device_ID_ListA( @@ -154,9 +208,8 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter, ULONG ulFlags) { - FIXME("%p %s %ld\n", pulLen, debugstr_w(pszFilter), ulFlags); - *pulLen = 2; - return CR_SUCCESS; + TRACE("%p %s %ld\n", pulLen, debugstr_w(pszFilter), ulFlags); + return CM_Get_Device_ID_List_Size_ExW(pulLen, pszFilter, ulFlags, NULL); } @@ -182,3 +235,128 @@ *pulLen = 2; return CR_SUCCESS; } + + +/********************************************************************** * + * CM_Get_Parent [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Parent( + PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) +{ + TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags); + return CM_Get_Sibling_Ex(pdnDevInst, dnDevInst, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Get_Parent_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Parent_Ex( + PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +{ + TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Get_Sibling [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Sibling( + PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) +{ + TRACE("%p %p %lx\n", pdnDevInst, dnDevInst, ulFlags); + return CM_Get_Sibling_Ex(pdnDevInst, dnDevInst, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Get_Sibling_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Sibling_Ex( + PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +{ + TRACE("%p %lx %lx %lx\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Get_Version [SETUPAPI.@] + */ +WORD WINAPI CM_Get_Version(VOID) +{ + TRACE("\n"); + return CM_Get_Version_Ex(NULL); +} + + +/********************************************************************** * + * CM_Get_Version_Ex [SETUPAPI.@] + */ +WORD WINAPI CM_Get_Version_Ex(HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + RPC_STATUS Status; + + FIXME("%lx\n", hMachine); + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return 0; + } + else + { + Status = PnpGetLocalBindingHandle(&BindingHandle); + if (Status != RPC_S_OK) + return 0; + } + + return PNP_GetVersion(BindingHandle); +} + + +/********************************************************************** * + * CM_Locate_DevNodeA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Locate_DevNodeA( + PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags) +{ + FIXME("%p %p %lu\n", pdnDevInst, pDeviceID, ulFlags); + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Locate_DevNodeW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Locate_DevNodeW( + PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags) +{ + TRACE("%p %p %lu\n", pdnDevInst, pDeviceID, ulFlags); + return CM_Locate_DevNode_ExW(pdnDevInst, pDeviceID, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Locate_DevNode_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Locate_DevNode_ExA( + PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p %p %lu %lx\n", pdnDevInst, pDeviceID, ulFlags, hMachine); + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Locate_DevNode_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Locate_DevNode_ExW( + PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p %p %lu %lx\n", pdnDevInst, pDeviceID, ulFlags, hMachine); + return CR_SUCCESS; +} _____ Modified: trunk/reactos/lib/setupapi/makefile --- trunk/reactos/lib/setupapi/makefile 2005-03-20 20:28:19 UTC (rev 14234) +++ trunk/reactos/lib/setupapi/makefile 2005-03-20 20:43:46 UTC (rev 14235) @@ -4,6 +4,15 @@ TARGET_TYPE = winedll +TARGET_CLEAN = pnp_c.c pnp.h + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk + +WIDL_FLAGS = -o \ + -D _X86_ -D MIDL_PASS \ + -I $(PATH_TO_TOP)/w32api/include + +pnp_c.c pnp.h: $(PATH_TO_TOP)/include/idl/pnp.idl + $(WIDL) $(WIDL_FLAGS) -h -H pnp.h -c -C pnp_c.c $(PATH_TO_TOP)/include/idl/pnp.idl _____ Added: trunk/reactos/lib/setupapi/rpc.c --- trunk/reactos/lib/setupapi/rpc.c 2005-03-20 20:28:19 UTC (rev 14234) +++ trunk/reactos/lib/setupapi/rpc.c 2005-03-20 20:43:46 UTC (rev 14235) @@ -0,0 +1,82 @@ +/* rpc.c */ + +#include <windows.h> +#include <rpc.h> +#include <rpcdce.h> + + +static RPC_BINDING_HANDLE LocalBindingHandle = NULL; + + +RPC_STATUS +PnpBindRpc(LPWSTR pszMachine, + RPC_BINDING_HANDLE* BindingHandle) +{ + PWSTR pszStringBinding = NULL; + RPC_STATUS Status; + + Status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + pszMachine, + L"\\pipe\\umpnpmgr", + NULL, + &pszStringBinding); + if (Status != RPC_S_OK) + return Status; + + Status = RpcBindingFromStringBindingW(pszStringBinding, + BindingHandle); + + RpcStringFreeW(&pszStringBinding); + + return Status; +} + + +RPC_STATUS +PnpUnbindRpc(RPC_BINDING_HANDLE *BindingHandle) +{ + if (BindingHandle != NULL) + { + RpcBindingFree(*BindingHandle); + *BindingHandle = NULL; + } + + return RPC_S_OK; +} + + +RPC_STATUS +PnpGetLocalBindingHandle(RPC_BINDING_HANDLE *BindingHandle) +{ + if (LocalBindingHandle != NULL) + { + BindingHandle = LocalBindingHandle; + return RPC_S_OK; + } + + return PnpBindRpc(NULL, BindingHandle); +} + + +RPC_STATUS +PnpUnbindLocalBindingHandle(VOID) +{ + return PnpUnbindRpc(&LocalBindingHandle); +} + + +void __RPC_FAR * __RPC_USER +midl_user_allocate(size_t len) +{ + return GlobalAlloc(GPTR, len); +} + + +void __RPC_USER +midl_user_free(void __RPC_FAR * ptr) +{ + GlobalFree(ptr); +} + +/* EOF */ _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-03-20 20:28:19 UTC (rev 14234) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-03-20 20:43:46 UTC (rev 14235) @@ -53,8 +53,8 @@ @ stub CM_Free_Res_Des @ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle -@ stub CM_Get_Child -@ stub CM_Get_Child_Ex +@ stdcall CM_Get_Child(ptr long long) +@ stdcall CM_Get_Child_Ex(ptr long long long) @ stub CM_Get_Class_Key_NameA @ stub CM_Get_Class_Key_NameW @ stub CM_Get_Class_Key_Name_ExA @@ -115,23 +115,23 @@ @ stub CM_Get_Next_Log_Conf_Ex @ stub CM_Get_Next_Res_Des @ stub CM_Get_Next_Res_Des_Ex -@ stub CM_Get_Parent -@ stub CM_Get_Parent_Ex +@ stdcall CM_Get_Parent(ptr long long) +@ stdcall CM_Get_Parent_Ex(ptr long long long) @ stub CM_Get_Res_Des_Data @ stub CM_Get_Res_Des_Data_Ex @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex -@ stub CM_Get_Sibling -@ stub CM_Get_Sibling_Ex -@ stub CM_Get_Version -@ stub CM_Get_Version_Ex +@ stdcall CM_Get_Sibling(ptr long long) +@ stdcall CM_Get_Sibling_Ex(ptr long long long) +@ stdcall CM_Get_Version() +@ stdcall CM_Get_Version_Ex(long) @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List @ stub CM_Is_Dock_Station_Present -@ stub CM_Locate_DevNodeA -@ stub CM_Locate_DevNodeW -@ stub CM_Locate_DevNode_ExA -@ stub CM_Locate_DevNode_ExW +@ stdcall CM_Locate_DevNodeA(ptr str long) +@ stdcall CM_Locate_DevNodeW(ptr wstr long) +@ stdcall CM_Locate_DevNode_ExA(ptr str long long) +@ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) @ stub CM_Merge_Range_List @ stub CM_Modify_Res_Des @ stub CM_Modify_Res_Des_Ex _____ Modified: trunk/reactos/services/umpnpmgr/makefile --- trunk/reactos/services/umpnpmgr/makefile 2005-03-20 20:28:19 UTC (rev 14234) +++ trunk/reactos/services/umpnpmgr/makefile 2005-03-20 20:43:46 UTC (rev 14235) @@ -12,12 +12,25 @@ TARGET_SDKLIBS = ntdll.a kernel32.a advapi32.a rpcrt4.a -TARGET_OBJECTS = umpnpmgr.o +TARGET_OBJECTS = umpnpmgr.o pnp_s.o -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API +TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -DUNICODE -D_UNICODE +TARGET_CLEAN = pnp_s.c pnp.h + +DEP_OBJECTS = $(TARGET_OBJECTS) + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk +include $(TOOLS_PATH)/depend.mk + +WIDL_FLAGS = \ + -D _X86_ -D MIDL_PASS \ + -I $(PATH_TO_TOP)/w32api/include + +pnp_s.c pnp.h: $(PATH_TO_TOP)/include/idl/pnp.idl + $(WIDL) $(WIDL_FLAGS) -h -H pnp.h -s -S pnp_s.c $(PATH_TO_TOP)/include/idl/pnp.idl + # EOF _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-03-20 20:28:19 UTC (rev 14234) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-03-20 20:43:46 UTC (rev 14235) @@ -27,9 +27,6 @@ /* INCLUDES *****************************************************************/ -#define UNICODE -#define _UNICODE - #define NTOS_MODE_USER #include <ntos.h> #include <ntos/ntpnp.h> @@ -41,6 +38,8 @@ #include <rpc.h> #include <rpcdce.h> +#include "pnp.h" + #define DBG #define NDEBUG #include <debug.h> @@ -62,6 +61,66 @@ /* FUNCTIONS *****************************************************************/ static DWORD WINAPI +RpcServerThread(LPVOID lpParameter) +{ + RPC_STATUS Status; + + DPRINT("RpcServerThread() called\n"); + + Status = RpcServerUseProtseqEpW(L"ncacn_np", + 20, + L"\\pipe\\umpnpmgr", + NULL); // Security descriptor + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerRegisterIf(pnp_v1_0_s_ifspec, + NULL, + NULL); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerListen(1, + 20, + FALSE); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerListen() failed (Status %lx)\n", Status); + return 0; + } + + DPRINT("RpcServerThread() done\n"); + + return 0; +} + + +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) +{ + return GlobalAlloc(GPTR, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + GlobalFree(ptr); +} + + +//WORD PNP_GetVersion(RPC_BINDING_HANDLE BindingHandle) +WORD PNP_GetVersion(handle_t BindingHandle) +{ + return 0x0400; +} + + +static DWORD WINAPI PnpEventThread(LPVOID lpParameter) { PPLUGPLAY_EVENT_BLOCK PnpEvent; @@ -134,6 +193,15 @@ if (hThread != NULL) CloseHandle(hThread); + hThread = CreateThread(NULL, + 0, + RpcServerThread, + NULL, + 0, + &dwThreadId); + if (hThread != NULL) + CloseHandle(hThread); + DPRINT("ServiceMain() done\n"); } _____ Modified: trunk/reactos/w32api/include/setupapi.h --- trunk/reactos/w32api/include/setupapi.h 2005-03-20 20:28:19 UTC (rev 14234) +++ trunk/reactos/w32api/include/setupapi.h 2005-03-20 20:43:46 UTC (rev 14235) @@ -1031,6 +1031,15 @@ *PSP_BACKUP_QUEUE_PARAMS; #endif /* UNICODE */ + +WINSETUPAPI LONG WINAPI AddTagToGroupOrderList(PCWSTR, DWORD, DWORD); +WINSETUPAPI PWSTR WINAPI DuplicateString(PCWSTR); +WINSETUPAPI BOOL WINAPI IsUserAdmin(VOID); +WINSETUPAPI VOID WINAPI MyFree(PVOID); +WINSETUPAPI PVOID WINAPI MyMalloc(DWORD); +WINSETUPAPI PVOID WINAPI MyRealloc(PVOID, DWORD); +WINSETUPAPI LONG WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE*, PDWORD, PDWORD); + WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC,HINF,HINF,PCSTR,PVOID,UIN T); WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListW(HDSKSPC,HINF,HINF,PCWSTR,PVOID,UI NT); WINSETUPAPI BOOL WINAPI SetupAddSectionToDiskSpaceListA(HDSKSPC,HINF,HINF,PCSTR,UINT,PVOID,UINT) ;

19 years, 6 months

[navaraf] 14234: There's no need to call PropertySheet twice.

by navaraf＠svn.reactos.com

There's no need to call PropertySheet twice. Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.c --- trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-03-20 20:27:56 UTC (rev 14233) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.c 2005-03-20 20:28:19 UTC (rev 14234) @@ -1091,9 +1091,6 @@ psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); /* Display the wizard */ - PropertySheet(&psh); - - return (LONG)(PropertySheet(&psh) != -1); }

19 years, 6 months

[weiden] 14233: added support for template directories (copy ntfs extended attributes) to CreateDirectoryEx()

by weiden＠svn.reactos.com

added support for template directories (copy ntfs extended attributes) to CreateDirectoryEx() Modified: trunk/reactos/lib/kernel32/file/create.c Modified: trunk/reactos/lib/kernel32/file/dir.c _____ Modified: trunk/reactos/lib/kernel32/file/create.c --- trunk/reactos/lib/kernel32/file/create.c 2005-03-20 19:11:52 UTC (rev 14232) +++ trunk/reactos/lib/kernel32/file/create.c 2005-03-20 20:27:56 UTC (rev 14233) @@ -34,15 +34,26 @@ DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) { - PWCHAR FileNameW; + UNICODE_STRING FileNameU; + ANSI_STRING FileName; HANDLE FileHandle; DPRINT("CreateFileA(lpFileName %s)\n",lpFileName); + + RtlInitAnsiString (&FileName, + (LPSTR)lpFileName); + + /* convert ansi (or oem) string to unicode */ + if (bIsFileApiAnsi) + RtlAnsiStringToUnicodeString (&FileNameU, + &FileName, + TRUE); + else + RtlOemStringToUnicodeString (&FileNameU, + &FileName, + TRUE); - if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) - return INVALID_HANDLE_VALUE; - - FileHandle = CreateFileW (FileNameW , + FileHandle = CreateFileW (FileNameU.Buffer, dwDesiredAccess, dwShareMode, lpSecurityAttributes, @@ -50,6 +61,10 @@ dwFlagsAndAttributes, hTemplateFile); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + FileNameU.Buffer); + return FileHandle; } @@ -254,6 +269,7 @@ { /* we successfully read the extended attributes, break the loop and continue */ + EaLength = EaInformation.EaSize; break; } else _____ Modified: trunk/reactos/lib/kernel32/file/dir.c --- trunk/reactos/lib/kernel32/file/dir.c 2005-03-20 19:11:52 UTC (rev 14232) +++ trunk/reactos/lib/kernel32/file/dir.c 2005-03-20 20:27:56 UTC (rev 14233) @@ -34,9 +34,13 @@ LPSECURITY_ATTRIBUTES lpSecurityAttributes ) { - return CreateDirectoryExA (NULL, - lpPathName, - lpSecurityAttributes); + PWCHAR PathNameW; + + if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) + return FALSE; + + return CreateDirectoryW (PathNameW, + lpSecurityAttributes); } @@ -50,25 +54,28 @@ LPCSTR lpNewDirectory, LPSECURITY_ATTRIBUTES lpSecurityAttributes) { - PWCHAR TemplateDirectoryW = NULL; - PWCHAR NewDirectoryW = NULL; + PWCHAR TemplateDirectoryW; + PWCHAR NewDirectoryW; BOOL ret; - if (lpTemplateDirectory != NULL && - !(TemplateDirectoryW = FilenameA2W(lpTemplateDirectory, FALSE))) + if (!(TemplateDirectoryW = FilenameA2W(lpTemplateDirectory, TRUE))) return FALSE; - if (!(NewDirectoryW = FilenameA2W(lpNewDirectory, TRUE))) + if (!(NewDirectoryW = FilenameA2W(lpNewDirectory, FALSE))) + { + RtlFreeHeap (RtlGetProcessHeap (), + 0, + TemplateDirectoryW); return FALSE; + } ret = CreateDirectoryExW (TemplateDirectoryW, - NewDirectoryW, - lpSecurityAttributes); + NewDirectoryW, + lpSecurityAttributes); - if (lpNewDirectory != NULL) - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NewDirectoryW); + RtlFreeHeap (RtlGetProcessHeap (), + 0, + TemplateDirectoryW); return ret; } @@ -84,9 +91,55 @@ LPSECURITY_ATTRIBUTES lpSecurityAttributes ) { - return CreateDirectoryExW (NULL, - lpPathName, - lpSecurityAttributes); + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING NtPathU; + HANDLE DirectoryHandle; + NTSTATUS Status; + + DPRINT ("lpPathName %S lpSecurityAttributes %p\n", + lpPathName, lpSecurityAttributes); + + if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpPathName, + &NtPathU, + NULL, + NULL)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); + + Status = NtCreateFile (&DirectoryHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_CREATE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + + RtlFreeHeap (RtlGetProcessHeap (), + 0, + NtPathU.Buffer); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + NtClose (DirectoryHandle); + + return TRUE; } @@ -103,55 +156,179 @@ { OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING NtPathU; - HANDLE DirectoryHandle; + UNICODE_STRING NtPathU, NtTemplatePathU; + HANDLE DirectoryHandle, TemplateHandle; + FILE_EA_INFORMATION EaInformation; NTSTATUS Status; + PVOID EaBuffer = NULL; + ULONG EaLength = 0; DPRINT ("lpTemplateDirectory %S lpNewDirectory %S lpSecurityAttributes %p\n", lpTemplateDirectory, lpNewDirectory, lpSecurityAttributes); - // Can't create empty directory - if(lpNewDirectory == NULL || *lpNewDirectory == 0) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; - } + /* + * Read the extended attributes from the template directory + */ - if (lpTemplateDirectory != NULL && *lpTemplateDirectory != 0) + if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpTemplateDirectory, + &NtTemplatePathU, + NULL, + NULL)) { - // get object attributes from template directory - DPRINT("KERNEL32:FIXME:%s:%d\n",__FILE__,__LINE__); + SetLastError(ERROR_PATH_NOT_FOUND); return FALSE; } + + InitializeObjectAttributes(&ObjectAttributes, + &NtTemplatePathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreateFile (&TemplateHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + FILE_DIRECTORY_FILE, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap (RtlGetProcessHeap (), + 0, + NtTemplatePathU.Buffer); + SetLastErrorByStatus (Status); + return FALSE; + } + + for (;;) + { + Status = NtQueryInformationFile(TemplateHandle, + &IoStatusBlock, + &EaInformation, + sizeof(FILE_EA_INFORMATION), + FileEaInformation); + if (NT_SUCCESS(Status) && (EaInformation.EaSize != 0)) + { + EaBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + EaInformation.EaSize); + if (EaBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + Status = NtQueryEaFile(TemplateHandle, + &IoStatusBlock, + EaBuffer, + EaInformation.EaSize, + FALSE, + NULL, + 0, + NULL, + TRUE); + + if (NT_SUCCESS(Status)) + { + /* we successfully read the extended attributes */ + EaLength = EaInformation.EaSize; + break; + } + else + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + EaBuffer); + EaBuffer = NULL; + + if (Status != STATUS_BUFFER_TOO_SMALL) + { + /* unless we just allocated not enough memory, break the loop + and just continue without copying extended attributes */ + break; + } + } + } + else + { + /* failure or no extended attributes present, break the loop */ + break; + } + } + + NtClose(TemplateHandle); + + RtlFreeHeap (RtlGetProcessHeap (), + 0, + NtTemplatePathU.Buffer); + + if (!NT_SUCCESS(Status)) + { + /* free the he extended attributes buffer */ + if (EaBuffer != NULL) + { + RtlFreeHeap (RtlGetProcessHeap (), + 0, + EaBuffer); + } + + SetLastErrorByStatus (Status); + return FALSE; + } + + /* + * Create the new directory and copy over the extended attributes if + * needed + */ + if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewDirectory, &NtPathU, NULL, NULL)) + { + /* free the he extended attributes buffer */ + if (EaBuffer != NULL) + { + RtlFreeHeap (RtlGetProcessHeap (), + 0, + EaBuffer); + } + + SetLastError(ERROR_PATH_NOT_FOUND); return FALSE; + } - DPRINT ("NtPathU \'%wZ\'\n", &NtPathU); + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); - ObjectAttributes.Length = sizeof(OBJECT_ATTRIBUTES); - ObjectAttributes.RootDirectory = NULL; - ObjectAttributes.ObjectName = &NtPathU; - ObjectAttributes.Attributes = OBJ_CASE_INSENSITIVE | OBJ_INHERIT; - ObjectAttributes.SecurityDescriptor = NULL; - ObjectAttributes.SecurityQualityOfService = NULL; - Status = NtCreateFile (&DirectoryHandle, - DIRECTORY_ALL_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, NULL, - FILE_ATTRIBUTE_DIRECTORY, - 0, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, - FILE_DIRECTORY_FILE, - NULL, - 0); - DPRINT("Status: %lx\n", Status); + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, + EaBuffer, + EaLength); + /* free the he extended attributes buffer */ + if (EaBuffer != NULL) + { + RtlFreeHeap (RtlGetProcessHeap (), + 0, + EaBuffer); + } + RtlFreeHeap (RtlGetProcessHeap (), 0, NtPathU.Buffer); @@ -212,12 +389,11 @@ NULL)) return FALSE; - ObjectAttributes.Length = sizeof(OBJECT_ATTRIBUTES); - ObjectAttributes.RootDirectory = NULL; - ObjectAttributes.ObjectName = &NtPathU; - ObjectAttributes.Attributes = OBJ_CASE_INSENSITIVE| OBJ_INHERIT; - ObjectAttributes.SecurityDescriptor = NULL; - ObjectAttributes.SecurityQualityOfService = NULL; + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); DPRINT("NtPathU '%S'\n", NtPathU.Buffer); @@ -251,22 +427,14 @@ &FileDispInfo, sizeof(FILE_DISPOSITION_INFORMATION), FileDispositionInformation); + NtClose(DirectoryHandle); + if (!NT_SUCCESS(Status)) { - CHECKPOINT; - NtClose(DirectoryHandle); SetLastErrorByStatus (Status); return FALSE; } - Status = NtClose (DirectoryHandle); - if (!NT_SUCCESS(Status)) - { - CHECKPOINT; - SetLastErrorByStatus (Status); - return FALSE; - } - return TRUE; }

19 years, 6 months

[navaraf] 14232: Initialize the "toc" field in the pdb_lookup structure in order

by navaraf＠svn.reactos.com

Initialize the "toc" field in the pdb_lookup structure in order to prevent pdb_free_lookup from trying to delete invalid pointers. Modified: trunk/reactos/lib/dbghelp/msc.c _____ Modified: trunk/reactos/lib/dbghelp/msc.c --- trunk/reactos/lib/dbghelp/msc.c 2005-03-20 18:55:54 UTC (rev 14231) +++ trunk/reactos/lib/dbghelp/msc.c 2005-03-20 19:11:52 UTC (rev 14232) @@ -2215,6 +2215,7 @@ pdb_lookup.filename = pdb->name; pdb_lookup.kind = PDB_JG; pdb_lookup.u.jg.timestamp = pdb->timestamp; + pdb_lookup.u.jg.toc = NULL; ret = pdb_process_file(pcs, msc_dbg, &pdb_lookup); break; } @@ -2227,6 +2228,7 @@ pdb_lookup.filename = rsds->name; pdb_lookup.kind = PDB_DS; pdb_lookup.u.ds.guid = rsds->guid; + pdb_lookup.u.ds.toc = NULL; ret = pdb_process_file(pcs, msc_dbg, &pdb_lookup); break; }

19 years, 6 months

[weiden] 14231: - added support for template files (copy ntfs extended attributes) to CreateFile()

by weiden＠svn.reactos.com

- added support for template files (copy ntfs extended attributes) to CreateFile() - mask out file flags from dwFlagsAndAttributes before passing them to NtCreateFile as file attributes Modified: trunk/reactos/lib/kernel32/file/create.c _____ Modified: trunk/reactos/lib/kernel32/file/create.c --- trunk/reactos/lib/kernel32/file/create.c 2005-03-20 18:40:57 UTC (rev 14230) +++ trunk/reactos/lib/kernel32/file/create.c 2005-03-20 18:55:54 UTC (rev 14231) @@ -70,20 +70,14 @@ UNICODE_STRING NtPathU; HANDLE FileHandle; NTSTATUS Status; - ULONG Flags = 0; + ULONG FileAttributes, Flags = 0; CSRSS_API_REQUEST Request; CSRSS_API_REPLY Reply; + PVOID EaBuffer = NULL; + ULONG EaLength = 0; DPRINT("CreateFileW(lpFileName %S)\n",lpFileName); - if(hTemplateFile != NULL && hTemplateFile != INVALID_HANDLE_VALUE) - { - /* FIXME */ - DPRINT1("Template file feature not supported yet\n"); - SetLastError(ERROR_NOT_SUPPORTED); - return INVALID_HANDLE_VALUE; - } - /* validate & translate the creation disposition */ switch (dwCreationDisposition) { @@ -128,58 +122,57 @@ /* validate & translate the flags */ /* translate the flags that need no validation */ - if (!(dwFlagsAndAttributes & FILE_FLAG_OVERLAPPED)){ - /* yes, nonalert is correct! apc's are not delivered - while waiting for file io to complete */ - Flags |= FILE_SYNCHRONOUS_IO_NONALERT; - } + if (!(dwFlagsAndAttributes & FILE_FLAG_OVERLAPPED)) + { + /* yes, nonalert is correct! apc's are not delivered + while waiting for file io to complete */ + Flags |= FILE_SYNCHRONOUS_IO_NONALERT; + } if(dwFlagsAndAttributes & FILE_FLAG_WRITE_THROUGH) - Flags |= FILE_WRITE_THROUGH; + Flags |= FILE_WRITE_THROUGH; if(dwFlagsAndAttributes & FILE_FLAG_NO_BUFFERING) - Flags |= FILE_NO_INTERMEDIATE_BUFFERING; + Flags |= FILE_NO_INTERMEDIATE_BUFFERING; if(dwFlagsAndAttributes & FILE_FLAG_RANDOM_ACCESS) - Flags |= FILE_RANDOM_ACCESS; + Flags |= FILE_RANDOM_ACCESS; if(dwFlagsAndAttributes & FILE_FLAG_SEQUENTIAL_SCAN) - Flags |= FILE_SEQUENTIAL_ONLY; + Flags |= FILE_SEQUENTIAL_ONLY; if(dwFlagsAndAttributes & FILE_FLAG_DELETE_ON_CLOSE) - Flags |= FILE_DELETE_ON_CLOSE; + Flags |= FILE_DELETE_ON_CLOSE; if(dwFlagsAndAttributes & FILE_FLAG_BACKUP_SEMANTICS) { - if(dwDesiredAccess & GENERIC_ALL) - Flags |= FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_FOR_RECOVERY; - else - { - if(dwDesiredAccess & GENERIC_READ) - Flags |= FILE_OPEN_FOR_BACKUP_INTENT; - - if(dwDesiredAccess & GENERIC_WRITE) - Flags |= FILE_OPEN_FOR_RECOVERY; - } + if(dwDesiredAccess & GENERIC_ALL) + Flags |= FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_FOR_RECOVERY; + else + { + if(dwDesiredAccess & GENERIC_READ) + Flags |= FILE_OPEN_FOR_BACKUP_INTENT; + + if(dwDesiredAccess & GENERIC_WRITE) + Flags |= FILE_OPEN_FOR_RECOVERY; + } } else - Flags |= FILE_NON_DIRECTORY_FILE; + Flags |= FILE_NON_DIRECTORY_FILE; + + if(dwFlagsAndAttributes & FILE_FLAG_OPEN_REPARSE_POINT) + Flags |= FILE_OPEN_REPARSE_POINT; + + if(dwFlagsAndAttributes & FILE_FLAG_OPEN_NO_RECALL) + Flags |= FILE_OPEN_NO_RECALL; + + FileAttributes = (dwFlagsAndAttributes & (FILE_ATTRIBUTE_VALID_FLAGS & ~FILE_ATTRIBUTE_DIRECTORY)); - - /* handle may allways be waited on and querying attributes are allways allowed */ - dwDesiredAccess |= SYNCHRONIZE|FILE_READ_ATTRIBUTES; + /* handle may allways be waited on and querying attributes are allways allowed */ + dwDesiredAccess |= SYNCHRONIZE | FILE_READ_ATTRIBUTES; /* FILE_FLAG_POSIX_SEMANTICS is handled later */ -#if 0 - /* FIXME: Win32 constants to be defined */ - if(dwFlagsAndAttributes & FILE_FLAG_OPEN_REPARSE_POINT) - Flags |= FILE_OPEN_REPARSE_POINT; - - if(dwFlagsAndAttributes & FILE_FLAG_OPEN_NO_RECALL) - Flags |= FILE_OPEN_NO_RECALL; -#endif - /* check for console output */ if (0 == _wcsicmp(L"CONOUT$", lpFileName)) { @@ -219,15 +212,81 @@ return Reply.Data.GetInputHandleReply.InputHandle; } } + + if (hTemplateFile != NULL) + { + FILE_EA_INFORMATION EaInformation; + for (;;) + { + /* try to get the size of the extended attributes, if we fail just continue + creating the file without copying the attributes! */ + Status = NtQueryInformationFile(hTemplateFile, + &IoStatusBlock, + &EaInformation, + sizeof(FILE_EA_INFORMATION), + FileEaInformation); + if (NT_SUCCESS(Status) && (EaInformation.EaSize != 0)) + { + /* there's extended attributes to read, let's give it a try */ + EaBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + EaInformation.EaSize); + if (EaBuffer == NULL) + { + /* 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); + return INVALID_HANDLE_VALUE; + } + + Status = NtQueryEaFile(hTemplateFile, + &IoStatusBlock, + EaBuffer, + EaInformation.EaSize, + FALSE, + NULL, + 0, + NULL, + TRUE); + + if (NT_SUCCESS(Status)) + { + /* we successfully read the extended attributes, break the loop + and continue */ + break; + } + else + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + EaBuffer); + EaBuffer = NULL; + + if (Status != STATUS_BUFFER_TOO_SMALL) + { + /* unless we just allocated not enough memory, break the loop + and just continue without copying extended attributes */ + break; + } + } + } + else + { + /* we either failed to get the size of the extended attributes or + they're empty, just continue as there's no need to copy + attributes */ + break; + } + } + } + /* build the object attributes */ - InitializeObjectAttributes( - &ObjectAttributes, - &NtPathU, - 0, - NULL, - NULL - ); + InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + 0, + NULL, + NULL); if (lpSecurityAttributes) { @@ -246,14 +305,22 @@ &ObjectAttributes, &IoStatusBlock, NULL, - dwFlagsAndAttributes, + FileAttributes, dwShareMode, dwCreationDisposition, Flags, - NULL, - 0); + EaBuffer, + EaLength); RtlFreeUnicodeString(&NtPathU); + + /* free the extended attributes buffer if allocated */ + if (EaBuffer != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), + 0, + EaBuffer); + } /* error */ if (!NT_SUCCESS(Status))

19 years, 6 months

[navaraf] 14230: Don't use uninitialized variable in _SHExpandEnvironmentStrings.

by navaraf＠svn.reactos.com

Don't use uninitialized variable in _SHExpandEnvironmentStrings. Modified: trunk/reactos/lib/shell32/shellpath.c _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-03-20 18:30:09 UTC (rev 14229) +++ trunk/reactos/lib/shell32/shellpath.c 2005-03-20 18:40:57 UTC (rev 14230) @@ -1522,7 +1522,7 @@ */ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) { - HRESULT hr; + HRESULT hr = S_OK; WCHAR szTemp[MAX_PATH], szProfilesPrefix[MAX_PATH] = { 0 }; TRACE("%s, %p\n", debugstr_w(szSrc), szDest);

19 years, 6 months

[hpoussin] 14229: Based on work by Mark Junker <mjscod@gmx.de>

by hpoussin＠svn.reactos.com

Based on work by Mark Junker <mjscod(a)gmx.de> - Detect UART type - Clear transmit/receive FIFO if applicable Modified: trunk/reactos/drivers/dd/serial/legacy.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/serial.h _____ Modified: trunk/reactos/drivers/dd/serial/legacy.c --- trunk/reactos/drivers/dd/serial/legacy.c 2005-03-20 18:20:59 UTC (rev 14228) +++ trunk/reactos/drivers/dd/serial/legacy.c 2005-03-20 18:30:09 UTC (rev 14229) @@ -6,67 +6,68 @@ * PURPOSE: Legacy serial port enumeration * * PROGRAMMERS: HervÚ Poussineau (poussine(a)freesurf.fr) + * Mark Junker (mjscod(a)gmx.de) */ #define NDEBUG #include "serial.h" -static BOOLEAN -SerialDoesPortExist(PUCHAR BaseAddress) +UART_TYPE +SerialDetectUartType( + IN PUCHAR BaseAddress) { - BOOLEAN Found; - BYTE Mcr; - BYTE Msr; + UCHAR Lcr, TestLcr; + UCHAR OldScr, Scr5A, ScrA5; + BOOLEAN FifoEnabled; + UCHAR NewFifoStatus; - Found = FALSE; + Lcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr ^ 0xFF); + TestLcr = READ_PORT_UCHAR(SER_LCR(BaseAddress)) ^ 0xFF; + WRITE_PORT_UCHAR(SER_LCR(BaseAddress), Lcr); - /* save Modem Control Register (MCR) */ - Mcr = READ_PORT_UCHAR(SER_MCR(BaseAddress)); + /* Accessing the LCR must work for a usable serial port */ + if (TestLcr != Lcr) + return UartUnknown; - /* enable loop mode (set Bit 4 of the MCR) */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), 0x10); + /* Ensure that all following accesses are done as required */ + READ_PORT_UCHAR(SER_RBR(BaseAddress)); + READ_PORT_UCHAR(SER_IER(BaseAddress)); + READ_PORT_UCHAR(SER_IIR(BaseAddress)); + READ_PORT_UCHAR(SER_LCR(BaseAddress)); + READ_PORT_UCHAR(SER_MCR(BaseAddress)); + READ_PORT_UCHAR(SER_LSR(BaseAddress)); + READ_PORT_UCHAR(SER_MSR(BaseAddress)); + READ_PORT_UCHAR(SER_SCR(BaseAddress)); - /* clear all modem output bits */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), 0x10); + /* Test scratch pad */ + OldScr = READ_PORT_UCHAR(SER_SCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0x5A); + Scr5A = READ_PORT_UCHAR(SER_SCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_SCR(BaseAddress), 0xA5); + ScrA5 = READ_PORT_UCHAR(SER_SCR(BaseAddress)); + WRITE_PORT_UCHAR(SER_SCR(BaseAddress), OldScr); - /* read the Modem Status Register */ - Msr = READ_PORT_UCHAR(SER_MSR(BaseAddress)); + /* When non-functional, we have a 8250 */ + if (Scr5A != 0x5A || ScrA5 != 0xA5) + return Uart8250; - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((Msr & 0xf0) == 0x00) + /* Test FIFO type */ + FifoEnabled = (READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0x80) != 0; + WRITE_PORT_UCHAR(SER_FCR(BaseAddress), SR_FCR_ENABLE_FIFO); + NewFifoStatus = READ_PORT_UCHAR(SER_IIR(BaseAddress)) & 0xC0; + if (!FifoEnabled) + WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0); + switch (NewFifoStatus) { - /* set all modem output bits */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), 0x1f); - - /* read the Modem Status Register */ - Msr = READ_PORT_UCHAR(SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((Msr & 0xf0) == 0xf0) - { - /* - * setup a resonable state for the port: - * enable fifo and clear recieve/transmit buffers - */ - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), - (SR_FCR_ENABLE_FIFO | SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT)); - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0); - READ_PORT_UCHAR(SER_RBR(BaseAddress)); - WRITE_PORT_UCHAR(SER_IER(BaseAddress), 0); - Found = TRUE; - } + case 0x00: + return Uart16450; + case 0x80: + return Uart16550; } - /* restore MCR */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), Mcr); - - return Found; + /* FIFO is only functional for 16550A+ */ + return Uart16550A; } NTSTATUS @@ -78,7 +79,8 @@ ULONG ResourceListSize; PCM_RESOURCE_LIST ResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; - BOOLEAN ConflictDetected, FoundPort; + BOOLEAN ConflictDetected; + UART_TYPE UartType; PDEVICE_OBJECT Pdo = NULL; PDEVICE_OBJECT Fdo; KIRQL Dirql; @@ -86,7 +88,7 @@ /* Create resource list */ ResourceListSize = sizeof(CM_RESOURCE_LIST) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(NonPagedPool, ResourceListSize, SERIAL_TAG); + ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, ResourceListSize, SERIAL_TAG); if (!ResourceList) return STATUS_INSUFFICIENT_RESOURCES; ResourceList->Count = 1; @@ -118,16 +120,16 @@ DriverObject, ResourceList, ResourceListSize, NULL, NULL, 0, &ConflictDetected); - if (ConflictDetected) + if (Status == STATUS_CONFLICTING_ADDRESSES) return STATUS_DEVICE_NOT_CONNECTED; if (!NT_SUCCESS(Status)) return Status; /* Test if port exists */ - FoundPort = SerialDoesPortExist((PUCHAR)ComPortBase); + UartType = SerialDetectUartType((PUCHAR)ComPortBase); /* Report device if detected... */ - if (FoundPort) + if (UartType != UartUnknown) { Status = IoReportDetectedDevice( DriverObject, @@ -137,7 +139,7 @@ &Pdo); if (NT_SUCCESS(Status)) { - Status = SerialAddDeviceInternal(DriverObject, Pdo, &Fdo); + Status = SerialAddDeviceInternal(DriverObject, Pdo, UartType, &Fdo); if (NT_SUCCESS(Status)) { Status = SerialPnpStartDevice(Fdo, ResourceList); _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-03-20 18:20:59 UTC (rev 14228) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-03-20 18:30:09 UTC (rev 14229) @@ -17,6 +17,7 @@ SerialAddDeviceInternal( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo, + IN UART_TYPE UartType, OUT PDEVICE_OBJECT* pFdo OPTIONAL) { PDEVICE_OBJECT Fdo = NULL; @@ -69,6 +70,7 @@ DeviceExtension->SerialPortNumber = DeviceNumber++; DeviceExtension->Pdo = Pdo; DeviceExtension->PnpState = dsStopped; + DeviceExtension->UartType = UartType; Status = InitializeCircularBuffer(&DeviceExtension->InputBuffer, 16); if (!NT_SUCCESS(Status)) goto ByeBye; Status = InitializeCircularBuffer(&DeviceExtension->OutputBuffer, 16); @@ -119,7 +121,7 @@ * not called with a NULL Pdo. Block this call (blocks * unfortunately all the other PnP serial ports devices). */ - //return SerialAddDeviceInternal(DriverObject, Pdo, NULL); + //return SerialAddDeviceInternal(DriverObject, Pdo, UartUnknown, NULL); return STATUS_UNSUCCESSFUL; } @@ -142,6 +144,7 @@ KINTERRUPT_MODE InterruptMode = Latched; BOOLEAN ShareInterrupt = TRUE; OBJECT_ATTRIBUTES objectAttributes; + PUCHAR ComPortBase; UNICODE_STRING KeyName; HANDLE hKey; NTSTATUS Status; @@ -197,11 +200,15 @@ * for read/write if we don't have an interrupt */ if (!Dirql) return STATUS_INSUFFICIENT_RESOURCES; + ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + if (DeviceExtension->UartType == UartUnknown) + DeviceExtension->UartType = SerialDetectUartType(ComPortBase); + /* Get current settings */ - DeviceExtension->IER = READ_PORT_UCHAR(SER_IER((PUCHAR)DeviceExtension->BaseAddress)); - DeviceExtension->MCR = READ_PORT_UCHAR(SER_MCR((PUCHAR)DeviceExtension->BaseAddress)); - DeviceExtension->MSR = READ_PORT_UCHAR(SER_MSR((PUCHAR)DeviceExtension->BaseAddress)); + DeviceExtension->IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); + DeviceExtension->MCR = READ_PORT_UCHAR(SER_MCR(ComPortBase)); + DeviceExtension->MSR = READ_PORT_UCHAR(SER_MSR(ComPortBase)); DeviceExtension->WaitMask = 0; /* Set baud rate */ @@ -223,6 +230,13 @@ return Status; } + /* Clear receive/transmit buffers */ + if (DeviceExtension->UartType >= Uart16550) + { + WRITE_PORT_UCHAR(SER_FCR(ComPortBase), + SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT); + } + /* Create link \DosDevices\COMX -> \Device\SerialX */ swprintf(DeviceNameBuffer, L"\\Device\\Serial%lu", DeviceExtension->SerialPortNumber); swprintf(LinkNameBuffer, L"\\DosDevices\\COM%lu", DeviceExtension->ComPort); @@ -267,10 +281,10 @@ DeviceExtension->IER |= 0x1f; /* Activate interrupt mode */ DeviceExtension->IER &= ~1; /* FIXME: Disable receive byte interrupt */ - WRITE_PORT_UCHAR(SER_IER((PUCHAR)DeviceExtension->BaseAddress), DeviceExtension->IER); + WRITE_PORT_UCHAR(SER_IER(ComPortBase), DeviceExtension->IER); DeviceExtension->MCR |= 0x03; /* Activate DTR, RTS */ - WRITE_PORT_UCHAR(SER_MCR((PUCHAR)DeviceExtension->BaseAddress), DeviceExtension->MCR); + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), DeviceExtension->MCR); return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/dd/serial/serial.h --- trunk/reactos/drivers/dd/serial/serial.h 2005-03-20 18:20:59 UTC (rev 14228) +++ trunk/reactos/drivers/dd/serial/serial.h 2005-03-20 18:30:09 UTC (rev 14229) @@ -42,7 +42,8 @@ #error Unknown compiler! #endif -typedef enum { +typedef enum +{ dsStopped, dsStarted, dsPaused, @@ -50,6 +51,15 @@ dsSurpriseRemoved } SERIAL_DEVICE_STATE; +typedef enum +{ + UartUnknown, + Uart8250, + Uart16450, + Uart16550, + Uart16550A +} UART_TYPE; + typedef struct _CIRCULAR_BUFFER { PUCHAR Buffer; @@ -73,6 +83,7 @@ PKINTERRUPT Interrupt; SERIAL_LINE_CONTROL SerialLineControl; + UART_TYPE UartType; ULONG WaitMask; SERIALPERF_STATS SerialPerfStats; @@ -110,8 +121,12 @@ #define SR_IIR_ERROR (SR_IIR_SELF | 6) #define SER_FCR(x) ((x)+2) #define SR_FCR_ENABLE_FIFO 0x01 -#define SR_FCR_CLEAR_RCVR 0x02 -#define SR_FCR_CLEAR_XMIT 0x04 +#define SR_FCR_CLEAR_RCVR (0x02 | SR_FCR_ENABLE_FIFO) +#define SR_FCR_CLEAR_XMIT (0x04 | SR_FCR_ENABLE_FIFO) +#define SR_FCR_1_BYTE (0x00 | SR_FCR_ENABLE_FIFO) +#define SR_FCR_4_BYTES (0x40 | SR_FCR_ENABLE_FIFO) +#define SR_FCR_8_BYTES (0x80 | SR_FCR_ENABLE_FIFO) +#define SR_FCR_14_BYTES (0xC0 | SR_FCR_ENABLE_FIFO) #define SER_LCR(x) ((x)+3) #define SR_LCR_CS5 0x00 #define SR_LCR_CS6 0x01 @@ -210,6 +225,10 @@ /************************************ legacy.c */ +UART_TYPE +SerialDetectUartType( + IN PUCHAR ComPortBase); + NTSTATUS DetectLegacyDevices( IN PDRIVER_OBJECT DriverObject); @@ -237,6 +256,7 @@ SerialAddDeviceInternal( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo, + IN UART_TYPE UartType, OUT PDEVICE_OBJECT* pFdo OPTIONAL); NTSTATUS STDCALL

19 years, 6 months

[greatlrd] 14228: LPUNKNOWN pUnkOuter did check it was NULL and return

by greatlrd＠svn.reactos.com

LPUNKNOWN pUnkOuter did check it was NULL and return forget it should be not equal with NULL it return thx to mifritscher did the first test to find my mistake Modified: trunk/reactos/lib/ddraw/ddraw.c _____ Modified: trunk/reactos/lib/ddraw/ddraw.c --- trunk/reactos/lib/ddraw/ddraw.c 2005-03-20 17:39:11 UTC (rev 14227) +++ trunk/reactos/lib/ddraw/ddraw.c 2005-03-20 18:20:59 UTC (rev 14228) @@ -15,14 +15,14 @@ HRESULT WINAPI DirectDrawCreate(LPGUID lpGUID, LPDIRECTDRAW* lplpDD, LPUNKNOWN pUnkOuter) { - if (pUnkOuter==NULL) return DDERR_INVALIDPARAMS; + if (pUnkOuter!=NULL) return DDERR_INVALIDPARAMS; return DDRAW_Create(lpGUID, (LPVOID*) lplpDD, pUnkOuter, &IID_IDirectDraw, FALSE); } HRESULT WINAPI DirectDrawCreateEx(LPGUID lpGUID, LPVOID* lplpDD, REFIID iid, LPUNKNOWN pUnkOuter) { - if (pUnkOuter==NULL) return DDERR_INVALIDPARAMS; + if (pUnkOuter!=NULL) return DDERR_INVALIDPARAMS; if (!IsEqualGUID(iid, &IID_IDirectDraw7)) return DDERR_INVALIDPARAMS; return DDRAW_Create(lpGUID, lplpDD, pUnkOuter, iid, TRUE);

19 years, 6 months

[gdalsnes] 14227: GetBinaryTypeA, CopyFileExA, CreateFileA, DeleteFileA, MoveFileWithProgressA: Use common A2W conv. routines

by gdalsnes＠svn.reactos.com

GetBinaryTypeA, CopyFileExA, CreateFileA, DeleteFileA, MoveFileWithProgressA: Use common A2W conv. routines Modified: trunk/reactos/lib/kernel32/file/bintype.c Modified: trunk/reactos/lib/kernel32/file/copy.c Modified: trunk/reactos/lib/kernel32/file/create.c Modified: trunk/reactos/lib/kernel32/file/delete.c Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/bintype.c --- trunk/reactos/lib/kernel32/file/bintype.c 2005-03-20 17:26:58 UTC (rev 14226) +++ trunk/reactos/lib/kernel32/file/bintype.c 2005-03-20 17:39:11 UTC (rev 14227) @@ -304,10 +304,7 @@ LPDWORD lpBinaryType ) { - ANSI_STRING FileNameA; - UNICODE_STRING FileName; - NTSTATUS Status; - BOOL Ret; + PWCHAR ApplicationNameW; if(!lpApplicationName || !lpBinaryType) { @@ -315,22 +312,10 @@ return FALSE; } - RtlInitAnsiString(&FileNameA, (LPSTR)lpApplicationName); + if (!(ApplicationNameW = FilenameA2W(lpApplicationName, FALSE))) + return FALSE; - if(bIsFileApiAnsi) - Status = RtlAnsiStringToUnicodeString(&FileName, &FileNameA, TRUE); - else - Status = RtlOemStringToUnicodeString(&FileName, &FileNameA, TRUE); - if(!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - Ret = GetBinaryTypeW(FileName.Buffer, lpBinaryType); - - RtlFreeUnicodeString(&FileName); - return Ret; + return GetBinaryTypeW(ApplicationNameW, lpBinaryType); } /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/file/copy.c --- trunk/reactos/lib/kernel32/file/copy.c 2005-03-20 17:26:58 UTC (rev 14226) +++ trunk/reactos/lib/kernel32/file/copy.c 2005-03-20 17:39:11 UTC (rev 14227) @@ -321,40 +321,18 @@ DWORD dwCopyFlags ) { - UNICODE_STRING ExistingFileNameU; - UNICODE_STRING NewFileNameU; - ANSI_STRING ExistingFileName; - ANSI_STRING NewFileName; + PWCHAR ExistingFileNameW; + PWCHAR NewFileNameW; BOOL Result; - RtlInitAnsiString (&ExistingFileName, - (LPSTR)lpExistingFileName); + if (!(ExistingFileNameW = FilenameA2W(lpExistingFileName, FALSE))) + return FALSE; - RtlInitAnsiString (&NewFileName, - (LPSTR)lpNewFileName); + if (!(NewFileNameW = FilenameA2W(lpNewFileName, TRUE))) + return FALSE; - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - { - RtlAnsiStringToUnicodeString (&ExistingFileNameU, - &ExistingFileName, - TRUE); - RtlAnsiStringToUnicodeString (&NewFileNameU, - &NewFileName, - TRUE); - } - else - { - RtlOemStringToUnicodeString (&ExistingFileNameU, - &ExistingFileName, - TRUE); - RtlOemStringToUnicodeString (&NewFileNameU, - &NewFileName, - TRUE); - } - - Result = CopyFileExW (ExistingFileNameU.Buffer, - NewFileNameU.Buffer, + Result = CopyFileExW (ExistingFileNameW , + NewFileNameW , lpProgressRoutine, lpData, pbCancel, @@ -362,10 +340,7 @@ RtlFreeHeap (RtlGetProcessHeap (), 0, - ExistingFileNameU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NewFileNameU.Buffer); + NewFileNameW); return Result; } _____ Modified: trunk/reactos/lib/kernel32/file/create.c --- trunk/reactos/lib/kernel32/file/create.c 2005-03-20 17:26:58 UTC (rev 14226) +++ trunk/reactos/lib/kernel32/file/create.c 2005-03-20 17:39:11 UTC (rev 14227) @@ -34,26 +34,15 @@ DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) { - UNICODE_STRING FileNameU; - ANSI_STRING FileName; + PWCHAR FileNameW; HANDLE FileHandle; DPRINT("CreateFileA(lpFileName %s)\n",lpFileName); - - RtlInitAnsiString (&FileName, - (LPSTR)lpFileName); - - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - RtlAnsiStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - else - RtlOemStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - FileHandle = CreateFileW (FileNameU.Buffer, + if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) + return INVALID_HANDLE_VALUE; + + FileHandle = CreateFileW (FileNameW , dwDesiredAccess, dwShareMode, lpSecurityAttributes, @@ -61,10 +50,6 @@ dwFlagsAndAttributes, hTemplateFile); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - FileNameU.Buffer); - return FileHandle; } _____ Modified: trunk/reactos/lib/kernel32/file/delete.c --- trunk/reactos/lib/kernel32/file/delete.c 2005-03-20 17:26:58 UTC (rev 14226) +++ trunk/reactos/lib/kernel32/file/delete.c 2005-03-20 17:39:11 UTC (rev 14227) @@ -28,30 +28,12 @@ LPCSTR lpFileName ) { - UNICODE_STRING FileNameU; - ANSI_STRING FileName; - BOOL Result; + PWCHAR FileNameW; + + if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) + return FALSE; - RtlInitAnsiString (&FileName, - (LPSTR)lpFileName); - - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - RtlAnsiStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - else - RtlOemStringToUnicodeString (&FileNameU, - &FileName, - TRUE); - - Result = DeleteFileW (FileNameU.Buffer); - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - FileNameU.Buffer); - - return Result; + return DeleteFileW (FileNameW); } _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-03-20 17:26:58 UTC (rev 14226) +++ trunk/reactos/lib/kernel32/file/move.c 2005-03-20 17:39:11 UTC (rev 14227) @@ -306,52 +306,25 @@ DWORD dwFlags ) { - UNICODE_STRING ExistingFileNameU; - UNICODE_STRING NewFileNameU; - ANSI_STRING ExistingFileName; - ANSI_STRING NewFileName; - BOOL Result; + PWCHAR ExistingFileNameW; + PWCHAR NewFileNameW; + BOOL ret; + + if (!(ExistingFileNameW = FilenameA2W(lpExistingFileName, FALSE))) + return FALSE; - RtlInitAnsiString (&ExistingFileName, - (LPSTR)lpExistingFileName); + if (!(NewFileNameW= FilenameA2W(lpNewFileName, TRUE))) + return FALSE; - RtlInitAnsiString (&NewFileName, - (LPSTR)lpNewFileName); - - /* convert ansi (or oem) string to unicode */ - if (bIsFileApiAnsi) - { - RtlAnsiStringToUnicodeString (&ExistingFileNameU, - &ExistingFileName, - TRUE); - RtlAnsiStringToUnicodeString (&NewFileNameU, - &NewFileName, - TRUE); - } - else - { - RtlOemStringToUnicodeString (&ExistingFileNameU, - &ExistingFileName, - TRUE); - RtlOemStringToUnicodeString (&NewFileNameU, - &NewFileName, - TRUE); - } - - Result = MoveFileWithProgressW (ExistingFileNameU.Buffer, - NewFileNameU.Buffer, + ret = MoveFileWithProgressW (ExistingFileNameW , + NewFileNameW, lpProgressRoutine, lpData, dwFlags); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - ExistingFileNameU.Buffer); - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NewFileNameU.Buffer); + RtlFreeHeap (RtlGetProcessHeap (), 0, NewFileNameW); - return Result; + return ret; }

19 years, 6 months

[gdalsnes] 14226: removed faulty FilenameA2U (returned ptr to stack var)

by gdalsnes＠svn.reactos.com

removed faulty FilenameA2U (returned ptr to stack var) remove faulty init of StaticUnicodeString (now done in ntdll) Modified: trunk/reactos/lib/kernel32/file/curdir.c Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/include/kernel32.h Modified: trunk/reactos/lib/kernel32/misc/dllmain.c _____ Modified: trunk/reactos/lib/kernel32/file/curdir.c --- trunk/reactos/lib/kernel32/file/curdir.c 2005-03-20 17:24:11 UTC (rev 14225) +++ trunk/reactos/lib/kernel32/file/curdir.c 2005-03-20 17:26:58 UTC (rev 14226) @@ -83,23 +83,14 @@ LPCSTR lpPathName ) { - PUNICODE_STRING PathNameU; - NTSTATUS Status; + PWCHAR PathNameW; DPRINT("setcurrdir: %s\n",lpPathName); - if (!(PathNameU = FilenameA2U(lpPathName, FALSE))) + if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) return FALSE; - Status = RtlSetCurrentDirectory_U(PathNameU); - - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return FALSE; - } - - return TRUE; + return SetCurrentDirectoryW(PathNameW); } _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2005-03-20 17:24:11 UTC (rev 14225) +++ trunk/reactos/lib/kernel32/file/file.c 2005-03-20 17:26:58 UTC (rev 14226) @@ -26,20 +26,10 @@ /* FUNCTIONS ****************************************************************/ -PWCHAR + +PWCHAR FilenameA2W(LPCSTR NameA, BOOL alloc) { - PUNICODE_STRING pstrW; - - pstrW = FilenameA2U(NameA, alloc); - - return pstrW ? pstrW->Buffer : NULL; -} - - -PUNICODE_STRING -FilenameA2U(LPCSTR NameA, BOOL alloc) -{ ANSI_STRING str; UNICODE_STRING strW; PUNICODE_STRING pstrW; @@ -57,7 +47,7 @@ Status= RtlOemStringToUnicodeString( pstrW, &str, alloc ); if (NT_SUCCESS(Status)) - return pstrW; + return pstrW->Buffer; if (Status== STATUS_BUFFER_OVERFLOW) SetLastError( ERROR_FILENAME_EXCED_RANGE ); @@ -134,7 +124,9 @@ } - +/* +Return: num. TCHARS copied into dest including nullterm +*/ DWORD FilenameA2W_N( LPWSTR dest, @@ -154,10 +146,12 @@ if (ret) dest[(ret/sizeof(WCHAR))-1]=0; - return ret; + return ret/sizeof(WCHAR); } - +/* +Return: num. TCHARS copied into dest including nullterm +*/ DWORD FilenameW2A_N( LPSTR dest, _____ Modified: trunk/reactos/lib/kernel32/include/kernel32.h --- trunk/reactos/lib/kernel32/include/kernel32.h 2005-03-20 17:24:11 UTC (rev 14225) +++ trunk/reactos/lib/kernel32/include/kernel32.h 2005-03-20 17:26:58 UTC (rev 14226) @@ -62,7 +62,6 @@ PWCHAR FilenameA2W(LPCSTR NameA, BOOL alloc); -PUNICODE_STRING FilenameA2U(LPCSTR NameA, BOOL alloc); DWORD FilenameW2A_FitOrFail(LPSTR DestA, INT destLen, LPCWSTR SourceW, INT sourceLen); DWORD FilenameU2A_FitOrFail(LPSTR DestA, INT destLen, PUNICODE_STRING SourceU); _____ Modified: trunk/reactos/lib/kernel32/misc/dllmain.c --- trunk/reactos/lib/kernel32/misc/dllmain.c 2005-03-20 17:24:11 UTC (rev 14225) +++ trunk/reactos/lib/kernel32/misc/dllmain.c 2005-03-20 17:26:58 UTC (rev 14226) @@ -82,7 +82,6 @@ LPVOID lpReserved) { NTSTATUS Status; - PTEB Teb = NtCurrentTeb(); (void)lpReserved; @@ -149,10 +148,6 @@ SetConsoleCtrlHandler(DefaultConsoleCtrlHandler, TRUE); - Teb->StaticUnicodeString.Length = 0; - Teb->StaticUnicodeString.MaximumLength = sizeof(Teb->StaticUnicodeBuffer); - Teb->StaticUnicodeString.Buffer = Teb->StaticUnicodeBuffer; - /* Insert more dll attach stuff here! */ DllInitialized = TRUE; @@ -178,14 +173,6 @@ } break; - case DLL_THREAD_ATTACH: - - Teb->StaticUnicodeString.Length = 0; - Teb->StaticUnicodeString.MaximumLength = sizeof(Teb->StaticUnicodeBuffer); - Teb->StaticUnicodeString.Buffer = Teb->StaticUnicodeBuffer; - break; - - default: break; }

19 years, 6 months

← Newer
1
...
14
15
16
17
18
19
20
...
61
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 March 2005