Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[dreimer] 66437: [NEWDEV] German update by GonzoMD Some tidy up in the *seemslikebuttonsthrownintoaguieditor* coordinates

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Feb 23 23:14:51 2015 New Revision: 66437 URL: http://svn.reactos.org/svn/reactos?rev=66437&view=rev Log: [NEWDEV] German update by GonzoMD Some tidy up in the *seemslikebuttonsthrownintoaguieditor* coordinates Modified: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc trunk/reactos/dll/win32/newdev/lang/de-DE.rc trunk/reactos/dll/win32/newdev/lang/el-GR.rc trunk/reactos/dll/win32/newdev/lang/en-US.rc trunk/reactos/dll/win32/newdev/lang/es-ES.rc trunk/reactos/dll/win32/newdev/lang/fr-FR.rc trunk/reactos/dll/win32/newdev/lang/he-IL.rc trunk/reactos/dll/win32/newdev/lang/hu-HU.rc trunk/reactos/dll/win32/newdev/lang/id-ID.rc trunk/reactos/dll/win32/newdev/lang/it-IT.rc trunk/reactos/dll/win32/newdev/lang/ja-JP.rc trunk/reactos/dll/win32/newdev/lang/nl-NL.rc trunk/reactos/dll/win32/newdev/lang/no-NO.rc trunk/reactos/dll/win32/newdev/lang/pl-PL.rc trunk/reactos/dll/win32/newdev/lang/ro-RO.rc trunk/reactos/dll/win32/newdev/lang/ru-RU.rc trunk/reactos/dll/win32/newdev/lang/sk-SK.rc trunk/reactos/dll/win32/newdev/lang/sq-AL.rc trunk/reactos/dll/win32/newdev/lang/th-TH.rc trunk/reactos/dll/win32/newdev/lang/tr-TR.rc trunk/reactos/dll/win32/newdev/lang/uk-UA.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/bg-B… Modified: trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/cs-C… Modified: trunk/reactos/dll/win32/newdev/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/de-D… Modified: trunk/reactos/dll/win32/newdev/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/el-G… Modified: trunk/reactos/dll/win32/newdev/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/en-U… Modified: trunk/reactos/dll/win32/newdev/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/es-E… Modified: trunk/reactos/dll/win32/newdev/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/fr-F… Modified: trunk/reactos/dll/win32/newdev/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/he-I… Modified: trunk/reactos/dll/win32/newdev/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/hu-H… Modified: trunk/reactos/dll/win32/newdev/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/id-I… Modified: trunk/reactos/dll/win32/newdev/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/it-I… Modified: trunk/reactos/dll/win32/newdev/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ja-J… Modified: trunk/reactos/dll/win32/newdev/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/nl-N… Modified: trunk/reactos/dll/win32/newdev/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/no-N… Modified: trunk/reactos/dll/win32/newdev/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/pl-P… Modified: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ro-R… Modified: trunk/reactos/dll/win32/newdev/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ru-R… Modified: trunk/reactos/dll/win32/newdev/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/sk-S… Modified: trunk/reactos/dll/win32/newdev/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/sq-A… Modified: trunk/reactos/dll/win32/newdev/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/th-T… Modified: trunk/reactos/dll/win32/newdev/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/tr-T… Modified: trunk/reactos/dll/win32/newdev/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/uk-U…

9 years, 6 months

[ekohl] 66436: [NETAPI32] CORE-9248 Comment out NetGetJoinInformation and NetWkstaGetInfo in wksta.c and reimplement them as RPC client functions to the workstation service in wksta_new.c.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Feb 23 22:55:43 2015 New Revision: 66436 URL: http://svn.reactos.org/svn/reactos?rev=66436&view=rev Log: [NETAPI32] CORE-9248 Comment out NetGetJoinInformation and NetWkstaGetInfo in wksta.c and reimplement them as RPC client functions to the workstation service in wksta_new.c. Added: trunk/reactos/dll/win32/netapi32/wksta_new.c (with props) Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/wksta.c Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Mon Feb 23 22:55:43 2015 @@ -1,8 +1,11 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/idl + ${REACTOS_SOURCE_DIR}/include/reactos/wine) + add_definitions(-D__WINESRC__) - spec2def(netapi32.dll netapi32.spec ADD_IMPORTLIB) +add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/wkssvc.idl) list(APPEND SOURCE access.c @@ -20,7 +23,9 @@ share.c user.c wksta.c - netapi32.h) + wksta_new.c + netapi32.h + ${CMAKE_CURRENT_BINARY_DIR}/wkssvc_c.c) add_library(netapi32 SHARED ${SOURCE} @@ -28,8 +33,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def) set_module_type(netapi32 win32dll) -target_link_libraries(netapi32 wine) -add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll) +target_link_libraries(netapi32 wine ${PSEH_LIB}) +add_importlibs(netapi32 iphlpapi ws2_32 advapi32 rpcrt4 msvcrt kernel32 ntdll) add_delay_importlibs(netapi32 samlib secur32) add_pch(netapi32 netapi32.h SOURCE) add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Mon Feb 23 22:55:43 2015 @@ -464,6 +464,7 @@ return ERROR_INVALID_PARAMETER; } +#if 0 NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level, LPBYTE* bufptr) { @@ -566,4 +567,4 @@ return NERR_Success; } - +#endif Added: trunk/reactos/dll/win32/netapi32/wksta_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta_n… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta_new.c (added) +++ trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] Mon Feb 23 22:55:43 2015 @@ -0,0 +1,197 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: NetAPI DLL + * FILE: reactos/dll/win32/netapi32/wksta_new.c + * PURPOSE: Workstation service interface code + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ******************************************************************/ + +#include "netapi32.h" +#include "wkssvc_c.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/* FUNCTIONS *****************************************************************/ + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +handle_t __RPC_USER +WKSSVC_IDENTIFY_HANDLE_bind(WKSSVC_IDENTIFY_HANDLE pszSystemName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + TRACE("WKSSVC_IDENTIFY_HANDLE_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + pszSystemName, + L"\\pipe\\wkssvc", + NULL, + &pszStringBinding); + if (status) + { + TRACE("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { +// TRACE("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +WKSSVC_IDENTIFY_HANDLE_unbind(WKSSVC_IDENTIFY_HANDLE pszSystemName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("WKSSVC_IDENTIFY_HANDLE_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + TRACE("RpcBindingFree returned 0x%x\n", status); + } +} + + +handle_t __RPC_USER +WKSSVC_IMPERSONATE_HANDLE_bind(WKSSVC_IMPERSONATE_HANDLE pszSystemName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + TRACE("WKSSVC_IMPERSONATE_HANDLE_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + pszSystemName, + L"\\pipe\\wkssvc", + NULL, + &pszStringBinding); + if (status) + { + TRACE("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { +// TRACE("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +WKSSVC_IMPERSONATE_HANDLE_unbind(WKSSVC_IMPERSONATE_HANDLE pszSystemName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("WKSSVC_IMPERSONATE_HANDLE_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + TRACE("RpcBindingFree returned 0x%x\n", status); + } +} + + +NET_API_STATUS +NET_API_FUNCTION +NetGetJoinInformation( + LPCWSTR Server, + LPWSTR *Name, + PNETSETUP_JOIN_STATUS type) +{ + NET_API_STATUS status; + + FIXME("Stub %s %p %p\n", wine_dbgstr_w(Server), Name, type); + + if (Name == NULL || type == NULL) + return ERROR_INVALID_PARAMETER; + + RpcTryExcept + { + status = NetrGetJoinInformation((LPWSTR)Server, + Name, + type); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetWkstaGetInfo( + LMSTR servername, + DWORD level, + LPBYTE *bufptr) +{ + NET_API_STATUS status; + + *bufptr = NULL; + + RpcTryExcept + { + status = NetrWkstaGetInfo(servername, + level, + (LPWKSTA_INFO)bufptr); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/netapi32/wksta_new.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 6 months

[akhaldi] 66435: [DINPUT] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Feb 23 20:20:45 2015 New Revision: 66435 URL: http://svn.reactos.org/svn/reactos?rev=66435&view=rev Log: [DINPUT] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/directx/wine/dinput/dinput_main.c trunk/reactos/dll/directx/wine/dinput/joystick.c trunk/reactos/dll/directx/wine/dinput/joystick_linux.c trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c trunk/reactos/dll/directx/wine/dinput/keyboard.c trunk/reactos/dll/directx/wine/dinput/mouse.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -60,10 +60,6 @@ return CONTAINING_RECORD( iface, IDirectInputImpl, IDirectInput8W_iface ); } -static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) -{ - return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8A_iface); -} static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) { return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface); Modified: trunk/reactos/dll/directx/wine/dinput/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -398,16 +398,38 @@ return JoystickWGenericImpl_SetProperty(IDirectInputDevice8W_from_impl(This), rguid, ph); } +#define DEBUG_TYPE(x) case (x): str = #x; break void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) { + int type = GET_DIDEVICE_TYPE(lpDIDevCaps->dwDevType); + const char *str; TRACE("dwSize: %d\n", lpDIDevCaps->dwSize); TRACE("dwFlags: %08x\n", lpDIDevCaps->dwFlags); - TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType, - lpDIDevCaps->dwDevType == DIDEVTYPE_DEVICE ? "DIDEVTYPE_DEVICE" : - lpDIDevCaps->dwDevType == DIDEVTYPE_MOUSE ? "DIDEVTYPE_MOUSE" : - lpDIDevCaps->dwDevType == DIDEVTYPE_KEYBOARD ? "DIDEVTYPE_KEYBOARD" : - lpDIDevCaps->dwDevType == DIDEVTYPE_JOYSTICK ? "DIDEVTYPE_JOYSTICK" : - lpDIDevCaps->dwDevType == DIDEVTYPE_HID ? "DIDEVTYPE_HID" : "UNKNOWN"); + switch(type) + { + /* Directx <= 7 definitions */ + DEBUG_TYPE(DIDEVTYPE_DEVICE); + DEBUG_TYPE(DIDEVTYPE_MOUSE); + DEBUG_TYPE(DIDEVTYPE_KEYBOARD); + DEBUG_TYPE(DIDEVTYPE_JOYSTICK); + DEBUG_TYPE(DIDEVTYPE_HID); + /* Directx >= 8 definitions */ + DEBUG_TYPE(DI8DEVTYPE_DEVICE); + DEBUG_TYPE(DI8DEVTYPE_MOUSE); + DEBUG_TYPE(DI8DEVTYPE_KEYBOARD); + DEBUG_TYPE(DI8DEVTYPE_JOYSTICK); + DEBUG_TYPE(DI8DEVTYPE_GAMEPAD); + DEBUG_TYPE(DI8DEVTYPE_DRIVING); + DEBUG_TYPE(DI8DEVTYPE_FLIGHT); + DEBUG_TYPE(DI8DEVTYPE_1STPERSON); + DEBUG_TYPE(DI8DEVTYPE_DEVICECTRL); + DEBUG_TYPE(DI8DEVTYPE_SCREENPOINTER); + DEBUG_TYPE(DI8DEVTYPE_REMOTE); + DEBUG_TYPE(DI8DEVTYPE_SUPPLEMENTAL); + default: str = "UNKNOWN"; + } + + TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType, str); TRACE("dwAxes: %d\n", lpDIDevCaps->dwAxes); TRACE("dwButtons: %d\n", lpDIDevCaps->dwButtons); TRACE("dwPOVs: %d\n", lpDIDevCaps->dwPOVs); @@ -419,6 +441,7 @@ TRACE("dwFFDriverVersion: %d\n", lpDIDevCaps->dwFFDriverVersion); } } +#undef DEBUG_TYPE HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) { Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linux.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -87,10 +87,7 @@ return CONTAINING_RECORD(CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), JoystickGenericImpl, base), JoystickImpl, generic); } -static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(JoystickImpl *This) -{ - return &This->generic.base.IDirectInputDevice8A_iface; -} + static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) { return &This->generic.base.IDirectInputDevice8W_iface; @@ -149,6 +146,9 @@ WARN("ioctl(%s,JSIOCGAXES) failed: %s, defauting to 2\n", joydev.device, strerror(errno)); joydev.axis_count = 2; } +#else + WARN("reading number of joystick axes unsupported in this platform, defaulting to 2\n"); + joydev.axis_count = 2; #endif #ifdef JSIOCGBUTTONS if (ioctl(fd, JSIOCGBUTTONS, &joydev.button_count) < 0) @@ -156,6 +156,9 @@ WARN("ioctl(%s,JSIOCGBUTTONS) failed: %s, defauting to 2\n", joydev.device, strerror(errno)); joydev.button_count = 2; } +#else + WARN("reading number of joystick buttons unsupported in this platform, defaulting to 2\n"); + joydev.button_count = 2; #endif if (ioctl(fd, JSIOCGAXMAP, axes_map) < 0) Modified: trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/jo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/joystick_linuxinput.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -124,10 +124,7 @@ return CONTAINING_RECORD(CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), JoystickGenericImpl, base), JoystickImpl, generic); } -static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(JoystickImpl *This) -{ - return &This->generic.base.IDirectInputDevice8A_iface; -} + static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(JoystickImpl *This) { return &This->generic.base.IDirectInputDevice8W_iface; Modified: trunk/reactos/dll/directx/wine/dinput/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/ke… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/keyboard.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -318,6 +318,10 @@ if (len != This->base.data_format.user_df->dwDataSize ) return DIERR_INVALIDPARAM; + +#ifndef __REACTOS__ + __wine_check_for_events( QS_ALLINPUT ); +#endif EnterCriticalSection(&This->base.crit); Modified: trunk/reactos/dll/directx/wine/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/mo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/mouse.c [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -66,10 +66,7 @@ { return CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), SysMouseImpl, base); } -static inline IDirectInputDevice8A *IDirectInputDevice8A_from_impl(SysMouseImpl *This) -{ - return &This->base.IDirectInputDevice8A_iface; -} + static inline IDirectInputDevice8W *IDirectInputDevice8W_from_impl(SysMouseImpl *This) { return &This->base.IDirectInputDevice8W_iface; @@ -536,6 +533,10 @@ if(This->base.acquired == 0) return DIERR_NOTACQUIRED; +#ifndef __REACTOS__ + __wine_check_for_events( QS_ALLINPUT ); +#endif + TRACE("(this=%p,0x%08x,%p):\n", This, len, ptr); _dump_mouse_state(&This->m_state); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Feb 23 20:20:45 2015 @@ -36,7 +36,7 @@ reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.27 reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27 -reactos/dll/directx/wine/dinput # Synced to Wine-1.7.27 +reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/dinput8 # Synced to Wine-1.7.27 reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.27 reactos/dll/directx/wine/dplay # Synced to Wine-1.7.27

9 years, 6 months

[akhaldi] 66434: [D3DXOF] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Feb 23 19:47:46 2015 New Revision: 66434 URL: http://svn.reactos.org/svn/reactos?rev=66434&view=rev Log: [D3DXOF] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dxof/d3… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dxof/d3dxof.c [iso-8859-1] Mon Feb 23 19:47:46 2015 @@ -28,7 +28,6 @@ static const struct IDirectXFileDataVtbl IDirectXFileData_Vtbl; static const struct IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl; static const struct IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl; -static const struct IDirectXFileObjectVtbl IDirectXFileObject_Vtbl; static const struct IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl; static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImpl** ppObj); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Feb 23 19:47:46 2015 @@ -33,7 +33,7 @@ reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.27 -reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.27 +reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.27 reactos/dll/directx/wine/devenum # Synced to Wine-1.7.27 reactos/dll/directx/wine/dinput # Synced to Wine-1.7.27

9 years, 6 months

[tfaber] 66433: [NTDLL:LDR] - Apply OffsetModuleName to the first import entry, not the current one in LdrpUpdateLoadCount3. Fixes missing reference updates on dependency-loaded DLLs. CORE-5125 COR...

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Feb 23 19:03:08 2015 New Revision: 66433 URL: http://svn.reactos.org/svn/reactos?rev=66433&view=rev Log: [NTDLL:LDR] - Apply OffsetModuleName to the first import entry, not the current one in LdrpUpdateLoadCount3. Fixes missing reference updates on dependency-loaded DLLs. CORE-5125 CORE-7127 #resolve Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Mon Feb 23 19:03:08 2015 @@ -223,6 +223,7 @@ OUT PUNICODE_STRING UpdateString) { PIMAGE_BOUND_FORWARDER_REF NewImportForwarder; + PIMAGE_BOUND_IMPORT_DESCRIPTOR FirstEntry; PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry; PIMAGE_IMPORT_DESCRIPTOR ImportEntry; PIMAGE_THUNK_DATA FirstThunk; @@ -256,12 +257,12 @@ ImportNameUnic = &NtCurrentTeb()->StaticUnicodeString; /* Try to get the new import entry */ - BoundEntry = (PIMAGE_BOUND_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(LdrEntry->DllBase, - TRUE, - IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT, - &ImportSize); - - if (BoundEntry) + FirstEntry = RtlImageDirectoryEntryToData(LdrEntry->DllBase, + TRUE, + IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT, + &ImportSize); + + if (FirstEntry) { /* Set entry flags if refing/derefing */ if (Flags == LDRP_UPDATE_REFCOUNT) @@ -269,10 +270,11 @@ else if (Flags == LDRP_UPDATE_DEREFCOUNT) LdrEntry->Flags |= LDRP_UNLOAD_IN_PROGRESS; + BoundEntry = FirstEntry; while (BoundEntry->OffsetModuleName) { /* Get pointer to the current import name */ - ImportName = (PCHAR)BoundEntry + BoundEntry->OffsetModuleName; + ImportName = (LPSTR)FirstEntry + BoundEntry->OffsetModuleName; RtlInitAnsiString(&ImportNameAnsi, ImportName); Status = RtlAnsiStringToUnicodeString(ImportNameUnic, &ImportNameAnsi, FALSE); @@ -315,9 +317,9 @@ /* Go through forwarders */ NewImportForwarder = (PIMAGE_BOUND_FORWARDER_REF)(BoundEntry + 1); - for (i=0; i<BoundEntry->NumberOfModuleForwarderRefs; i++) - { - ImportName = (PCHAR)BoundEntry + NewImportForwarder->OffsetModuleName; + for (i = 0; i < BoundEntry->NumberOfModuleForwarderRefs; i++) + { + ImportName = (LPSTR)FirstEntry + NewImportForwarder->OffsetModuleName; RtlInitAnsiString(&ImportNameAnsi, ImportName); Status = RtlAnsiStringToUnicodeString(ImportNameUnic, &ImportNameAnsi, FALSE);

9 years, 6 months

[akhaldi] 66432: [D3DX9_30] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Feb 23 19:01:22 2015 New Revision: 66432 URL: http://svn.reactos.org/svn/reactos?rev=66432&view=rev Log: [D3DX9_30] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c Modified: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.spec [iso-8859-1] Mon Feb 23 19:01:22 2015 @@ -30,7 +30,7 @@ @ stdcall D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXConcatenateMeshes @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToSingleStrip @ stdcall D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToStrips -@ stdcall -stub D3DXCpuOptimizations(long) +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) d3dx9_36.D3DXCreateAnimationController @ stdcall D3DXCreateBox(ptr float float float ptr ptr) d3dx9_36.D3DXCreateBox @ stdcall D3DXCreateBuffer(long ptr) d3dx9_36.D3DXCreateBuffer Modified: trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_30/d3dx9_30_main.c [iso-8859-1] Mon Feb 23 19:01:22 2015 @@ -35,6 +35,10 @@ #include <d3dx9.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + /*********************************************************************** * DllMain. */ @@ -62,3 +66,17 @@ else return FALSE; } + +typedef enum _D3DX_CPU_OPTIMIZATION +{ + D3DX_NOT_OPTIMIZED = 0, + D3DX_3DNOW_OPTIMIZED = 1, + D3DX_SSE2_OPTIMIZED = 2, + D3DX_SSE_OPTIMIZED = 3 +} D3DX_CPU_OPTIMIZATION; + +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) +{ + FIXME("%i - stub\n", enable); + return D3DX_NOT_OPTIMIZED; +}

9 years, 6 months

[akhaldi] 66431: [PSDK] Apply our header formatting style on windns.h. NFC.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Feb 23 18:54:14 2015 New Revision: 66431 URL: http://svn.reactos.org/svn/reactos?rev=66431&view=rev Log: [PSDK] Apply our header formatting style on windns.h. NFC. Modified: trunk/reactos/include/psdk/windns.h Modified: trunk/reactos/include/psdk/windns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windns.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windns.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windns.h [iso-8859-1] Mon Feb 23 18:54:14 2015 @@ -1,156 +1,166 @@ -#ifndef _WINDNS_H -#define _WINDNS_H +#ifndef _WINDNS_INCLUDED_ +#define _WINDNS_INCLUDED_ #ifdef __cplusplus extern "C" { #endif -#define DNS_QUERY_STANDARD 0x0 +#define DNS_QUERY_STANDARD 0x0 #define DNS_QUERY_ACCEPT_TRUNCATED_RESPONSE 0x1 -#define DNS_QUERY_USE_TCP_ONLY 0x2 -#define DNS_QUERY_NO_RECURSION 0x4 -#define DNS_QUERY_BYPASS_CACHE 0x8 -#define DNS_QUERY_NO_WIRE_QUERY 0x10 -#define DNS_QUERY_NO_LOCAL_NAME 0x20 -#define DNS_QUERY_NO_HOSTS_FILE 0x40 -#define DNS_QUERY_NO_NETBT 0x80 -#define DNS_QUERY_TREAT_AS_FQDN 0x1000 -#define DNS_QUERY_WIRE_ONLY 0x100 -#define DNS_QUERY_RETURN_MESSAGE 0x200 -#define DNS_QUERY_DONT_RESET_TTL_VALUES 0x100000 -#define DNS_QUERY_RESERVED 0xff000000 - -#define DNS_UPDATE_SECURITY_USE_DEFAULT 0x0 -#define DNS_UPDATE_SECURITY_OFF 0x10 -#define DNS_UPDATE_SECURITY_ON 0x20 -#define DNS_UPDATE_SECURITY_ONLY 0x100 -#define DNS_UPDATE_CACHE_SECURITY_CONTEXT 0x200 +#define DNS_QUERY_USE_TCP_ONLY 0x2 +#define DNS_QUERY_NO_RECURSION 0x4 +#define DNS_QUERY_BYPASS_CACHE 0x8 +#define DNS_QUERY_NO_WIRE_QUERY 0x10 +#define DNS_QUERY_NO_LOCAL_NAME 0x20 +#define DNS_QUERY_NO_HOSTS_FILE 0x40 +#define DNS_QUERY_NO_NETBT 0x80 +#define DNS_QUERY_TREAT_AS_FQDN 0x1000 +#define DNS_QUERY_WIRE_ONLY 0x100 +#define DNS_QUERY_RETURN_MESSAGE 0x200 +#define DNS_QUERY_DONT_RESET_TTL_VALUES 0x100000 +#define DNS_QUERY_RESERVED 0xff000000 + +#define DNS_UPDATE_SECURITY_USE_DEFAULT 0x0 +#define DNS_UPDATE_SECURITY_OFF 0x10 +#define DNS_UPDATE_SECURITY_ON 0x20 +#define DNS_UPDATE_SECURITY_ONLY 0x100 +#define DNS_UPDATE_CACHE_SECURITY_CONTEXT 0x200 #define DNS_UPDATE_TEST_USE_LOCAL_SYS_ACCT 0x400 -#define DNS_UPDATE_FORCE_SECURITY_NEGO 0x800 -#define DNS_UPDATE_RESERVED 0xffff0000 +#define DNS_UPDATE_FORCE_SECURITY_NEGO 0x800 +#define DNS_UPDATE_RESERVED 0xffff0000 #define DNS_CONFIG_FLAG_ALLOC TRUE #ifndef RC_INVOKE + typedef DWORD IP4_ADDRESS; + typedef _Return_type_success_(return == 0) DWORD DNS_STATUS; -#define DNS_TYPE_ZERO 0x0000 - -#define DNS_TYPE_A 0x0001 -#define DNS_TYPE_NS 0x0002 -#define DNS_TYPE_MD 0x0003 -#define DNS_TYPE_MF 0x0004 -#define DNS_TYPE_CNAME 0x0005 -#define DNS_TYPE_SOA 0x0006 -#define DNS_TYPE_MB 0x0007 -#define DNS_TYPE_MG 0x0008 -#define DNS_TYPE_MR 0x0009 -#define DNS_TYPE_NULL 0x000a -#define DNS_TYPE_WKS 0x000b -#define DNS_TYPE_PTR 0x000c -#define DNS_TYPE_HINFO 0x000d -#define DNS_TYPE_MINFO 0x000e -#define DNS_TYPE_MX 0x000f -#define DNS_TYPE_TEXT 0x0010 -#define DNS_TYPE_RP 0x0011 -#define DNS_TYPE_AFSDB 0x0012 -#define DNS_TYPE_X25 0x0013 -#define DNS_TYPE_ISDN 0x0014 -#define DNS_TYPE_RT 0x0015 -#define DNS_TYPE_NSAP 0x0016 -#define DNS_TYPE_NSAPPTR 0x0017 -#define DNS_TYPE_SIG 0x0018 -#define DNS_TYPE_KEY 0x0019 -#define DNS_TYPE_PX 0x001a -#define DNS_TYPE_GPOS 0x001b -#define DNS_TYPE_AAAA 0x001c -#define DNS_TYPE_LOC 0x001d -#define DNS_TYPE_NXT 0x001e -#define DNS_TYPE_EID 0x001f -#define DNS_TYPE_NIMLOC 0x0020 -#define DNS_TYPE_SRV 0x0021 -#define DNS_TYPE_ATMA 0x0022 -#define DNS_TYPE_NAPTR 0x0023 -#define DNS_TYPE_KX 0x0024 -#define DNS_TYPE_CERT 0x0025 -#define DNS_TYPE_A6 0x0026 -#define DNS_TYPE_DNAME 0x0027 -#define DNS_TYPE_SINK 0x0028 -#define DNS_TYPE_OPT 0x0029 -#define DNS_TYPE_UINFO 0x0064 -#define DNS_TYPE_UID 0x0065 -#define DNS_TYPE_GID 0x0066 -#define DNS_TYPE_UNSPEC 0x0067 -#define DNS_TYPE_ADDRS 0x00f8 -#define DNS_TYPE_TKEY 0x00f9 -#define DNS_TYPE_TSIG 0x00fa -#define DNS_TYPE_IXFR 0x00fb -#define DNS_TYPE_AXFR 0x00fc -#define DNS_TYPE_MAILB 0x00fd -#define DNS_TYPE_MAILA 0x00fe -#define DNS_TYPE_ALL 0x00ff -#define DNS_TYPE_ANY 0x00ff - -#define DNS_TYPE_WINS 0xff01 -#define DNS_TYPE_WINSR 0xff02 -#define DNS_TYPE_NBSTAT (DNS_TYPE_WINSR) - -typedef enum _DNS_CHARSET -{ - DnsCharSetUnknown, - DnsCharSetUnicode, - DnsCharSetUtf8, - DnsCharSetAnsi + +#define DNS_TYPE_ZERO 0x0000 +#define DNS_TYPE_A 0x0001 +#define DNS_TYPE_NS 0x0002 +#define DNS_TYPE_MD 0x0003 +#define DNS_TYPE_MF 0x0004 +#define DNS_TYPE_CNAME 0x0005 +#define DNS_TYPE_SOA 0x0006 +#define DNS_TYPE_MB 0x0007 +#define DNS_TYPE_MG 0x0008 +#define DNS_TYPE_MR 0x0009 +#define DNS_TYPE_NULL 0x000a +#define DNS_TYPE_WKS 0x000b +#define DNS_TYPE_PTR 0x000c +#define DNS_TYPE_HINFO 0x000d +#define DNS_TYPE_MINFO 0x000e +#define DNS_TYPE_MX 0x000f +#define DNS_TYPE_TEXT 0x0010 +#define DNS_TYPE_RP 0x0011 +#define DNS_TYPE_AFSDB 0x0012 +#define DNS_TYPE_X25 0x0013 +#define DNS_TYPE_ISDN 0x0014 +#define DNS_TYPE_RT 0x0015 +#define DNS_TYPE_NSAP 0x0016 +#define DNS_TYPE_NSAPPTR 0x0017 +#define DNS_TYPE_SIG 0x0018 +#define DNS_TYPE_KEY 0x0019 +#define DNS_TYPE_PX 0x001a +#define DNS_TYPE_GPOS 0x001b +#define DNS_TYPE_AAAA 0x001c +#define DNS_TYPE_LOC 0x001d +#define DNS_TYPE_NXT 0x001e +#define DNS_TYPE_EID 0x001f +#define DNS_TYPE_NIMLOC 0x0020 +#define DNS_TYPE_SRV 0x0021 +#define DNS_TYPE_ATMA 0x0022 +#define DNS_TYPE_NAPTR 0x0023 +#define DNS_TYPE_KX 0x0024 +#define DNS_TYPE_CERT 0x0025 +#define DNS_TYPE_A6 0x0026 +#define DNS_TYPE_DNAME 0x0027 +#define DNS_TYPE_SINK 0x0028 +#define DNS_TYPE_OPT 0x0029 +#define DNS_TYPE_UINFO 0x0064 +#define DNS_TYPE_UID 0x0065 +#define DNS_TYPE_GID 0x0066 +#define DNS_TYPE_UNSPEC 0x0067 +#define DNS_TYPE_ADDRS 0x00f8 +#define DNS_TYPE_TKEY 0x00f9 +#define DNS_TYPE_TSIG 0x00fa +#define DNS_TYPE_IXFR 0x00fb +#define DNS_TYPE_AXFR 0x00fc +#define DNS_TYPE_MAILB 0x00fd +#define DNS_TYPE_MAILA 0x00fe +#define DNS_TYPE_ALL 0x00ff +#define DNS_TYPE_ANY 0x00ff + +#define DNS_TYPE_WINS 0xff01 +#define DNS_TYPE_WINSR 0xff02 +#define DNS_TYPE_NBSTAT (DNS_TYPE_WINSR) + +#define DNSREC_QUESTION 0 +#define DNSREC_ANSWER 1 +#define DNSREC_AUTHORITY 2 +#define DNSREC_ADDITIONAL 3 + +#define DNS_ATMA_MAX_ADDR_LENGTH 20 + +typedef enum _DNS_CHARSET { + DnsCharSetUnknown, + DnsCharSetUnicode, + DnsCharSetUtf8, + DnsCharSetAnsi } DNS_CHARSET; -typedef enum -{ - DnsConfigPrimaryDomainName_W, - DnsConfigPrimaryDomainName_A, - DnsConfigPrimaryDomainName_UTF8, - DnsConfigAdapterDomainName_W, - DnsConfigAdapterDomainName_A, - DnsConfigAdapterDomainName_UTF8, - DnsConfigDnsServerList, - DnsConfigSearchList, - DnsConfigAdapterInfo, - DnsConfigPrimaryHostNameRegistrationEnabled, - DnsConfigAdapterHostNameRegistrationEnabled, - DnsConfigAddressRegistrationMaxCount, - DnsConfigHostName_W, - DnsConfigHostName_A, - DnsConfigHostName_UTF8, - DnsConfigFullHostName_W, - DnsConfigFullHostName_A, - DnsConfigFullHostName_UTF8 + +typedef enum { + DnsConfigPrimaryDomainName_W, + DnsConfigPrimaryDomainName_A, + DnsConfigPrimaryDomainName_UTF8, + DnsConfigAdapterDomainName_W, + DnsConfigAdapterDomainName_A, + DnsConfigAdapterDomainName_UTF8, + DnsConfigDnsServerList, + DnsConfigSearchList, + DnsConfigAdapterInfo, + DnsConfigPrimaryHostNameRegistrationEnabled, + DnsConfigAdapterHostNameRegistrationEnabled, + DnsConfigAddressRegistrationMaxCount, + DnsConfigHostName_W, + DnsConfigHostName_A, + DnsConfigHostName_UTF8, + DnsConfigFullHostName_W, + DnsConfigFullHostName_A, + DnsConfigFullHostName_UTF8 } DNS_CONFIG_TYPE; -typedef enum -{ - DnsFreeFlat = 0, - DnsFreeRecordList, - DnsFreeParsedMessageFields + +typedef enum { + DnsFreeFlat = 0, + DnsFreeRecordList, + DnsFreeParsedMessageFields } DNS_FREE_TYPE; -typedef enum _DNS_NAME_FORMAT -{ - DnsNameDomain, - DnsNameDomainLabel, - DnsNameHostnameFull, - DnsNameHostnameLabel, - DnsNameWildcard, - DnsNameSrvRecord + +typedef enum _DNS_NAME_FORMAT { + DnsNameDomain, + DnsNameDomainLabel, + DnsNameHostnameFull, + DnsNameHostnameLabel, + DnsNameWildcard, + DnsNameSrvRecord } DNS_NAME_FORMAT; -typedef enum -{ - DnsSectionQuestion, - DnsSectionAnswer, - DnsSectionAuthority, - DnsSectionAdditional + +typedef enum { + DnsSectionQuestion, + DnsSectionAnswer, + DnsSectionAuthority, + DnsSectionAdditional } DNS_SECTION; + typedef struct _IP4_ARRAY { - DWORD AddrCount; - IP4_ADDRESS AddrArray[1]; + DWORD AddrCount; + IP4_ADDRESS AddrArray[1]; } IP4_ARRAY, *PIP4_ARRAY; -typedef struct { - DWORD IP6Dword[4]; + +typedef struct { + DWORD IP6Dword[4]; } IP6_ADDRESS, *PIP6_ADDRESS, DNS_IP6_ADDRESS, *PDNS_IP6_ADDRESS; #pragma pack(push, 1) @@ -188,294 +198,319 @@ #pragma pack(pop) typedef struct _DNS_MESSAGE_BUFFER { - DNS_HEADER MessageHead; - CHAR MessageBody[1]; + DNS_HEADER MessageHead; + CHAR MessageBody[1]; } DNS_MESSAGE_BUFFER, *PDNS_MESSAGE_BUFFER; + typedef struct _DnsRecordFlags { - DWORD Section :2; - DWORD Delete :1; - DWORD CharSet :2; - DWORD Unused :3; - DWORD Reserved :24; + DWORD Section:2; + DWORD Delete:1; + DWORD CharSet:2; + DWORD Unused:3; + DWORD Reserved:24; } DNS_RECORD_FLAGS; -#define DNSREC_QUESTION 0 -#define DNSREC_ANSWER 1 -#define DNSREC_AUTHORITY 2 -#define DNSREC_ADDITIONAL 3 -typedef struct { - IP4_ADDRESS IpAddress; + +typedef struct { + IP4_ADDRESS IpAddress; } DNS_A_DATA, *PDNS_A_DATA; -typedef struct { - DNS_IP6_ADDRESS Ip6Address; + +typedef struct { + DNS_IP6_ADDRESS Ip6Address; } DNS_AAAA_DATA, *PDNS_AAAA_DATA; -#define DNS_ATMA_MAX_ADDR_LENGTH 20 -typedef struct { - BYTE AddressType; - BYTE Address[DNS_ATMA_MAX_ADDR_LENGTH]; + +typedef struct { + BYTE AddressType; + BYTE Address[DNS_ATMA_MAX_ADDR_LENGTH]; } DNS_ATMA_DATA, *PDNS_ATMA_DATA; -typedef struct { - WORD wFlags; - BYTE chProtocol; - BYTE chAlgorithm; - BYTE Key[1]; + +typedef struct { + WORD wFlags; + BYTE chProtocol; + BYTE chAlgorithm; + BYTE Key[1]; } DNS_KEY_DATA, *PDNS_KEY_DATA; -typedef struct { - WORD wVersion; - WORD wSize; - WORD wHorPrec; - WORD wVerPrec; - DWORD dwLatitude; - DWORD dwLongitude; - DWORD dwAltitude; + +typedef struct { + WORD wVersion; + WORD wSize; + WORD wHorPrec; + WORD wVerPrec; + DWORD dwLatitude; + DWORD dwLongitude; + DWORD dwAltitude; } DNS_LOC_DATA, *PDNS_LOC_DATA; -typedef struct { - LPSTR pNameMailbox; - LPSTR pNameErrorsMailbox; + +typedef struct { + LPSTR pNameMailbox; + LPSTR pNameErrorsMailbox; } DNS_MINFO_DATAA, *PDNS_MINFO_DATAA; -typedef struct { - LPWSTR pNameMailbox; - LPWSTR pNameErrorsMailbox; + +typedef struct { + LPWSTR pNameMailbox; + LPWSTR pNameErrorsMailbox; } DNS_MINFO_DATAW, *PDNS_MINFO_DATAW; -typedef struct { - LPSTR pNameExchange; - WORD wPreference; - WORD Pad; + +typedef struct { + LPSTR pNameExchange; + WORD wPreference; + WORD Pad; } DNS_MX_DATAA, *PDNS_MX_DATAA; -typedef struct { - LPWSTR pNameExchange; - WORD wPreference; - WORD Pad; + +typedef struct { + LPWSTR pNameExchange; + WORD wPreference; + WORD Pad; } DNS_MX_DATAW, *PDNS_MX_DATAW; -typedef struct { - DWORD dwByteCount; - BYTE Data[1]; + +typedef struct { + DWORD dwByteCount; + BYTE Data[1]; } DNS_NULL_DATA, *PDNS_NULL_DATA; -typedef struct { - LPSTR pNameNext; - WORD wNumTypes; - WORD wTypes[1]; + +typedef struct { + LPSTR pNameNext; + WORD wNumTypes; + WORD wTypes[1]; } DNS_NXT_DATAA, *PDNS_NXT_DATAA; -typedef struct { - LPWSTR pNameNext; - WORD wNumTypes; - WORD wTypes[1]; + +typedef struct { + LPWSTR pNameNext; + WORD wNumTypes; + WORD wTypes[1]; } DNS_NXT_DATAW, *PDNS_NXT_DATAW; -typedef struct { - LPSTR pNameHost; + +typedef struct { + LPSTR pNameHost; } DNS_PTR_DATAA, *PDNS_PTR_DATAA; -typedef struct { - LPWSTR pNameHost; + +typedef struct { + LPWSTR pNameHost; } DNS_PTR_DATAW, *PDNS_PTR_DATAW; -typedef struct { - LPSTR pNameSigner; - WORD wTypeCovered; - BYTE chAlgorithm; - BYTE chLabelCount; - DWORD dwOriginalTtl; - DWORD dwExpiration; - DWORD dwTimeSigned; - WORD wKeyTag; - WORD Pad; - BYTE Signature[1]; + +typedef struct { + LPSTR pNameSigner; + WORD wTypeCovered; + BYTE chAlgorithm; + BYTE chLabelCount; + DWORD dwOriginalTtl; + DWORD dwExpiration; + DWORD dwTimeSigned; + WORD wKeyTag; + WORD Pad; + BYTE Signature[1]; } DNS_SIG_DATAA, *PDNS_SIG_DATAA; -typedef struct { - LPWSTR pNameSigner; - WORD wTypeCovered; - BYTE chAlgorithm; - BYTE chLabelCount; - DWORD dwOriginalTtl; - DWORD dwExpiration; - DWORD dwTimeSigned; - WORD wKeyTag; - WORD Pad; - BYTE Signature[1]; + +typedef struct { + LPWSTR pNameSigner; + WORD wTypeCovered; + BYTE chAlgorithm; + BYTE chLabelCount; + DWORD dwOriginalTtl; + DWORD dwExpiration; + DWORD dwTimeSigned; + WORD wKeyTag; + WORD Pad; + BYTE Signature[1]; } DNS_SIG_DATAW, *PDNS_SIG_DATAW; -typedef struct { - LPSTR pNamePrimaryServer; - LPSTR pNameAdministrator; - DWORD dwSerialNo; - DWORD dwRefresh; - DWORD dwRetry; - DWORD dwExpire; - DWORD dwDefaultTtl; + +typedef struct { + LPSTR pNamePrimaryServer; + LPSTR pNameAdministrator; + DWORD dwSerialNo; + DWORD dwRefresh; + DWORD dwRetry; + DWORD dwExpire; + DWORD dwDefaultTtl; } DNS_SOA_DATAA, *PDNS_SOA_DATAA; -typedef struct { - LPWSTR pNamePrimaryServer; - LPWSTR pNameAdministrator; - DWORD dwSerialNo; - DWORD dwRefresh; - DWORD dwRetry; - DWORD dwExpire; - DWORD dwDefaultTtl; + +typedef struct { + LPWSTR pNamePrimaryServer; + LPWSTR pNameAdministrator; + DWORD dwSerialNo; + DWORD dwRefresh; + DWORD dwRetry; + DWORD dwExpire; + DWORD dwDefaultTtl; } DNS_SOA_DATAW, *PDNS_SOA_DATAW; -typedef struct { - LPSTR pNameTarget; - WORD wPriority; - WORD wWeight; - WORD wPort; - WORD Pad; + +typedef struct { + LPSTR pNameTarget; + WORD wPriority; + WORD wWeight; + WORD wPort; + WORD Pad; } DNS_SRV_DATAA, *PDNS_SRV_DATAA; -typedef struct { - LPWSTR pNameTarget; - WORD wPriority; - WORD wWeight; - WORD wPort; - WORD Pad; + +typedef struct { + LPWSTR pNameTarget; + WORD wPriority; + WORD wWeight; + WORD wPort; + WORD Pad; } DNS_SRV_DATAW, *PDNS_SRV_DATAW; -typedef struct { - DWORD dwStringCount; - LPSTR pStringArray[1]; + +typedef struct { + DWORD dwStringCount; + LPSTR pStringArray[1]; } DNS_TXT_DATAA, *PDNS_TXT_DATAA; -typedef struct { - DWORD dwStringCount; - LPWSTR pStringArray[1]; + +typedef struct { + DWORD dwStringCount; + LPWSTR pStringArray[1]; } DNS_TXT_DATAW, *PDNS_TXT_DATAW; -typedef struct { - LPSTR pNameAlgorithm; - PBYTE pAlgorithmPacket; - PBYTE pKey; - PBYTE pOtherData; - DWORD dwCreateTime; - DWORD dwExpireTime; - WORD wMode; - WORD wError; - WORD wKeyLength; - WORD wOtherLength; - UCHAR cAlgNameLength; - BOOL bPacketPointers; + +typedef struct { + LPSTR pNameAlgorithm; + PBYTE pAlgorithmPacket; + PBYTE pKey; + PBYTE pOtherData; + DWORD dwCreateTime; + DWORD dwExpireTime; + WORD wMode; + WORD wError; + WORD wKeyLength; + WORD wOtherLength; + UCHAR cAlgNameLength; + BOOL bPacketPointers; } DNS_TKEY_DATAA, *PDNS_TKEY_DATAA; -typedef struct { - LPWSTR pNameAlgorithm; - PBYTE pAlgorithmPacket; - PBYTE pKey; - PBYTE pOtherData; - DWORD dwCreateTime; - DWORD dwExpireTime; - WORD wMode; - WORD wError; - WORD wKeyLength; - WORD wOtherLength; - UCHAR cAlgNameLength; - BOOL bPacketPointers; + +typedef struct { + LPWSTR pNameAlgorithm; + PBYTE pAlgorithmPacket; + PBYTE pKey; + PBYTE pOtherData; + DWORD dwCreateTime; + DWORD dwExpireTime; + WORD wMode; + WORD wError; + WORD wKeyLength; + WORD wOtherLength; + UCHAR cAlgNameLength; + BOOL bPacketPointers; } DNS_TKEY_DATAW, *PDNS_TKEY_DATAW; -typedef struct { - LPSTR pNameAlgorithm; - PBYTE pAlgorithmPacket; - PBYTE pSignature; - PBYTE pOtherData; - LONGLONG i64CreateTime; - WORD wFudgeTime; - WORD wOriginalXid; - WORD wError; - WORD wSigLength; - WORD wOtherLength; - UCHAR cAlgNameLength; - BOOL bPacketPointers; + +typedef struct { + LPSTR pNameAlgorithm; + PBYTE pAlgorithmPacket; + PBYTE pSignature; + PBYTE pOtherData; + LONGLONG i64CreateTime; + WORD wFudgeTime; + WORD wOriginalXid; + WORD wError; + WORD wSigLength; + WORD wOtherLength; + UCHAR cAlgNameLength; + BOOL bPacketPointers; } DNS_TSIG_DATAA, *PDNS_TSIG_DATAA; -typedef struct { - LPWSTR pNameAlgorithm; - PBYTE pAlgorithmPacket; - PBYTE pSignature; - PBYTE pOtherData; - LONGLONG i64CreateTime; - WORD wFudgeTime; - WORD wOriginalXid; - WORD wError; - WORD wSigLength; - WORD wOtherLength; - UCHAR cAlgNameLength; - BOOL bPacketPointers; + +typedef struct { + LPWSTR pNameAlgorithm; + PBYTE pAlgorithmPacket; + PBYTE pSignature; + PBYTE pOtherData; + LONGLONG i64CreateTime; + WORD wFudgeTime; + WORD wOriginalXid; + WORD wError; + WORD wSigLength; + WORD wOtherLength; + UCHAR cAlgNameLength; + BOOL bPacketPointers; } DNS_TSIG_DATAW, *PDNS_TSIG_DATAW; -typedef struct { - DWORD dwMappingFlag; - DWORD dwLookupTimeout; - DWORD dwCacheTimeout; - DWORD cWinsServerCount; - IP4_ADDRESS WinsServers[1]; + +typedef struct { + DWORD dwMappingFlag; + DWORD dwLookupTimeout; + DWORD dwCacheTimeout; + DWORD cWinsServerCount; + IP4_ADDRESS WinsServers[1]; } DNS_WINS_DATA, *PDNS_WINS_DATA; -typedef struct { - DWORD dwMappingFlag; - DWORD dwLookupTimeout; - DWORD dwCacheTimeout; - LPSTR pNameResultDomain; + +typedef struct { + DWORD dwMappingFlag; + DWORD dwLookupTimeout; + DWORD dwCacheTimeout; + LPSTR pNameResultDomain; } DNS_WINSR_DATAA, *PDNS_WINSR_DATAA; -typedef struct { - DWORD dwMappingFlag; - DWORD dwLookupTimeout; - DWORD dwCacheTimeout; - LPWSTR pNameResultDomain; + +typedef struct { + DWORD dwMappingFlag; + DWORD dwLookupTimeout; + DWORD dwCacheTimeout; + LPWSTR pNameResultDomain; } DNS_WINSR_DATAW, *PDNS_WINSR_DATAW; typedef struct { - IP4_ADDRESS IpAddress; - UCHAR chProtocol; - BYTE BitMask[1]; + IP4_ADDRESS IpAddress; + UCHAR chProtocol; + BYTE BitMask[1]; } DNS_WKS_DATA, *PDNS_WKS_DATA; + typedef struct _DnsRecordA { - struct _DnsRecordA* pNext; - LPSTR pName; - WORD wType; - WORD wDataLength; - union { - DWORD DW; - DNS_RECORD_FLAGS S; - } Flags; - DWORD dwTtl; - DWORD dwReserved; - union { - DNS_A_DATA A; - DNS_SOA_DATAA SOA, Soa; - DNS_PTR_DATAA PTR, Ptr, NS, Ns, CNAME, Cname, MB, Mb, - MD, Md, MF, Mf, MG, Mg, MR, Mr; - DNS_MINFO_DATAA MINFO, Minfo, RP, Rp; - DNS_MX_DATAA MX, Mx, AFSDB, Afsdb, RT, Rt; - DNS_TXT_DATAA HINFO, Hinfo, ISDN, Isdn, TXT, Txt, X25; - DNS_NULL_DATA Null; - DNS_WKS_DATA WKS, Wks; - DNS_AAAA_DATA AAAA; - DNS_KEY_DATA KEY, Key; - DNS_SIG_DATAA SIG, Sig; - DNS_ATMA_DATA ATMA, Atma; - DNS_NXT_DATAA NXT, Nxt; - DNS_SRV_DATAA SRV, Srv; - DNS_TKEY_DATAA TKEY, Tkey; - DNS_TSIG_DATAA TSIG, Tsig; - DNS_WINS_DATA WINS, Wins; - DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat; - } Data; + struct _DnsRecordA* pNext; + LPSTR pName; + WORD wType; + WORD wDataLength; + union { + DWORD DW; + DNS_RECORD_FLAGS S; + } Flags; + DWORD dwTtl; + DWORD dwReserved; + union { + DNS_A_DATA A; + DNS_SOA_DATAA SOA, Soa; + DNS_PTR_DATAA PTR, Ptr, NS, Ns, CNAME, Cname, MB, Mb, MD, Md, MF, Mf, MG, Mg, MR, Mr; + DNS_MINFO_DATAA MINFO, Minfo, RP, Rp; + DNS_MX_DATAA MX, Mx, AFSDB, Afsdb, RT, Rt; + DNS_TXT_DATAA HINFO, Hinfo, ISDN, Isdn, TXT, Txt, X25; + DNS_NULL_DATA Null; + DNS_WKS_DATA WKS, Wks; + DNS_AAAA_DATA AAAA; + DNS_KEY_DATA KEY, Key; + DNS_SIG_DATAA SIG, Sig; + DNS_ATMA_DATA ATMA, Atma; + DNS_NXT_DATAA NXT, Nxt; + DNS_SRV_DATAA SRV, Srv; + DNS_TKEY_DATAA TKEY, Tkey; + DNS_TSIG_DATAA TSIG, Tsig; + DNS_WINS_DATA WINS, Wins; + DNS_WINSR_DATAA WINSR, WinsR, NBSTAT, Nbstat; + } Data; } DNS_RECORDA, *PDNS_RECORDA; + typedef struct _DnsRecordW { - struct _DnsRecordW* pNext; - LPWSTR pName; - WORD wType; - WORD wDataLength; - union { - DWORD DW; - DNS_RECORD_FLAGS S; - } Flags; - DWORD dwTtl; - DWORD dwReserved; - union { - DNS_A_DATA A; - DNS_SOA_DATAW SOA, Soa; - DNS_PTR_DATAW PTR, Ptr, NS, Ns, CNAME, Cname, MB, Mb, - MD, Md, MF, Mf, MG, Mg, MR, Mr; - DNS_MINFO_DATAW MINFO, Minfo, RP, Rp; - DNS_MX_DATAW MX, Mx, AFSDB, Afsdb, RT, Rt; - DNS_TXT_DATAW HINFO, Hinfo, ISDN, Isdn, TXT, Txt, X25; - DNS_NULL_DATA Null; - DNS_WKS_DATA WKS, Wks; - DNS_AAAA_DATA AAAA; - DNS_KEY_DATA KEY, Key; - DNS_SIG_DATAW SIG, Sig; - DNS_ATMA_DATA ATMA, Atma; - DNS_NXT_DATAW NXT, Nxt; - DNS_SRV_DATAW SRV, Srv; - DNS_TKEY_DATAW TKEY, Tkey; - DNS_TSIG_DATAW TSIG, Tsig; - DNS_WINS_DATA WINS, Wins; - DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; - } Data; + struct _DnsRecordW* pNext; + LPWSTR pName; + WORD wType; + WORD wDataLength; + union { + DWORD DW; + DNS_RECORD_FLAGS S; + } Flags; + DWORD dwTtl; + DWORD dwReserved; + union { + DNS_A_DATA A; + DNS_SOA_DATAW SOA, Soa; + DNS_PTR_DATAW PTR, Ptr, NS, Ns, CNAME, Cname, MB, Mb, MD, Md, MF, Mf, MG, Mg, MR, Mr; + DNS_MINFO_DATAW MINFO, Minfo, RP, Rp; + DNS_MX_DATAW MX, Mx, AFSDB, Afsdb, RT, Rt; + DNS_TXT_DATAW HINFO, Hinfo, ISDN, Isdn, TXT, Txt, X25; + DNS_NULL_DATA Null; + DNS_WKS_DATA WKS, Wks; + DNS_AAAA_DATA AAAA; + DNS_KEY_DATA KEY, Key; + DNS_SIG_DATAW SIG, Sig; + DNS_ATMA_DATA ATMA, Atma; + DNS_NXT_DATAW NXT, Nxt; + DNS_SRV_DATAW SRV, Srv; + DNS_TKEY_DATAW TKEY, Tkey; + DNS_TSIG_DATAW TSIG, Tsig; + DNS_WINS_DATA WINS, Wins; + DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; + } Data; } DNS_RECORDW, *PDNS_RECORDW; #ifdef UNICODE @@ -487,18 +522,18 @@ #endif typedef struct _DnsRRSet { - PDNS_RECORD pFirstRR; - PDNS_RECORD pLastRR; + PDNS_RECORD pFirstRR; + PDNS_RECORD pLastRR; } DNS_RRSET, *PDNS_RRSET; -#define DNS_RRSET_INIT( rrset ) \ +#define DNS_RRSET_INIT(rrset) \ { \ PDNS_RRSET _prrset = &(rrset); \ _prrset->pFirstRR = NULL; \ _prrset->pLastRR = (PDNS_RECORD) &_prrset->pFirstRR; \ } -#define DNS_RRSET_ADD( rrset, pnewRR ) \ +#define DNS_RRSET_ADD(rrset, pnewRR) \ { \ PDNS_RRSET _prrset = &(rrset); \ PDNS_RECORD _prrnew = (pnewRR); \ @@ -506,7 +541,7 @@ _prrset->pLastRR = _prrnew; \ } -#define DNS_RRSET_TERMINATE( rrset ) \ +#define DNS_RRSET_TERMINATE(rrset) \ { \ PDNS_RRSET _prrset = &(rrset); \ _prrset->pLastRR->pNext = NULL; \ @@ -570,8 +605,17 @@ _Inout_opt_ PIP4_ARRAY pExtraList, _Inout_opt_ PVOID pReserved); -BOOL WINAPI DnsNameCompare_A(_In_ PCSTR, _In_ PCSTR); -BOOL WINAPI DnsNameCompare_W(_In_ PCWSTR, _In_ PCWSTR); +BOOL +WINAPI +DnsNameCompare_A( + _In_ PCSTR, + _In_ PCSTR); + +BOOL +WINAPI +DnsNameCompare_W( + _In_ PCWSTR, + _In_ PCWSTR); DNS_STATUS WINAPI @@ -613,7 +657,11 @@ _Out_writes_bytes_to_opt_(*pBufLen, *pBufLen) PVOID pBuffer, _Inout_ PDWORD pBufLen); -BOOL WINAPI DnsRecordCompare(_In_ PDNS_RECORD, _In_ PDNS_RECORD); +BOOL +WINAPI +DnsRecordCompare( + _In_ PDNS_RECORD, + _In_ PDNS_RECORD); PDNS_RECORD WINAPI @@ -622,7 +670,11 @@ _In_ DNS_CHARSET CharSetIn, _In_ DNS_CHARSET CharSetOut); -void WINAPI DnsRecordListFree(_Inout_opt_ PDNS_RECORD, _In_ DNS_FREE_TYPE); +void +WINAPI +DnsRecordListFree( + _Inout_opt_ PDNS_RECORD, + _In_ DNS_FREE_TYPE); BOOL WINAPI @@ -639,8 +691,15 @@ _In_ DNS_CHARSET CharSetIn, _In_ DNS_CHARSET CharSetOut); -PDNS_RECORD WINAPI DnsRecordSetDetach(_Inout_ PDNS_RECORD); -void WINAPI DnsReleaseContextHandle(_In_ HANDLE); +PDNS_RECORD +WINAPI +DnsRecordSetDetach( + _Inout_ PDNS_RECORD); + +void +WINAPI +DnsReleaseContextHandle( + _In_ HANDLE); DNS_STATUS WINAPI @@ -669,9 +728,23 @@ _Inout_opt_ PIP4_ARRAY pExtraInfo, _Inout_opt_ PVOID pReserved); -DNS_STATUS WINAPI DnsValidateName_A(_In_ LPCSTR, _In_ DNS_NAME_FORMAT); -DNS_STATUS WINAPI DnsValidateName_W(_In_ LPCWSTR, _In_ DNS_NAME_FORMAT); -DNS_STATUS WINAPI DnsValidateName_UTF8(_In_ LPCSTR, _In_ DNS_NAME_FORMAT); +DNS_STATUS +WINAPI +DnsValidateName_A( + _In_ LPCSTR, + _In_ DNS_NAME_FORMAT); + +DNS_STATUS +WINAPI +DnsValidateName_W( + _In_ LPCWSTR, + _In_ DNS_NAME_FORMAT); + +DNS_STATUS +WINAPI +DnsValidateName_UTF8( + _In_ LPCSTR, + _In_ DNS_NAME_FORMAT); BOOL WINAPI @@ -694,6 +767,7 @@ _In_ BOOL fRecursionDesired); #ifdef UNICODE + #define DNS_MINFO_DATA DNS_MINFO_DATAW #define PDNS_MINFO_DATA PDNS_MINFO_DATAW #define DNS_MX_DATA DNS_MX_DATAW @@ -718,7 +792,9 @@ #define DnsQuery DnsQuery_W #define DnsReplaceRecordSet DnsReplaceRecordSetW #define DnsValidateName DnsValidateName_W -#else + +#else /* UNICODE */ + #define DNS_MINFO_DATA DNS_MINFO_DATAA #define PDNS_MINFO_DATA PDNS_MINFO_DATAA #define DNS_MX_DATA DNS_MX_DATAA @@ -743,7 +819,8 @@ #define DnsQuery DnsQuery_A #define DnsReplaceRecordSet DnsReplaceRecordSetA #define DnsValidateName DnsValidateName_A -#endif + +#endif /* UNICODE */ #endif /* RC_INVOKED */ @@ -751,4 +828,4 @@ } #endif -#endif /* _WINDNS_H */ +#endif /* _WINDNS_INCLUDED_ */

9 years, 6 months

[akhaldi] 66430: [PSDK] Use proper packing for some structures.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Feb 23 18:31:46 2015 New Revision: 66430 URL: http://svn.reactos.org/svn/reactos?rev=66430&view=rev Log: [PSDK] Use proper packing for some structures. Modified: trunk/reactos/include/psdk/windns.h Modified: trunk/reactos/include/psdk/windns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windns.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windns.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windns.h [iso-8859-1] Mon Feb 23 18:31:46 2015 @@ -153,23 +153,39 @@ DWORD IP6Dword[4]; } IP6_ADDRESS, *PIP6_ADDRESS, DNS_IP6_ADDRESS, *PDNS_IP6_ADDRESS; +#pragma pack(push, 1) + typedef struct _DNS_HEADER { - WORD Xid; - BYTE RecursionDesired:1; - BYTE Truncation:1; - BYTE Authoritative:1; - BYTE Opcode:4; - BYTE IsResponse:1; - BYTE ResponseCode:4; - BYTE CheckingDisabled:1; - BYTE AuthenticatedData:1; - BYTE Reserved:1; - BYTE RecursionAvailable:1; - WORD QuestionCount; - WORD AnswerCount; - WORD NameServerCount; - WORD AdditionalCount; + WORD Xid; + BYTE RecursionDesired:1; + BYTE Truncation:1; + BYTE Authoritative:1; + BYTE Opcode:4; + BYTE IsResponse:1; + BYTE ResponseCode:4; + BYTE CheckingDisabled:1; + BYTE AuthenticatedData:1; + BYTE Reserved:1; + BYTE RecursionAvailable:1; + WORD QuestionCount; + WORD AnswerCount; + WORD NameServerCount; + WORD AdditionalCount; } DNS_HEADER, *PDNS_HEADER; + +typedef struct _DNS_WIRE_QUESTION { + WORD QuestionType; + WORD QuestionClass; +} DNS_WIRE_QUESTION, *PDNS_WIRE_QUESTION; + +typedef struct _DNS_WIRE_RECORD { + WORD RecordType; + WORD RecordClass; + DWORD TimeToLive; + WORD DataLength; +} DNS_WIRE_RECORD, *PDNS_WIRE_RECORD; + +#pragma pack(pop) typedef struct _DNS_MESSAGE_BUFFER { DNS_HEADER MessageHead; @@ -389,16 +405,7 @@ DWORD dwCacheTimeout; LPWSTR pNameResultDomain; } DNS_WINSR_DATAW, *PDNS_WINSR_DATAW; -typedef struct _DNS_WIRE_QUESTION { - WORD QuestionType; - WORD QuestionClass; -} DNS_WIRE_QUESTION, *PDNS_WIRE_QUESTION; -typedef struct _DNS_WIRE_RECORD { - WORD RecordType; - WORD RecordClass; - DWORD TimeToLive; - WORD DataLength; -} DNS_WIRE_RECORD, *PDNS_WIRE_RECORD; + typedef struct { IP4_ADDRESS IpAddress; UCHAR chProtocol;

9 years, 6 months

[dquintana] 66429: [NTOBJSHEX] * Missed these sizeof(). * A tiny typo in the comments. CORE-9244

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Feb 23 18:14:39 2015 New Revision: 66429 URL: http://svn.reactos.org/svn/reactos?rev=66429&view=rev Log: [NTOBJSHEX] * Missed these sizeof(). * A tiny typo in the comments. CORE-9244 Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp [iso-8859-1] Mon Feb 23 18:14:39 2015 @@ -149,7 +149,7 @@ if (otype < 0) { - entryBufferLength += sizeof(NtPidlTypeData) + sizeof(WCHAR); + entryBufferLength += FIELD_OFFSET(NtPidlTypeData,typeName) + sizeof(WCHAR); if (info->TypeName.Buffer) { @@ -159,7 +159,7 @@ if (otype == SYMBOLICLINK_OBJECT) { - entryBufferLength += sizeof(NtPidlSymlinkData) + sizeof(WCHAR); + entryBufferLength += FIELD_OFFSET(NtPidlSymlinkData,targetName) + sizeof(WCHAR); } DWORD access = STANDARD_RIGHTS_READ; Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] Mon Feb 23 18:14:39 2015 @@ -41,7 +41,7 @@ #include <pshpack1.h> -// NT OBJECT browsere +// NT OBJECT browser struct NtPidlEntry { USHORT cb; @@ -69,7 +69,7 @@ WCHAR targetName[ANYSIZE_ARRAY]; }; -// REGISTRY browsere +// REGISTRY browser enum REG_ENTRY_TYPE { REG_ENTRY_KEY,

9 years, 6 months

[akhaldi] 66428: [PSDK] Update DNS_HEADER structure.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Feb 23 18:13:29 2015 New Revision: 66428 URL: http://svn.reactos.org/svn/reactos?rev=66428&view=rev Log: [PSDK] Update DNS_HEADER structure. Modified: trunk/reactos/include/psdk/windns.h Modified: trunk/reactos/include/psdk/windns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windns.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windns.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windns.h [iso-8859-1] Mon Feb 23 18:13:29 2015 @@ -152,21 +152,25 @@ typedef struct { DWORD IP6Dword[4]; } IP6_ADDRESS, *PIP6_ADDRESS, DNS_IP6_ADDRESS, *PDNS_IP6_ADDRESS; + typedef struct _DNS_HEADER { - WORD Xid; - BYTE RecursionDesired; - BYTE Truncation; - BYTE Authoritative; - BYTE Opcode; - BYTE IsResponse; - BYTE ResponseCode; - BYTE Reserved; - BYTE RecursionAvailable; - WORD QuestionCount; - WORD AnswerCount; - WORD NameServerCount; - WORD AdditionalCount; + WORD Xid; + BYTE RecursionDesired:1; + BYTE Truncation:1; + BYTE Authoritative:1; + BYTE Opcode:4; + BYTE IsResponse:1; + BYTE ResponseCode:4; + BYTE CheckingDisabled:1; + BYTE AuthenticatedData:1; + BYTE Reserved:1; + BYTE RecursionAvailable:1; + WORD QuestionCount; + WORD AnswerCount; + WORD NameServerCount; + WORD AdditionalCount; } DNS_HEADER, *PDNS_HEADER; + typedef struct _DNS_MESSAGE_BUFFER { DNS_HEADER MessageHead; CHAR MessageBody[1];

9 years, 6 months

← Newer
1
...
5
6
7
8
9
10
11
...
38
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 February 2015