Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60449: [CABMAN] * Show the status messages only in -V mode. * Improve error messages by marking them as ERROR/WARNING. * Brought to you by David Quintana. CORE-7477 #resolve #comment Comm...
by akhaldi＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: akhaldi Date: Sun Sep 29 14:48:37 2013 New Revision: 60449 URL: http://svn.reactos.org/svn/reactos?rev=60449&view=rev Log: [CABMAN] * Show the status messages only in -V mode. * Improve error messages by marking them as ERROR/WARNING. * Brought to you by David Quintana. CORE-7477 #resolve #comment Committed in r60449. Gracias. Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabman.h trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/main.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Sun Sep 29 14:48:37 2013 @@ -607,7 +607,7 @@ SelectCodec(CAB_CODEC_MSZIP); else { - printf("Invalid codec specified!\n"); + printf("ERROR: Invalid codec specified!\n"); return false; } Modified: trunk/reactos/tools/cabman/cabman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.h?rev=… ============================================================================== --- trunk/reactos/tools/cabman/cabman.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabman.h [iso-8859-1] Sun Sep 29 14:48:37 2013 @@ -24,6 +24,7 @@ virtual ~CCABManager(); bool ParseCmdline(int argc, char* argv[]); bool Run(); + bool IsVerbose() { return Verbose; } private: void Usage(); bool CreateCabinet(); @@ -39,6 +40,9 @@ ULONG Mode; bool PromptOnOverwrite; char FileName[PATH_MAX]; + bool Verbose; }; +extern CCABManager CABMgr; + /* EOF */ Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=6… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] Sun Sep 29 14:48:37 2013 @@ -14,7 +14,7 @@ */ #include <stdlib.h> #include <stdio.h> -#include "cabinet.h" +#include "cabman.h" #include "dfp.h" @@ -345,7 +345,7 @@ if (Status == CAB_STATUS_FAILURE) { - printf("Directive file contains errors at line %u.\n", (UINT)CurrentLine); + printf("ERROR: Directive file contains errors at line %u.\n", (UINT)CurrentLine); DPRINT(MID_TRACE, ("Error while executing command.\n")); } @@ -359,7 +359,7 @@ if (Status != CAB_STATUS_SUCCESS) { - printf("Directive file contains errors at line %u.\n", (UINT)CurrentLine); + printf("ERROR: Directive file contains errors at line %u.\n", (UINT)CurrentLine); DPRINT(MID_TRACE, ("Error while copying file.\n")); } @@ -380,7 +380,7 @@ break; default: - printf("Directive file contains errors at line %u.\n", (UINT)CurrentLine); + printf("ERROR: Directive file contains errors at line %u.\n", (UINT)CurrentLine); DPRINT(MID_TRACE, ("Token is (%u).\n", (UINT)CurrentToken)); return CAB_STATUS_SUCCESS; } @@ -391,7 +391,10 @@ if (!InfFileOnly) { - printf("\nWriting cabinet. This may take a while...\n\n"); + if (CABMgr.IsVerbose()) + { + printf("Writing cabinet. This may take a while...\n"); + } if (DiskCreated) { @@ -415,7 +418,10 @@ } } - printf("\nDone.\n"); + if (CABMgr.IsVerbose()) + { + printf("Done.\n"); + } } return CAB_STATUS_SUCCESS; @@ -1181,7 +1187,7 @@ if (Status != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot create cabinet (%u).\n", (UINT)Status)); - printf("Cannot create cabinet.\n"); + printf("ERROR: Cannot create cabinet.\n"); return CAB_STATUS_FAILURE; } CabinetCreated = true; @@ -1192,7 +1198,7 @@ if (Status != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot create disk (%u).\n", (UINT)Status)); - printf("Cannot create disk.\n"); + printf("ERROR: Cannot create disk.\n"); return CAB_STATUS_FAILURE; } DiskCreated = true; @@ -1219,19 +1225,19 @@ if (strstr(Options,"optional")) { Status = CAB_STATUS_SUCCESS; - printf("Optional file does not exist: %s.\n", SrcName); + printf("Optional file skipped (does not exist): %s.\n", SrcName); } else - printf("File does not exist: %s.\n", SrcName); + printf("ERROR: File not found: %s.\n", SrcName); break; case CAB_STATUS_NOMEMORY: - printf("Insufficient memory to add file: %s.\n", SrcName); + printf("ERROR: Insufficient memory to add file: %s.\n", SrcName); break; default: - printf("Cannot add file: %s (%u).\n", SrcName, (UINT)Status); + printf("ERROR: Cannot add file: %s (%u).\n", SrcName, (UINT)Status); break; } return Status; Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/main.cxx [iso-8859-1] Sun Sep 29 14:48:37 2013 @@ -173,6 +173,7 @@ InfFileOnly = false; Mode = CM_MODE_DISPLAY; FileName[0] = 0; + Verbose = false; } @@ -215,7 +216,8 @@ printf(" -RC Specify file to put in cabinet reserved area\n"); printf(" (size must be less than 64KB).\n"); printf(" -S Create simple cabinet.\n"); - printf(" -P dir Files in the .dff are relative to this directory\n"); + printf(" -P dir Files in the .dff are relative to this directory.\n"); + printf(" -V Verbose mode (prints more messages).\n"); } bool CCABManager::ParseCmdline(int argc, char* argv[]) @@ -309,7 +311,7 @@ i++; if (!SetCabinetReservedFile(&argv[i][0])) { - printf("Cannot open cabinet reserved area file.\n"); + printf("ERROR: Cannot open cabinet reserved area file.\n"); return false; } } @@ -317,14 +319,14 @@ { if (!SetCabinetReservedFile(&argv[i][3])) { - printf("Cannot open cabinet reserved area file.\n"); + printf("ERROR: Cannot open cabinet reserved area file.\n"); return false; } } break; default: - printf("Bad parameter %s.\n", argv[i]); + printf("ERROR: Bad parameter %s.\n", argv[i]); return false; } break; @@ -344,9 +346,13 @@ SetFileRelativePath(&argv[i][2]); break; + + case 'V': + Verbose = true; + break; default: - printf("Bad parameter %s.\n", argv[i]); + printf("ERROR: Bad parameter %s.\n", argv[i]); return false; } } @@ -356,7 +362,7 @@ { if(FileName[0]) { - printf("You may only specify one directive file!\n"); + printf("ERROR: You may only specify one directive file!\n"); return false; } else @@ -391,7 +397,7 @@ // Search criteria (= the filename argument) is necessary for creating a simple cabinet if( Mode == CM_MODE_CREATE_SIMPLE && !HasSearchCriteria()) { - printf("You have to enter input file names!\n"); + printf("ERROR: You have to enter input file names!\n"); return false; } @@ -409,7 +415,7 @@ Status = Load(FileName); if (Status != CAB_STATUS_SUCCESS) { - printf("Specified directive file could not be found: %s.\n", FileName); + printf("ERROR: Specified directive file could not be found: %s.\n", FileName); return false; } @@ -430,7 +436,10 @@ if (Open() == CAB_STATUS_SUCCESS) { - printf("Cabinet %s\n\n", GetCabinetName()); + if (Verbose) + { + printf("Cabinet %s\n\n", GetCabinetName()); + } if (FindFirst(&Search) == CAB_STATUS_SUCCESS) { @@ -473,12 +482,12 @@ else { /* There should be at least one file in a cabinet */ - printf("No files in cabinet."); + printf("WARNING: No files in cabinet."); } return true; } else - printf("Cannot open file: %s\n", GetCabinetName()); + printf("ERROR: Cannot open file: %s\n", GetCabinetName()); return false; } @@ -495,7 +504,10 @@ if (Open() == CAB_STATUS_SUCCESS) { - printf("Cabinet %s\n\n", GetCabinetName()); + if (Verbose) + { + printf("Cabinet %s\n\n", GetCabinetName()); + } if (FindFirst(&Search) == CAB_STATUS_SUCCESS) { @@ -507,22 +519,22 @@ break; case CAB_STATUS_INVALID_CAB: - printf("Cabinet contains errors.\n"); + printf("ERROR: Cabinet contains errors.\n"); bRet = false; break; case CAB_STATUS_UNSUPPCOMP: - printf("Cabinet uses unsupported compression type.\n"); + printf("ERROR: Cabinet uses unsupported compression type.\n"); bRet = false; break; case CAB_STATUS_CANNOT_WRITE: - printf("You've run out of free space on the destination volume or the volume is damaged.\n"); + printf("ERROR: You've run out of free space on the destination volume or the volume is damaged.\n"); bRet = false; break; default: - printf("Unspecified error code (%u).\n", (UINT)Status); + printf("ERROR: Unspecified error code (%u).\n", (UINT)Status); bRet = false; break; } @@ -537,7 +549,7 @@ return bRet; } else - printf("Cannot open file: %s.\n", GetCabinetName()); + printf("ERROR: Cannot open file: %s.\n", GetCabinetName()); return false; } @@ -548,7 +560,10 @@ * FUNCTION: Process cabinet */ { - printf("ReactOS Cabinet Manager\n\n"); + if (Verbose) + { + printf("ReactOS Cabinet Manager\n\n"); + } switch (Mode) { @@ -601,21 +616,27 @@ * FileName = Pointer to buffer with name of file (full path) */ { - printf("Extracting %s\n", GetFileName(FileName)); + if (Verbose) + { + printf("Extracting %s\n", GetFileName(FileName)); + } } void CCABManager::OnDiskChange(char* CabinetName, - char* DiskLabel) -/* - * FUNCTION: Called when a new disk is to be processed - * ARGUMENTS: - * CabinetName = Pointer to buffer with name of cabinet - * DiskLabel = Pointer to buffer with label of disk - */ -{ - printf("\nChanging to cabinet %s - %s\n\n", CabinetName, DiskLabel); + char* DiskLabel) + /* + * FUNCTION: Called when a new disk is to be processed + * ARGUMENTS: + * CabinetName = Pointer to buffer with name of cabinet + * DiskLabel = Pointer to buffer with label of disk + */ +{ + if (Verbose) + { + printf("\nChanging to cabinet %s - %s\n\n", CabinetName, DiskLabel); + } } @@ -628,9 +649,13 @@ * FileName = Pointer to buffer with name of file (full path) */ { - printf("Adding %s\n", GetFileName(FileName)); -} - + if (Verbose) + { + printf("Adding %s\n", GetFileName(FileName)); + } +} + +CCABManager CABMgr; int main(int argc, char * argv[]) /* @@ -640,11 +665,9 @@ * argv = Pointer to list of command line arguments */ { - CCABManager CABMgr; bool status = false; - if (CABMgr.ParseCmdline(argc, argv)) - status = CABMgr.Run(); + if (CABMgr.ParseCmdline(argc, argv)) status = CABMgr.Run(); return (status ? 0 : 1); }

1 0

[akhaldi] 60448: [WIN32K] * Improve sanity checking in IntEngAlphaBlend(). Brought to you by Huw Campbell (huw .dot. campbell @at@ gmail .dot. com) CORE-7458 #resolve #comment Committed in r60448. ...
by akhaldi＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: akhaldi Date: Sun Sep 29 14:33:09 2013 New Revision: 60448 URL: http://svn.reactos.org/svn/reactos?rev=60448&view=rev Log: [WIN32K] * Improve sanity checking in IntEngAlphaBlend(). Brought to you by Huw Campbell (huw .dot. campbell @at@ gmail .dot. com) CORE-7458 #resolve #comment Committed in r60448. Thanks ;) Modified: trunk/reactos/win32ss/gdi/eng/alphablend.c Modified: trunk/reactos/win32ss/gdi/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/alphablend… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/alphablend.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/alphablend.c [iso-8859-1] Sun Sep 29 14:33:09 2013 @@ -118,7 +118,7 @@ OutputRect.top += Translate.y; OutputRect.bottom += Translate.y; - ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); + ASSERT(InputRect.left <= InputRect.right && InputRect.top <= InputRect.bottom); Ret = FALSE; ClippingType = (ClipRegion == NULL) ? DC_TRIVIAL : ClipRegion->iDComplexity; @@ -141,7 +141,6 @@ Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); - ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); /* Aplha blend one rect */ Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( @@ -170,7 +169,6 @@ Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); - ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); /* Alpha blend one rect */ Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend(

1 0

[akhaldi] 60447: [DINPUT_WINETEST] * Speedup build.
by akhaldi＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: akhaldi Date: Sun Sep 29 12:17:56 2013 New Revision: 60447 URL: http://svn.reactos.org/svn/reactos?rev=60447&view=rev Log: [DINPUT_WINETEST] * Speedup build. Modified: trunk/rostests/winetests/dinput/CMakeLists.txt Modified: trunk/rostests/winetests/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/CMakeLis… ============================================================================== --- trunk/rostests/winetests/dinput/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/CMakeLists.txt [iso-8859-1] Sun Sep 29 12:17:56 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) add_executable(dinput_winetest device.c @@ -9,7 +7,7 @@ mouse.c testlist.c) -target_link_libraries(dinput_winetest wine dinput_data_formats) +target_link_libraries(dinput_winetest dinput_data_formats) set_module_type(dinput_winetest win32cui) -add_importlibs(dinput_winetest dinput ole32 user32 msvcrt kernel32 ntdll) +add_importlibs(dinput_winetest dinput ole32 user32 msvcrt kernel32) add_cd_file(TARGET dinput_winetest DESTINATION reactos/bin FOR all)

1 0

[akhaldi] 60446: [DINPUT] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: akhaldi Date: Sun Sep 29 12:16:54 2013 New Revision: 60446 URL: http://svn.reactos.org/svn/reactos?rev=60446&view=rev Log: [DINPUT] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/directx/dinput/CMakeLists.txt trunk/reactos/dll/directx/dinput/device.c trunk/reactos/dll/directx/dinput/dinput_main.c trunk/reactos/dll/directx/dinput/dinput_private.h trunk/reactos/dll/directx/dinput/effect_linuxinput.c trunk/reactos/dll/directx/dinput/joystick.c trunk/reactos/dll/directx/dinput/joystick_linux.c trunk/reactos/dll/directx/dinput/joystick_linuxinput.c trunk/reactos/dll/directx/dinput/joystick_osx.c trunk/reactos/dll/directx/dinput/joystick_private.h trunk/reactos/dll/directx/dinput/keyboard.c trunk/reactos/dll/directx/dinput/mouse.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/CMakeLi… ============================================================================== --- trunk/reactos/dll/directx/dinput/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/CMakeLists.txt [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -1,13 +1,9 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(dinput.dll dinput.spec ADD_IMPORTLIB) -add_library(dinput SHARED +list(APPEND SOURCE config.c data_formats.c device.c @@ -19,12 +15,12 @@ joystick_osx.c keyboard.c mouse.c - dinput.rc ${CMAKE_CURRENT_BINARY_DIR}/dinput.def) +add_library(dinput SHARED ${SOURCE} dinput.rc) add_library(dinput_data_formats data_formats.c) add_dependencies(dinput_data_formats psdk) -set_module_type(dinput win32dll UNICODE) +set_module_type(dinput win32dll) target_link_libraries(dinput dxguid uuid wine) add_importlibs(dinput comctl32 ole32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET dinput DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/dinput/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/device.… ============================================================================== --- trunk/reactos/dll/directx/dinput/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/device.c [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -145,13 +145,13 @@ } void _dump_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) { - TRACE(" - enumerating : %s ('%s') - %2d - 0x%08x - %s\n", - debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, ddoi->tszName); + TRACE(" - enumerating : %s ('%s') - %2d - 0x%08x - %s - 0x%x\n", + debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, ddoi->tszName, ddoi->dwFlags); } void _dump_OBJECTINSTANCEW(const DIDEVICEOBJECTINSTANCEW *ddoi) { - TRACE(" - enumerating : %s ('%s'), - %2d - 0x%08x - %s\n", - debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, debugstr_w(ddoi->tszName)); + TRACE(" - enumerating : %s ('%s'), - %2d - 0x%08x - %s - 0x%x\n", + debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, debugstr_w(ddoi->tszName), ddoi->dwFlags); } /* This function is a helper to convert a GUID into any possible DInput GUID out there */ Modified: trunk/reactos/dll/directx/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput_… ============================================================================== --- trunk/reactos/dll/directx/dinput/dinput_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/dinput_main.c [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -375,17 +375,17 @@ for (i = 0; i < NB_DINPUT_DEVICES; i++) { if (!dinput_devices[i]->enum_deviceA) continue; - for (j = 0, r = -1; r != 0; j++) { - devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - if ((r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { - if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) - return 0; - } - } - } - - return 0; + for (j = 0, r = S_OK; SUCCEEDED(r); j++) { + devInstance.dwSize = sizeof(devInstance); + TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); + r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j); + if (r == S_OK) + if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) + return S_OK; + } + } + + return S_OK; } /****************************************************************************** * IDirectInputW_EnumDevices @@ -397,7 +397,8 @@ IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); DIDEVICEINSTANCEW devInstance; unsigned int i; - int j, r; + int j; + HRESULT r; TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), @@ -414,17 +415,17 @@ for (i = 0; i < NB_DINPUT_DEVICES; i++) { if (!dinput_devices[i]->enum_deviceW) continue; - for (j = 0, r = -1; r != 0; j++) { - devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - if ((r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { - if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) - return 0; - } - } - } - - return 0; + for (j = 0, r = S_OK; SUCCEEDED(r); j++) { + devInstance.dwSize = sizeof(devInstance); + TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); + r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j); + if (r == S_OK) + if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) + return S_OK; + } + } + + return S_OK; } static ULONG WINAPI IDirectInputAImpl_AddRef(LPDIRECTINPUT7A iface) @@ -913,18 +914,18 @@ /* Enumerate all the joysticks */ for (i = 0; i < NB_DINPUT_DEVICES; i++) { - BOOL enumSuccess; + HRESULT enumSuccess; if (!dinput_devices[i]->enum_deviceA) continue; - for (j = 0, enumSuccess = -1; enumSuccess != 0; j++) + for (j = 0, enumSuccess = S_OK; SUCCEEDED(enumSuccess); j++) { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); callbackFlags = diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); - if (enumSuccess) + if (enumSuccess == S_OK) { IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); @@ -973,18 +974,18 @@ /* Enumerate all the joysticks */ for (i = 0; i < NB_DINPUT_DEVICES; i++) { - BOOL enumSuccess; + HRESULT enumSuccess; if (!dinput_devices[i]->enum_deviceW) continue; - for (j = 0, enumSuccess = -1; enumSuccess != 0; j++) + for (j = 0, enumSuccess = S_OK; SUCCEEDED(enumSuccess); j++) { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); callbackFlags = diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); - if (enumSuccess) + if (enumSuccess == S_OK) { IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); @@ -1152,7 +1153,8 @@ { IDirectInputImpl *di = impl_from_IDirectInputJoyConfig8(iface); UINT found = 0; - int i, j, r; + int i, j; + HRESULT r; FIXME("(%p)->(%d, %p, 0x%08x): semi-stub!\n", iface, id, info, flags); @@ -1168,11 +1170,11 @@ { if (!dinput_devices[i]->enum_deviceA) continue; - for (j = 0, r = -1; r != 0; j++) + for (j = 0, r = S_OK; SUCCEEDED(r); j++) { DIDEVICEINSTANCEA dev; dev.dwSize = sizeof(dev); - if ((r = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, 0, &dev, di->dwVersion, j))) + if ((r = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, 0, &dev, di->dwVersion, j)) == S_OK) { /* Only take into account the chosen id */ if (found == id) @@ -1639,7 +1641,7 @@ LeaveCriticalSection(&dinput_hook_crit); } -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserv) +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved) { switch(reason) { @@ -1648,6 +1650,7 @@ DINPUT_instance = inst; break; case DLL_PROCESS_DETACH: + if (reserved) break; DeleteCriticalSection(&dinput_hook_crit); break; } Modified: trunk/reactos/dll/directx/dinput/dinput_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput_… ============================================================================== --- trunk/reactos/dll/directx/dinput/dinput_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/dinput_private.h [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -55,8 +55,8 @@ /* Function called by all devices that Wine supports */ struct dinput_device { const char *name; - BOOL (*enum_deviceA)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id); - BOOL (*enum_deviceW)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id); + HRESULT (*enum_deviceA)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id); + HRESULT (*enum_deviceW)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id); HRESULT (*create_device)(IDirectInputImpl *dinput, REFGUID rguid, REFIID riid, LPVOID *pdev, int unicode); }; Modified: trunk/reactos/dll/directx/dinput/effect_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/effect_… ============================================================================== --- trunk/reactos/dll/directx/dinput/effect_linuxinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/effect_linuxinput.c [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -43,6 +43,7 @@ #include "dinput.h" #include "device_private.h" +#include "joystick_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dinput); @@ -65,194 +66,6 @@ { return CONTAINING_RECORD(iface, LinuxInputEffectImpl, IDirectInputEffect_iface); } - -/****************************************************************************** - * DirectInputEffect Functional Helper - */ - -static DWORD _typeFromGUID(REFGUID guid) -{ - if (IsEqualGUID(guid, &GUID_ConstantForce)) { - return DIEFT_CONSTANTFORCE; - } else if (IsEqualGUID(guid, &GUID_Square) - || IsEqualGUID(guid, &GUID_Sine) - || IsEqualGUID(guid, &GUID_Triangle) - || IsEqualGUID(guid, &GUID_SawtoothUp) - || IsEqualGUID(guid, &GUID_SawtoothDown)) { - return DIEFT_PERIODIC; - } else if (IsEqualGUID(guid, &GUID_RampForce)) { - return DIEFT_RAMPFORCE; - } else if (IsEqualGUID(guid, &GUID_Spring) - || IsEqualGUID(guid, &GUID_Damper) - || IsEqualGUID(guid, &GUID_Inertia) - || IsEqualGUID(guid, &GUID_Friction)) { - return DIEFT_CONDITION; - } else if (IsEqualGUID(guid, &GUID_CustomForce)) { - return DIEFT_CUSTOMFORCE; - } else { - WARN("GUID (%s) is not a known force type\n", _dump_dinput_GUID(guid)); - return 0; - } -} - - -/****************************************************************************** - * DirectInputEffect debug helpers - */ - -static void _dump_DIEFFECT_flags(DWORD dwFlags) -{ - if (TRACE_ON(dinput)) { - unsigned int i; - static const struct { - DWORD mask; - const char *name; - } flags[] = { -#define FE(x) { x, #x} - FE(DIEFF_CARTESIAN), - FE(DIEFF_OBJECTIDS), - FE(DIEFF_OBJECTOFFSETS), - FE(DIEFF_POLAR), - FE(DIEFF_SPHERICAL) -#undef FE - }; - for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) - if (flags[i].mask & dwFlags) - TRACE("%s ", flags[i].name); - TRACE("\n"); - } -} - -static void _dump_DIENVELOPE(LPCDIENVELOPE env) -{ - if (env->dwSize != sizeof(DIENVELOPE)) { - WARN("Non-standard DIENVELOPE structure size %d.\n", env->dwSize); - } - TRACE("Envelope has attack (level: %d time: %d), fade (level: %d time: %d)\n", - env->dwAttackLevel, env->dwAttackTime, env->dwFadeLevel, env->dwFadeTime); -} - -static void _dump_DICONSTANTFORCE(LPCDICONSTANTFORCE frc) -{ - TRACE("Constant force has magnitude %d\n", frc->lMagnitude); -} - -static void _dump_DIPERIODIC(LPCDIPERIODIC frc) -{ - TRACE("Periodic force has magnitude %d, offset %d, phase %d, period %d\n", - frc->dwMagnitude, frc->lOffset, frc->dwPhase, frc->dwPeriod); -} - -static void _dump_DIRAMPFORCE(LPCDIRAMPFORCE frc) -{ - TRACE("Ramp force has start %d, end %d\n", - frc->lStart, frc->lEnd); -} - -static void _dump_DICONDITION(LPCDICONDITION frc) -{ - TRACE("Condition has offset %d, pos/neg coefficients %d and %d, pos/neg saturations %d and %d, deadband %d\n", - frc->lOffset, frc->lPositiveCoefficient, frc->lNegativeCoefficient, - frc->dwPositiveSaturation, frc->dwNegativeSaturation, frc->lDeadBand); -} - -static void _dump_DICUSTOMFORCE(LPCDICUSTOMFORCE frc) -{ - unsigned int i; - TRACE("Custom force uses %d channels, sample period %d. Has %d samples at %p.\n", - frc->cChannels, frc->dwSamplePeriod, frc->cSamples, frc->rglForceData); - if (frc->cSamples % frc->cChannels != 0) - WARN("Custom force has a non-integral samples-per-channel count!\n"); - if (TRACE_ON(dinput)) { - TRACE("Custom force data (time aligned, axes in order):\n"); - for (i = 1; i <= frc->cSamples; ++i) { - TRACE("%d ", frc->rglForceData[i]); - if (i % frc->cChannels == 0) - TRACE("\n"); - } - } -} - -static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) -{ - unsigned int i; - DWORD type = _typeFromGUID(guid); - - TRACE("Dumping DIEFFECT structure:\n"); - TRACE(" - dwSize: %d\n", eff->dwSize); - if ((eff->dwSize != sizeof(DIEFFECT)) && (eff->dwSize != sizeof(DIEFFECT_DX5))) { - WARN("Non-standard DIEFFECT structure size %d\n", eff->dwSize); - } - TRACE(" - dwFlags: %d\n", eff->dwFlags); - TRACE(" "); - _dump_DIEFFECT_flags(eff->dwFlags); - TRACE(" - dwDuration: %d\n", eff->dwDuration); - TRACE(" - dwGain: %d\n", eff->dwGain); - - if (eff->dwGain > 10000) - WARN("dwGain is out of range (>10,000)\n"); - - TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton); - TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval); - TRACE(" - rglDirection: %p\n", eff->rglDirection); - TRACE(" - cbTypeSpecificParams: %d\n", eff->cbTypeSpecificParams); - TRACE(" - lpvTypeSpecificParams: %p\n", eff->lpvTypeSpecificParams); - - /* Only trace some members if dwFlags indicates they have data */ - if (dwFlags & DIEP_AXES) { - TRACE(" - cAxes: %d\n", eff->cAxes); - TRACE(" - rgdwAxes: %p\n", eff->rgdwAxes); - - if (TRACE_ON(dinput) && eff->rgdwAxes) { - TRACE(" "); - for (i = 0; i < eff->cAxes; ++i) - TRACE("%d ", eff->rgdwAxes[i]); - TRACE("\n"); - } - } - - if (dwFlags & DIEP_ENVELOPE) { - TRACE(" - lpEnvelope: %p\n", eff->lpEnvelope); - if (eff->lpEnvelope != NULL) - _dump_DIENVELOPE(eff->lpEnvelope); - } - - if (eff->dwSize > sizeof(DIEFFECT_DX5)) - TRACE(" - dwStartDelay: %d\n", eff->dwStartDelay); - - if (type == DIEFT_CONSTANTFORCE) { - if (eff->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) { - WARN("Effect claims to be a constant force but the type-specific params are the wrong size!\n"); - } else { - _dump_DICONSTANTFORCE(eff->lpvTypeSpecificParams); - } - } else if (type == DIEFT_PERIODIC) { - if (eff->cbTypeSpecificParams != sizeof(DIPERIODIC)) { - WARN("Effect claims to be a periodic force but the type-specific params are the wrong size!\n"); - } else { - _dump_DIPERIODIC(eff->lpvTypeSpecificParams); - } - } else if (type == DIEFT_RAMPFORCE) { - if (eff->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) { - WARN("Effect claims to be a ramp force but the type-specific params are the wrong size!\n"); - } else { - _dump_DIRAMPFORCE(eff->lpvTypeSpecificParams); - } - } else if (type == DIEFT_CONDITION) { - if (eff->cbTypeSpecificParams != sizeof(DICONDITION)) { - WARN("Effect claims to be a condition but the type-specific params are the wrong size!\n"); - } else { - _dump_DICONDITION(eff->lpvTypeSpecificParams); - } - } else if (type == DIEFT_CUSTOMFORCE) { - if (eff->cbTypeSpecificParams != sizeof(DICUSTOMFORCE)) { - WARN("Effect claims to be a custom force but the type-specific params are the wrong size!\n"); - } else { - _dump_DICUSTOMFORCE(eff->lpvTypeSpecificParams); - } - } -} - /****************************************************************************** * LinuxInputEffectImpl @@ -546,12 +359,12 @@ DWORD dwFlags) { LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); - DWORD type = _typeFromGUID(&This->guid); + DWORD type = typeFromGUID(&This->guid); HRESULT retval = DI_OK; TRACE("(this=%p,%p,%d)\n", This, peff, dwFlags); - _dump_DIEFFECT(peff, &This->guid, dwFlags); + dump_DIEFFECT(peff, &This->guid, dwFlags); if ((dwFlags & ~DIEP_NORESTART & ~DIEP_NODOWNLOAD & ~DIEP_START) == 0) { /* set everything */ @@ -800,7 +613,7 @@ { LinuxInputEffectImpl* newEffect = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LinuxInputEffectImpl)); - DWORD type = _typeFromGUID(rguid); + DWORD type = typeFromGUID(rguid); newEffect->IDirectInputEffect_iface.lpVtbl = &LinuxInputEffectVtbl; newEffect->ref = 1; @@ -869,7 +682,7 @@ REFGUID rguid, LPDIEFFECTINFOA info) { - DWORD type = _typeFromGUID(rguid); + DWORD type = typeFromGUID(rguid); TRACE("(%d, %s, %p) type=%d\n", fd, _dump_dinput_GUID(rguid), info, type); @@ -903,7 +716,7 @@ REFGUID rguid, LPDIEFFECTINFOW info) { - DWORD type = _typeFromGUID(rguid); + DWORD type = typeFromGUID(rguid); TRACE("(%d, %s, %p) type=%d\n", fd, _dump_dinput_GUID(rguid), info, type); Modified: trunk/reactos/dll/directx/dinput/joystick.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… ============================================================================== --- trunk/reactos/dll/directx/dinput/joystick.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/joystick.c [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -49,6 +49,184 @@ return &This->base.IDirectInputDevice8W_iface; } +DWORD typeFromGUID(REFGUID guid) +{ + if (IsEqualGUID(guid, &GUID_ConstantForce)) { + return DIEFT_CONSTANTFORCE; + } else if (IsEqualGUID(guid, &GUID_Square) + || IsEqualGUID(guid, &GUID_Sine) + || IsEqualGUID(guid, &GUID_Triangle) + || IsEqualGUID(guid, &GUID_SawtoothUp) + || IsEqualGUID(guid, &GUID_SawtoothDown)) { + return DIEFT_PERIODIC; + } else if (IsEqualGUID(guid, &GUID_RampForce)) { + return DIEFT_RAMPFORCE; + } else if (IsEqualGUID(guid, &GUID_Spring) + || IsEqualGUID(guid, &GUID_Damper) + || IsEqualGUID(guid, &GUID_Inertia) + || IsEqualGUID(guid, &GUID_Friction)) { + return DIEFT_CONDITION; + } else if (IsEqualGUID(guid, &GUID_CustomForce)) { + return DIEFT_CUSTOMFORCE; + } else { + WARN("GUID (%s) is not a known force type\n", _dump_dinput_GUID(guid)); + return 0; + } +} + +static void _dump_DIEFFECT_flags(DWORD dwFlags) +{ + if (TRACE_ON(dinput)) { + unsigned int i; + static const struct { + DWORD mask; + const char *name; + } flags[] = { +#define FE(x) { x, #x} + FE(DIEFF_CARTESIAN), + FE(DIEFF_OBJECTIDS), + FE(DIEFF_OBJECTOFFSETS), + FE(DIEFF_POLAR), + FE(DIEFF_SPHERICAL) +#undef FE + }; + for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) + if (flags[i].mask & dwFlags) + TRACE("%s ", flags[i].name); + TRACE("\n"); + } +} + +static void _dump_DIENVELOPE(LPCDIENVELOPE env) +{ + if (env->dwSize != sizeof(DIENVELOPE)) { + WARN("Non-standard DIENVELOPE structure size %d.\n", env->dwSize); + } + TRACE("Envelope has attack (level: %d time: %d), fade (level: %d time: %d)\n", + env->dwAttackLevel, env->dwAttackTime, env->dwFadeLevel, env->dwFadeTime); +} + +static void _dump_DICONSTANTFORCE(LPCDICONSTANTFORCE frc) +{ + TRACE("Constant force has magnitude %d\n", frc->lMagnitude); +} + +static void _dump_DIPERIODIC(LPCDIPERIODIC frc) +{ + TRACE("Periodic force has magnitude %d, offset %d, phase %d, period %d\n", + frc->dwMagnitude, frc->lOffset, frc->dwPhase, frc->dwPeriod); +} + +static void _dump_DIRAMPFORCE(LPCDIRAMPFORCE frc) +{ + TRACE("Ramp force has start %d, end %d\n", + frc->lStart, frc->lEnd); +} + +static void _dump_DICONDITION(LPCDICONDITION frc) +{ + TRACE("Condition has offset %d, pos/neg coefficients %d and %d, pos/neg saturations %d and %d, deadband %d\n", + frc->lOffset, frc->lPositiveCoefficient, frc->lNegativeCoefficient, + frc->dwPositiveSaturation, frc->dwNegativeSaturation, frc->lDeadBand); +} + +static void _dump_DICUSTOMFORCE(LPCDICUSTOMFORCE frc) +{ + unsigned int i; + TRACE("Custom force uses %d channels, sample period %d. Has %d samples at %p.\n", + frc->cChannels, frc->dwSamplePeriod, frc->cSamples, frc->rglForceData); + if (frc->cSamples % frc->cChannels != 0) + WARN("Custom force has a non-integral samples-per-channel count!\n"); + if (TRACE_ON(dinput)) { + TRACE("Custom force data (time aligned, axes in order):\n"); + for (i = 1; i <= frc->cSamples; ++i) { + TRACE("%d ", frc->rglForceData[i]); + if (i % frc->cChannels == 0) + TRACE("\n"); + } + } +} + +void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) +{ + DWORD type = typeFromGUID(guid); + unsigned int i; + + TRACE("Dumping DIEFFECT structure:\n"); + TRACE(" - dwSize: %d\n", eff->dwSize); + if ((eff->dwSize != sizeof(DIEFFECT)) && (eff->dwSize != sizeof(DIEFFECT_DX5))) { + WARN("Non-standard DIEFFECT structure size %d\n", eff->dwSize); + } + TRACE(" - dwFlags: %d\n", eff->dwFlags); + TRACE(" "); + _dump_DIEFFECT_flags(eff->dwFlags); + TRACE(" - dwDuration: %d\n", eff->dwDuration); + TRACE(" - dwGain: %d\n", eff->dwGain); + + if (eff->dwGain > 10000) + WARN("dwGain is out of range (>10,000)\n"); + + TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton); + TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval); + TRACE(" - rglDirection: %p\n", eff->rglDirection); + TRACE(" - cbTypeSpecificParams: %d\n", eff->cbTypeSpecificParams); + TRACE(" - lpvTypeSpecificParams: %p\n", eff->lpvTypeSpecificParams); + + /* Only trace some members if dwFlags indicates they have data */ + if (dwFlags & DIEP_AXES) { + TRACE(" - cAxes: %d\n", eff->cAxes); + TRACE(" - rgdwAxes: %p\n", eff->rgdwAxes); + + if (TRACE_ON(dinput) && eff->rgdwAxes) { + TRACE(" "); + for (i = 0; i < eff->cAxes; ++i) + TRACE("%d ", eff->rgdwAxes[i]); + TRACE("\n"); + } + } + + if (dwFlags & DIEP_ENVELOPE) { + TRACE(" - lpEnvelope: %p\n", eff->lpEnvelope); + if (eff->lpEnvelope != NULL) + _dump_DIENVELOPE(eff->lpEnvelope); + } + + if (eff->dwSize > sizeof(DIEFFECT_DX5)) + TRACE(" - dwStartDelay: %d\n", eff->dwStartDelay); + + if (type == DIEFT_CONSTANTFORCE) { + if (eff->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) { + WARN("Effect claims to be a constant force but the type-specific params are the wrong size!\n"); + } else { + _dump_DICONSTANTFORCE(eff->lpvTypeSpecificParams); + } + } else if (type == DIEFT_PERIODIC) { + if (eff->cbTypeSpecificParams != sizeof(DIPERIODIC)) { + WARN("Effect claims to be a periodic force but the type-specific params are the wrong size!\n"); + } else { + _dump_DIPERIODIC(eff->lpvTypeSpecificParams); + } + } else if (type == DIEFT_RAMPFORCE) { + if (eff->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) { + WARN("Effect claims to be a ramp force but the type-specific params are the wrong size!\n"); + } else { + _dump_DIRAMPFORCE(eff->lpvTypeSpecificParams); + } + } else if (type == DIEFT_CONDITION) { + if (eff->cbTypeSpecificParams != sizeof(DICONDITION)) { + WARN("Effect claims to be a condition but the type-specific params are the wrong size!\n"); + } else { + _dump_DICONDITION(eff->lpvTypeSpecificParams); + } + } else if (type == DIEFT_CUSTOMFORCE) { + if (eff->cbTypeSpecificParams != sizeof(DICUSTOMFORCE)) { + WARN("Effect claims to be a custom force but the type-specific params are the wrong size!\n"); + } else { + _dump_DICUSTOMFORCE(eff->lpvTypeSpecificParams); + } + } +} + BOOL device_disabled_registry(const char* name) { static const char disabled_str[] = "disabled"; @@ -94,6 +272,7 @@ { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); DWORD i; + ObjProps remap_props; TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph); @@ -112,6 +291,28 @@ if (ph->dwHow == DIPH_DEVICE) { TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { + + remap_props.lDevMin = This->props[i].lMin; + remap_props.lDevMax = This->props[i].lMax; + + remap_props.lDeadZone = This->props[i].lDeadZone; + remap_props.lSaturation = This->props[i].lSaturation; + + remap_props.lMin = pr->lMin; + remap_props.lMax = pr->lMax; + + switch (This->base.data_format.wine_df->rgodf[i].dwOfs) { + case DIJOFS_X : This->js.lX = joystick_map_axis(&remap_props, This->js.lX); break; + case DIJOFS_Y : This->js.lY = joystick_map_axis(&remap_props, This->js.lY); break; + case DIJOFS_Z : This->js.lZ = joystick_map_axis(&remap_props, This->js.lZ); break; + case DIJOFS_RX : This->js.lRx = joystick_map_axis(&remap_props, This->js.lRx); break; + case DIJOFS_RY : This->js.lRy = joystick_map_axis(&remap_props, This->js.lRy); break; + case DIJOFS_RZ : This->js.lRz = joystick_map_axis(&remap_props, This->js.lRz); break; + case DIJOFS_SLIDER(0): This->js.rglSlider[0] = joystick_map_axis(&remap_props, This->js.rglSlider[0]); break; + case DIJOFS_SLIDER(1): This->js.rglSlider[1] = joystick_map_axis(&remap_props, This->js.rglSlider[1]); break; + default: break; + } + This->props[i].lMin = pr->lMin; This->props[i].lMax = pr->lMax; } @@ -120,6 +321,30 @@ TRACE("proprange(%d,%d) obj=%d\n", pr->lMin, pr->lMax, obj); if (obj >= 0) { + + /*ePSXe polls the joystick immediately after setting the range for calibration purposes, so the old values need to be remapped to the new range before it does so*/ + + remap_props.lDevMin = This->props[obj].lMin; + remap_props.lDevMax = This->props[obj].lMax; + + remap_props.lDeadZone = This->props[obj].lDeadZone; + remap_props.lSaturation = This->props[obj].lSaturation; + + remap_props.lMin = pr->lMin; + remap_props.lMax = pr->lMax; + + switch (ph->dwObj) { + case DIJOFS_X : This->js.lX = joystick_map_axis(&remap_props, This->js.lX); break; + case DIJOFS_Y : This->js.lY = joystick_map_axis(&remap_props, This->js.lY); break; + case DIJOFS_Z : This->js.lZ = joystick_map_axis(&remap_props, This->js.lZ); break; + case DIJOFS_RX : This->js.lRx = joystick_map_axis(&remap_props, This->js.lRx); break; + case DIJOFS_RY : This->js.lRy = joystick_map_axis(&remap_props, This->js.lRy); break; + case DIJOFS_RZ : This->js.lRz = joystick_map_axis(&remap_props, This->js.lRz); break; + case DIJOFS_SLIDER(0): This->js.rglSlider[0] = joystick_map_axis(&remap_props, This->js.rglSlider[0]); break; + case DIJOFS_SLIDER(1): This->js.rglSlider[1] = joystick_map_axis(&remap_props, This->js.rglSlider[1]); break; + default: break; + } + This->props[obj].lMin = pr->lMin; This->props[obj].lMax = pr->lMax; return DI_OK; Modified: trunk/reactos/dll/directx/dinput/joystick_linux.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… ============================================================================== --- trunk/reactos/dll/directx/dinput/joystick_linux.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/joystick_linux.c [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -220,15 +220,15 @@ return joystick_devices_count; } -static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { int fd = -1; - if (id >= find_joystick_devices()) return FALSE; + if (id >= find_joystick_devices()) return E_FAIL; if (dwFlags & DIEDFL_FORCEFEEDBACK) { WARN("force feedback not supported\n"); - return FALSE; + return S_FALSE; } if ((dwDevType == 0) || @@ -238,7 +238,7 @@ if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) { WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].name, strerror(errno)); - return FALSE; + return S_FALSE; } /* Return joystick */ @@ -257,21 +257,21 @@ lpddi->guidFFDriver = GUID_NULL; close(fd); TRACE("Enumerating the linux Joystick device: %s (%s)\n", joystick_devices[id].device, lpddi->tszProductName); - return TRUE; - } - - return FALSE; -} - -static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) + return S_OK; + } + + return S_FALSE; +} + +static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { int fd = -1; - if (id >= find_joystick_devices()) return FALSE; + if (id >= find_joystick_devices()) return E_FAIL; if (dwFlags & DIEDFL_FORCEFEEDBACK) { WARN("force feedback not supported\n"); - return FALSE; + return S_FALSE; } if ((dwDevType == 0) || @@ -281,7 +281,7 @@ if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) { WARN("open(%s,O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); - return FALSE; + return S_FALSE; } /* Return joystick */ @@ -299,10 +299,10 @@ lpddi->guidFFDriver = GUID_NULL; close(fd); TRACE("Enumerating the linux Joystick device: %s (%s)\n", joystick_devices[id].device, joystick_devices[id].name); - return TRUE; - } - - return FALSE; + return S_OK; + } + + return S_FALSE; } static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, Modified: trunk/reactos/dll/directx/dinput/joystick_linuxinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… ============================================================================== --- trunk/reactos/dll/directx/dinput/joystick_linuxinput.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/joystick_linuxinput.c [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -43,7 +43,7 @@ # include <linux/input.h> # undef SW_MAX # if defined(EVIOCGBIT) && defined(EV_ABS) && defined(BTN_PINKIE) -# define HAVE_CORRECT_LINUXINPUT_H +# define HAS_PROPER_HEADER # endif #endif #ifdef HAVE_SYS_POLL_H @@ -65,7 +65,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); -#ifdef HAVE_CORRECT_LINUXINPUT_H +#ifdef HAS_PROPER_HEADER #define EVDEVPREFIX "/dev/input/event" #define EVDEVDRIVER " (event)" @@ -363,54 +363,54 @@ MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszProductName, MAX_PATH); } -static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { find_joydevs(); if (id >= have_joydevs) { - return FALSE; + return E_FAIL; } if (!((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) - return FALSE; + return S_FALSE; #ifndef HAVE_STRUCT_FF_EFFECT_DIRECTION if (dwFlags & DIEDFL_FORCEFEEDBACK) - return FALSE; + return S_FALSE; #endif if (!(dwFlags & DIEDFL_FORCEFEEDBACK) || joydevs[id].has_ff) { fill_joystick_dideviceinstanceA(lpddi, version, id); - return TRUE; + return S_OK; } - return FALSE; -} - -static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) + return S_FALSE; +} + +static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { find_joydevs(); if (id >= have_joydevs) { - return FALSE; + return E_FAIL; } if (!((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) - return FALSE; + return S_FALSE; #ifndef HAVE_STRUCT_FF_EFFECT_DIRECTION if (dwFlags & DIEDFL_FORCEFEEDBACK) - return FALSE; + return S_FALSE; #endif if (!(dwFlags & DIEDFL_FORCEFEEDBACK) || joydevs[id].has_ff) { fill_joystick_dideviceinstanceW(lpddi, version, id); - return TRUE; + return S_OK; } - return FALSE; + return S_FALSE; } static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsigned short index) @@ -445,9 +445,10 @@ newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit"); /* Count number of available axes - supported Axis & POVs */ - for (i = 0; i < WINE_JOYSTICK_MAX_AXES; i++) - { - if (test_bit(newDevice->joydev->absbits, i)) + for (i = 0; i < ABS_MAX; i++) + { + if (i < WINE_JOYSTICK_MAX_AXES && + test_bit(newDevice->joydev->absbits, i)) { newDevice->generic.device_axis_count++; newDevice->dev_axes_to_di[i] = idx; @@ -1477,7 +1478,7 @@ IDirectInputDevice8WImpl_GetImageInfo }; -#else /* HAVE_CORRECT_LINUXINPUT_H */ +#else /* HAS_PROPER_HEADER */ const struct dinput_device joystick_linuxinput_device = { "Wine Linux-input joystick driver", @@ -1486,4 +1487,4 @@ NULL }; -#endif /* HAVE_CORRECT_LINUXINPUT_H */ +#endif /* HAS_PROPER_HEADER */ Modified: trunk/reactos/dll/directx/dinput/joystick_osx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… ============================================================================== --- trunk/reactos/dll/directx/dinput/joystick_osx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/joystick_osx.c [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -24,6 +24,11 @@ //#include "wine/port.h" #if defined(HAVE_IOKIT_HID_IOHIDLIB_H) +#define DWORD UInt32 +#define LPDWORD UInt32* +#define LONG SInt32 +#define LPLONG SInt32* +#define E_PENDING __carbon_E_PENDING #define ULONG __carbon_ULONG #define E_INVALIDARG __carbon_E_INVALIDARG #define E_OUTOFMEMORY __carbon_E_OUTOFMEMORY @@ -44,7 +49,9 @@ #define MAKE_HRESULT __carbon_MAKE_HRESULT #define HRESULT __carbon_HRESULT #define STDMETHODCALLTYPE __carbon_STDMETHODCALLTYPE +#include <IOKit/IOKitLib.h> #include <IOKit/hid/IOHIDLib.h> +#include <ForceFeedback/ForceFeedback.h> #undef ULONG #undef E_INVALIDARG #undef E_OUTOFMEMORY @@ -65,6 +72,11 @@ #undef MAKE_HRESULT #undef HRESULT #undef STDMETHODCALLTYPE +#undef DWORD +#undef LPDWORD +#undef LONG +#undef LPLONG +#undef E_PENDING #endif /* HAVE_IOKIT_HID_IOHIDLIB_H */ //#include "wine/debug.h" @@ -98,6 +110,8 @@ int id; CFMutableArrayRef elementCFArrayRef; ObjProps **propmap; + FFDeviceObjectReference ff; + struct list effects; }; static inline JoystickImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) @@ -110,14 +124,115 @@ return CONTAINING_RECORD(CONTAINING_RECORD(CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface), JoystickGenericImpl, base), JoystickImpl, generic); } + +typedef struct _EffectImpl { + IDirectInputEffect IDirectInputEffect_iface; + LONG ref; + + JoystickImpl *device; + FFEffectObjectReference effect; + GUID guid; + + struct list entry; +} EffectImpl; + +static EffectImpl *impl_from_IDirectInputEffect(IDirectInputEffect *iface) +{ + return CONTAINING_RECORD(iface, EffectImpl, IDirectInputEffect_iface); +} + +static const IDirectInputEffectVtbl EffectVtbl; static const GUID DInput_Wine_OsX_Joystick_GUID = { /* 59CAD8F6-E617-41E2-8EB7-47B23EEEDC5A */ 0x59CAD8F6, 0xE617, 0x41E2, {0x8E, 0xB7, 0x47, 0xB2, 0x3E, 0xEE, 0xDC, 0x5A} }; +static HRESULT osx_to_win32_hresult(HRESULT in) +{ + /* OSX returns 16-bit COM runtime errors, which we should + * convert to win32 */ + switch(in){ + case 0x80000001: + return E_NOTIMPL; + case 0x80000002: + return E_OUTOFMEMORY; + case 0x80000003: + return E_INVALIDARG; + case 0x80000004: + return E_NOINTERFACE; + case 0x80000005: + return E_POINTER; + case 0x80000006: + return E_HANDLE; + case 0x80000007: + return E_ABORT; + case 0x80000008: + return E_FAIL; + case 0x80000009: + return E_ACCESSDENIED; + case 0x8000FFFF: + return E_UNEXPECTED; + } + return in; +} + static void CFSetApplierFunctionCopyToCFArray(const void *value, void *context) { CFArrayAppendValue( ( CFMutableArrayRef ) context, value ); +} + +static IOHIDDeviceRef get_device_ref(int id) +{ + IOHIDElementRef tIOHIDElementRef; + IOHIDDeviceRef tIOHIDDeviceRef; + + if (!gCollections) + return 0; + + tIOHIDElementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(gCollections, id); + if (!tIOHIDElementRef) + { + ERR("Invalid Element requested %i\n",id); + return 0; + } + + tIOHIDDeviceRef = IOHIDElementGetDevice(tIOHIDElementRef); + if (!tIOHIDDeviceRef) + { + ERR("Invalid Device requested %i\n",id); + return 0; + } + + return tIOHIDDeviceRef; +} + +static HRESULT get_ff(IOHIDDeviceRef device, FFDeviceObjectReference *ret) +{ + io_service_t service; + CFMutableDictionaryRef matching; + CFTypeRef type; + + matching = IOServiceMatching(kIOHIDDeviceKey); + if(!matching){ + WARN("IOServiceMatching failed, force feedback disabled\n"); + return DIERR_DEVICENOTREG; + } + + type = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDLocationIDKey)); + if(!matching){ + CFRelease(matching); + WARN("IOHIDDeviceGetProperty failed, force feedback disabled\n"); + return DIERR_DEVICENOTREG; + } + + CFDictionaryAddValue(matching, CFSTR(kIOHIDLocationIDKey), type); + + service = IOServiceGetMatchingService(kIOMasterPortDefault, matching); + + if(!ret) + return FFIsForceFeedback(service) == FF_OK ? S_OK : S_FALSE; + + return osx_to_win32_hresult(FFCreateDevice(service, ret)); } static CFMutableDictionaryRef creates_osx_device_match(int usage) @@ -298,30 +413,15 @@ static int get_osx_device_name(int id, char *name, int length) { CFStringRef str; - IOHIDElementRef tIOHIDElementRef; IOHIDDeviceRef tIOHIDDeviceRef; - if (!gCollections) - return 0; - - tIOHIDElementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(gCollections, id); - - if (!tIOHIDElementRef) - { - ERR("Invalid Element requested %i\n",id); - return 0; - } - - tIOHIDDeviceRef = IOHIDElementGetDevice(tIOHIDElementRef); + tIOHIDDeviceRef = get_device_ref(id); if (name) name[0] = 0; if (!tIOHIDDeviceRef) - { - ERR("Invalid Device requested %i\n",id); return 0; - } str = IOHIDDeviceGetProperty(tIOHIDDeviceRef, CFSTR( kIOHIDProductKey )); if (str) @@ -651,19 +751,21 @@ return joystick_devices_count; } -static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) -{ - if (id >= find_joystick_devices()) return FALSE; - - if (dwFlags & DIEDFL_FORCEFEEDBACK) { - WARN("force feedback not supported\n"); - return FALSE; - } +static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +{ + if (id >= find_joystick_devices()) return E_FAIL; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { + if (dwFlags & DIEDFL_FORCEFEEDBACK) { + IOHIDDeviceRef device = get_device_ref(id); + if(!device) + return S_FALSE; + if(get_ff(device, NULL) != S_OK) + return S_FALSE; + } /* Return joystick */ lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; @@ -679,27 +781,29 @@ get_osx_device_name(id, lpddi->tszProductName, MAX_PATH); lpddi->guidFFDriver = GUID_NULL; - return TRUE; - } - - return FALSE; -} - -static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) + return S_OK; + } + + return S_FALSE; +} + +static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { char name[MAX_PATH]; char friendly[32]; - if (id >= find_joystick_devices()) return FALSE; - - if (dwFlags & DIEDFL_FORCEFEEDBACK) { - WARN("force feedback not supported\n"); - return FALSE; - } + if (id >= find_joystick_devices()) return E_FAIL; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { + if (dwFlags & DIEDFL_FORCEFEEDBACK) { + IOHIDDeviceRef device = get_device_ref(id); + if(!device) + return S_FALSE; + if(get_ff(device, NULL) != S_OK) + return S_FALSE; + } /* Return joystick */ lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; @@ -716,16 +820,41 @@ MultiByteToWideChar(CP_ACP, 0, name, -1, lpddi->tszProductName, MAX_PATH); lpddi->guidFFDriver = GUID_NULL; - return TRUE; - } - - return FALSE; + return S_OK; + } + + return S_FALSE; +} + +static const char *osx_ff_axis_name(UInt8 axis) +{ + static char ret[6]; + switch(axis){ + case FFJOFS_X: + return "FFJOFS_X"; + case FFJOFS_Y: + return "FFJOFS_Y"; + case FFJOFS_Z: + return "FFJOFS_Z"; + } + sprintf(ret, "%u", (unsigned int)axis); + return ret; +} + +static int osx_axis_has_ff(FFCAPABILITIES *ffcaps, UInt8 axis) +{ + int i; + for(i = 0; i < ffcaps->numFfAxes; ++i) + if(ffcaps->ffAxes[i] == axis) + return 1; + return 0; } static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, JoystickImpl **pdev, unsigned short index) { DWORD i; + IOHIDDeviceRef device; JoystickImpl* newDevice; char name[MAX_PATH]; HRESULT hr; @@ -733,6 +862,7 @@ int idx = 0; int axis_map[8]; /* max axes */ int slider_count = 0; + FFCAPABILITIES ffcaps; TRACE("%s %p %p %hu\n", debugstr_guid(rguid), dinput, pdev, index); @@ -757,6 +887,38 @@ /* copy the device name */ newDevice->generic.name = HeapAlloc(GetProcessHeap(),0,strlen(name) + 1); strcpy(newDevice->generic.name, name); + + list_init(&newDevice->effects); + device = get_device_ref(index); + if(get_ff(device, &newDevice->ff) == S_OK){ + newDevice->generic.devcaps.dwFlags |= DIDC_FORCEFEEDBACK; + + hr = FFDeviceGetForceFeedbackCapabilities(newDevice->ff, &ffcaps); + if(SUCCEEDED(hr)){ + TRACE("FF Capabilities:\n"); + TRACE("\tsupportedEffects: 0x%x\n", (unsigned int)ffcaps.supportedEffects); + TRACE("\temulatedEffects: 0x%x\n", (unsigned int)ffcaps.emulatedEffects); + TRACE("\tsubType: 0x%x\n", (unsigned int)ffcaps.subType); + TRACE("\tnumFfAxes: %u\n", (unsigned int)ffcaps.numFfAxes); + TRACE("\tffAxes: ["); + for(i = 0; i < ffcaps.numFfAxes; ++i){ + TRACE("%s", osx_ff_axis_name(ffcaps.ffAxes[i])); + if(i < ffcaps.numFfAxes - 1) + TRACE(", "); + } + TRACE("]\n"); + TRACE("\tstorageCapacity: %u\n", (unsigned int)ffcaps.storageCapacity); + TRACE("\tplaybackCapacity: %u\n", (unsigned int)ffcaps.playbackCapacity); + } + + hr = FFDeviceSendForceFeedbackCommand(newDevice->ff, FFSFFC_RESET); + if(FAILED(hr)) + WARN("FFDeviceSendForceFeedbackCommand(FFSFFC_RESET) failed: %08x\n", hr); + + hr = FFDeviceSendForceFeedbackCommand(newDevice->ff, FFSFFC_SETACTUATORSON); + if(FAILED(hr)) + WARN("FFDeviceSendForceFeedbackCommand(FFSFFC_SETACTUATORSON) failed: %08x\n", hr); + } memset(axis_map, 0, sizeof(axis_map)); get_osx_device_elements(newDevice, axis_map); @@ -786,24 +948,46 @@ for (i = 0; i < newDevice->generic.devcaps.dwAxes; i++) { - int wine_obj = -1; + int wine_obj = -1, has_ff = 0; switch (axis_map[i]) { - case kHIDUsage_GD_X: wine_obj = 0; break; - case kHIDUsage_GD_Y: wine_obj = 1; break; - case kHIDUsage_GD_Z: wine_obj = 2; break; - case kHIDUsage_GD_Rx: wine_obj = 3; break; - case kHIDUsage_GD_Ry: wine_obj = 4; break; - case kHIDUsage_GD_Rz: wine_obj = 5; break; + case kHIDUsage_GD_X: + wine_obj = 0; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_X); + break; + case kHIDUsage_GD_Y: + wine_obj = 1; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_Y); + break; + case kHIDUsage_GD_Z: + wine_obj = 2; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_Z); + break; + case kHIDUsage_GD_Rx: + wine_obj = 3; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_RX); + break; + case kHIDUsage_GD_Ry: + wine_obj = 4; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_RY); + break; + case kHIDUsage_GD_Rz: + wine_obj = 5; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_RZ); + break; case kHIDUsage_GD_Slider: wine_obj = 6 + slider_count; + has_ff = (newDevice->ff != 0) && osx_axis_has_ff(&ffcaps, FFJOFS_SLIDER(slider_count)); slider_count++; break; } if (wine_obj < 0 ) continue; memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[wine_obj], df->dwObjSize); - df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(wine_obj) | DIDFT_ABSAXIS; + df->rgodf[idx].dwType = DIDFT_MAKEINSTANCE(wine_obj) | DIDFT_ABSAXIS; + if(has_ff) + df->rgodf[idx].dwFlags |= DIDOI_FFACTUATOR; + ++idx; } for (i = 0; i < newDevice->generic.devcaps.dwPOVs; i++) @@ -830,7 +1014,7 @@ LeaveCriticalSection(&dinput->crit); newDevice->generic.devcaps.dwSize = sizeof(newDevice->generic.devcaps); - newDevice->generic.devcaps.dwFlags = DIDC_ATTACHED; + newDevice->generic.devcaps.dwFlags |= DIDC_ATTACHED; if (newDevice->generic.base.dinput->dwVersion >= 0x0800) newDevice->generic.devcaps.dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else @@ -934,6 +1118,174 @@ return DIERR_DEVICENOTREG; } +static HRESULT osx_set_autocenter(JoystickImpl *This, + const DIPROPDWORD *header) +{ + UInt32 v; + HRESULT hr; + if(!This->ff) + return DIERR_UNSUPPORTED; + v = header->dwData; + hr = osx_to_win32_hresult(FFDeviceSetForceFeedbackProperty(This->ff, FFPROP_AUTOCENTER, &v)); + TRACE("returning: %08x\n", hr); + return hr; +} + +static HRESULT osx_set_ffgain(JoystickImpl *This, const DIPROPDWORD *header) +{ + UInt32 v; + HRESULT hr; + if(!This->ff) + return DIERR_UNSUPPORTED; + v = header->dwData; + hr = osx_to_win32_hresult(FFDeviceSetForceFeedbackProperty(This->ff, FFPROP_FFGAIN, &v)); + TRACE("returning: %08x\n", hr); + return hr; +} + +static HRESULT WINAPI JoystickWImpl_SetProperty(IDirectInputDevice8W *iface, + const GUID *prop, const DIPROPHEADER *header) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(prop), header); + + switch(LOWORD(prop)) + { + case (DWORD_PTR)DIPROP_AUTOCENTER: + return osx_set_autocenter(This, (const DIPROPDWORD *)header); + case (DWORD_PTR)DIPROP_FFGAIN: + return osx_set_ffgain(This, (const DIPROPDWORD *)header); + } + + return JoystickWGenericImpl_SetProperty(iface, prop, header); +} + +static HRESULT WINAPI JoystickAImpl_SetProperty(IDirectInputDevice8A *iface, + const GUID *prop, const DIPROPHEADER *header) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(prop), header); + + switch(LOWORD(prop)) + { + case (DWORD_PTR)DIPROP_AUTOCENTER: + return osx_set_autocenter(This, (const DIPROPDWORD *)header); + case (DWORD_PTR)DIPROP_FFGAIN: + return osx_set_ffgain(This, (const DIPROPDWORD *)header); + } + + return JoystickAGenericImpl_SetProperty(iface, prop, header); +} + +static CFUUIDRef effect_win_to_mac(const GUID *effect) +{ +#define DO_MAP(X) \ + if(IsEqualGUID(&GUID_##X, effect)) \ + return kFFEffectType_##X##_ID; + DO_MAP(ConstantForce) + DO_MAP(RampForce) + DO_MAP(Square) + DO_MAP(Sine) + DO_MAP(Triangle) + DO_MAP(SawtoothUp) + DO_MAP(SawtoothDown) + DO_MAP(Spring) + DO_MAP(Damper) + DO_MAP(Inertia) + DO_MAP(Friction) + DO_MAP(CustomForce) +#undef DO_MAP + WARN("Unknown effect GUID! %s\n", debugstr_guid(effect)); + return 0; +} + +static HRESULT WINAPI JoystickWImpl_CreateEffect(IDirectInputDevice8W *iface, + const GUID *type, const DIEFFECT *params, IDirectInputEffect **out, + IUnknown *outer) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + EffectImpl *effect; + HRESULT hr; + + TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + dump_DIEFFECT(params, type, 0); + + if(!This->ff){ + TRACE("No force feedback support\n"); + *out = NULL; + return S_OK; + } + + if(outer) + WARN("aggregation not implemented\n"); + + effect = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); + effect->IDirectInputEffect_iface.lpVtbl = &EffectVtbl; + effect->ref = 1; + effect->guid = *type; + effect->device = This; + + /* Mac's FFEFFECT and Win's DIEFFECT are binary identical. */ + hr = osx_to_win32_hresult(FFDeviceCreateEffect(This->ff, + effect_win_to_mac(type), (FFEFFECT*)params, &effect->effect)); + if(FAILED(hr)){ + WARN("FFDeviceCreateEffect failed: %08x\n", hr); + HeapFree(GetProcessHeap(), 0, effect); + return hr; + } + + list_add_tail(&This->effects, &effect->entry); + *out = &effect->IDirectInputEffect_iface; + + TRACE("allocated effect: %p\n", effect); + + return S_OK; +} + +static HRESULT WINAPI JoystickAImpl_CreateEffect(IDirectInputDevice8A *iface, + const GUID *type, const DIEFFECT *params, IDirectInputEffect **out, + IUnknown *outer) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + + TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + + return JoystickWImpl_CreateEffect(&This->generic.base.IDirectInputDevice8W_iface, + type, params, out, outer); +} + +static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(IDirectInputDevice8W *iface, + DWORD flags) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + HRESULT hr; + + TRACE("%p 0x%x\n", This, flags); + + if(!This->ff) + return DI_NOEFFECT; + + hr = osx_to_win32_hresult(FFDeviceSendForceFeedbackCommand(This->ff, flags)); + if(FAILED(hr)){ + WARN("FFDeviceSendForceFeedbackCommand failed: %08x\n", hr); + return hr; + } + + return S_OK; +} + +static HRESULT WINAPI JoystickAImpl_SendForceFeedbackCommand(IDirectInputDevice8A *iface, + DWORD flags) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + + TRACE("%p 0x%x\n", This, flags); + + return JoystickWImpl_SendForceFeedbackCommand(&This->generic.base.IDirectInputDevice8W_iface, flags); +} + const struct dinput_device joystick_osx_device = { "Wine OS X joystick driver", joydev_enum_deviceA, @@ -949,7 +1301,7 @@ JoystickAGenericImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, JoystickAGenericImpl_GetProperty, - JoystickAGenericImpl_SetProperty, + JoystickAImpl_SetProperty, IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, JoystickAGenericImpl_GetDeviceState, @@ -961,11 +1313,11 @@ JoystickAGenericImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, - IDirectInputDevice2AImpl_CreateEffect, + JoystickAImpl_CreateEffect, IDirectInputDevice2AImpl_EnumEffects, IDirectInputDevice2AImpl_GetEffectInfo, IDirectInputDevice2AImpl_GetForceFeedbackState, - IDirectInputDevice2AImpl_SendForceFeedbackCommand, + JoystickAImpl_SendForceFeedbackCommand, IDirectInputDevice2AImpl_EnumCreatedEffectObjects, IDirectInputDevice2AImpl_Escape, JoystickAGenericImpl_Poll, @@ -985,7 +1337,7 @@ JoystickWGenericImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, JoystickWGenericImpl_GetProperty, - JoystickWGenericImpl_SetProperty, + JoystickWImpl_SetProperty, IDirectInputDevice2WImpl_Acquire, IDirectInputDevice2WImpl_Unacquire, JoystickWGenericImpl_GetDeviceState, @@ -997,11 +1349,11 @@ JoystickWGenericImpl_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, - IDirectInputDevice2WImpl_CreateEffect, + JoystickWImpl_CreateEffect, IDirectInputDevice2WImpl_EnumEffects, IDirectInputDevice2WImpl_GetEffectInfo, IDirectInputDevice2WImpl_GetForceFeedbackState, - IDirectInputDevice2WImpl_SendForceFeedbackCommand, + JoystickWImpl_SendForceFeedbackCommand, IDirectInputDevice2WImpl_EnumCreatedEffectObjects, IDirectInputDevice2WImpl_Escape, JoystickWGenericImpl_Poll, @@ -1013,6 +1365,137 @@ IDirectInputDevice8WImpl_GetImageInfo }; +static HRESULT WINAPI effect_QueryInterface(IDirectInputEffect *iface, + const GUID *guid, void **out) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(guid), out); + + if(IsEqualIID(guid, &IID_IDirectInputEffect)){ + *out = iface; + IDirectInputEffect_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI effect_AddRef(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("%p, ref is now: %u\n", This, ref); + return ref; +} + +static ULONG WINAPI effect_Release(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("%p, ref is now: %u\n", This, ref); + + if(!ref){ + list_remove(&This->entry); + FFDeviceReleaseEffect(This->device->ff, This->effect); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI effect_Initialize(IDirectInputEffect *iface, HINSTANCE hinst, + DWORD version, const GUID *guid) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p 0x%x, %s\n", This, hinst, version, debugstr_guid(guid)); + return S_OK; +} + +static HRESULT WINAPI effect_GetEffectGuid(IDirectInputEffect *iface, GUID *out) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p\n", This, out); + *out = This->guid; + return S_OK; +} + +static HRESULT WINAPI effect_GetParameters(IDirectInputEffect *iface, + DIEFFECT *effect, DWORD flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p 0x%x\n", This, effect, flags); + return osx_to_win32_hresult(FFEffectGetParameters(This->effect, (FFEFFECT*)effect, flags)); +} + +static HRESULT WINAPI effect_SetParameters(IDirectInputEffect *iface, + const DIEFFECT *effect, DWORD flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p 0x%x\n", This, effect, flags); + dump_DIEFFECT(effect, &This->guid, flags); + return osx_to_win32_hresult(FFEffectSetParameters(This->effect, (FFEFFECT*)effect, flags)); +} + +static HRESULT WINAPI effect_Start(IDirectInputEffect *iface, DWORD iterations, + DWORD flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p 0x%x 0x%x\n", This, iterations, flags); + return osx_to_win32_hresult(FFEffectStart(This->effect, iterations, flags)); +} + +static HRESULT WINAPI effect_Stop(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p\n", This); + return osx_to_win32_hresult(FFEffectStop(This->effect)); +} + +static HRESULT WINAPI effect_GetEffectStatus(IDirectInputEffect *iface, DWORD *flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p\n", This, flags); + return osx_to_win32_hresult(FFEffectGetEffectStatus(This->effect, (UInt32*)flags)); +} + +static HRESULT WINAPI effect_Download(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p\n", This); + return osx_to_win32_hresult(FFEffectDownload(This->effect)); +} + +static HRESULT WINAPI effect_Unload(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p\n", This); + return osx_to_win32_hresult(FFEffectUnload(This->effect)); +} + +static HRESULT WINAPI effect_Escape(IDirectInputEffect *iface, DIEFFESCAPE *escape) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p\n", This, escape); + return osx_to_win32_hresult(FFEffectEscape(This->effect, (FFEFFESCAPE*)escape)); +} + +static const IDirectInputEffectVtbl EffectVtbl = { + effect_QueryInterface, + effect_AddRef, + effect_Release, + effect_Initialize, + effect_GetEffectGuid, + effect_GetParameters, + effect_SetParameters, + effect_Start, + effect_Stop, + effect_GetEffectStatus, + effect_Download, + effect_Unload, + effect_Escape +}; + #else /* HAVE_IOHIDMANAGERCREATE */ const struct dinput_device joystick_osx_device = { Modified: trunk/reactos/dll/directx/dinput/joystick_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/joystic… ============================================================================== --- trunk/reactos/dll/directx/dinput/joystick_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/joystick_private.h [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -98,4 +98,7 @@ HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; +DWORD typeFromGUID(REFGUID guid) DECLSPEC_HIDDEN; +void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) DECLSPEC_HIDDEN; + #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */ Modified: trunk/reactos/dll/directx/dinput/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/keyboar… ============================================================================== --- trunk/reactos/dll/directx/dinput/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/keyboard.c [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -185,10 +185,10 @@ memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); } -static BOOL keyboarddev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static HRESULT keyboarddev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return E_FAIL; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || @@ -197,16 +197,16 @@ fill_keyboard_dideviceinstanceA(lpddi, version); - return TRUE; + return S_OK; } - return FALSE; -} - -static BOOL keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) + return S_FALSE; +} + +static HRESULT keyboarddev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return E_FAIL; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_KEYBOARD) && (version < 0x0800)) || @@ -215,10 +215,10 @@ fill_keyboard_dideviceinstanceW(lpddi, version); - return TRUE; + return S_OK; } - return FALSE; + return S_FALSE; } static SysKeyboardImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) @@ -440,7 +440,7 @@ scan = DIDFT_GETINSTANCE(pdidoi->dwType); if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, - pdidoi->tszName, sizeof(pdidoi->tszName))) + pdidoi->tszName, sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) return DIERR_OBJECTNOTFOUND; _dump_OBJECTINSTANCEW(pdidoi); Modified: trunk/reactos/dll/directx/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/mouse.c… ============================================================================== --- trunk/reactos/dll/directx/dinput/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/mouse.c [iso-8859-1] Sun Sep 29 12:16:54 2013 @@ -159,10 +159,10 @@ memcpy(lpddi, &ddi, (dwSize < sizeof(ddi) ? dwSize : sizeof(ddi))); } -static BOOL mousedev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) +static HRESULT mousedev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return E_FAIL; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || @@ -171,16 +171,16 @@ fill_mouse_dideviceinstanceA(lpddi, version); - return TRUE; + return S_OK; } - return FALSE; -} - -static BOOL mousedev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) + return S_FALSE; +} + +static HRESULT mousedev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEW lpddi, DWORD version, int id) { if (id != 0) - return FALSE; + return E_FAIL; if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_MOUSE) && (version < 0x0800)) || @@ -189,10 +189,10 @@ fill_mouse_dideviceinstanceW(lpddi, version); - return TRUE; + return S_OK; } - return FALSE; + return S_FALSE; } static SysMouseImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) 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] Sun Sep 29 12:16:54 2013 @@ -28,7 +28,7 @@ The following libraries are shared with Wine. reactos/dll/directx/amstream # Synced to Wine-1.3.37 -reactos/dll/directx/dinput # Synced to Wine-1.5.26 +reactos/dll/directx/dinput # Synced to Wine-1.7.1 reactos/dll/directx/dinput8 # Synced to Wine-1.5.26 reactos/dll/directx/dmusic # Synced to Wine-1.5.26 reactos/dll/directx/dplay # Synced to Wine-1.5.26

1 0

[ekohl] 60445: [INCLUDE] Add the directory service setup interface definition files.
by ekohl＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: ekohl Date: Sun Sep 29 11:08:27 2013 New Revision: 60445 URL: http://svn.reactos.org/svn/reactos?rev=60445&view=rev Log: [INCLUDE] Add the directory service setup interface definition files. Added: trunk/reactos/include/reactos/idl/dssetup.acf (with props) trunk/reactos/include/reactos/idl/dssetup.idl (with props) Added: trunk/reactos/include/reactos/idl/dssetup.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/dssetu… ============================================================================== --- trunk/reactos/include/reactos/idl/dssetup.acf (added) +++ trunk/reactos/include/reactos/idl/dssetup.acf [iso-8859-1] Sun Sep 29 11:08:27 2013 @@ -0,0 +1,6 @@ +[ + explicit_handle +] +interface dssetup +{ +} Propchange: trunk/reactos/include/reactos/idl/dssetup.acf ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/idl/dssetup.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/dssetu… ============================================================================== --- trunk/reactos/include/reactos/idl/dssetup.idl (added) +++ trunk/reactos/include/reactos/idl/dssetup.idl [iso-8859-1] Sun Sep 29 11:08:27 2013 @@ -0,0 +1,75 @@ +/* + * Directory Service Setup interface definition + */ + +#include <ms-dtyp.idl> + +typedef enum _DSROLE_MACHINE_ROLE { + DsRole_RoleStandaloneWorkstation, + DsRole_RoleMemberWorkstation, + DsRole_RoleStandaloneServer, + DsRole_RoleMemberServer, + DsRole_RoleBackupDomainController, + DsRole_RolePrimaryDomainController +} DSROLE_MACHINE_ROLE; + +typedef enum _DSROLE_SERVER_STATE { + DsRoleServerUnknown = 0, + DsRoleServerPrimary, + DsRoleServerBackup +} DSROLE_SERVER_STATE, *PDSROLE_SERVER_STATE; + +typedef enum _DSROLE_PRIMARY_DOMAIN_INFO_LEVEL { + DsRolePrimaryDomainInfoBasic = 1, + DsRoleUpgradeStatus, + DsRoleOperationState +} DSROLE_PRIMARY_DOMAIN_INFO_LEVEL; + +typedef struct _DSROLE_UPGRADE_STATUS_INFO { + ULONG OperationState; + DSROLE_SERVER_STATE PreviousServerState; +} DSROLE_UPGRADE_STATUS_INFO, *PDSROLE_UPGRADE_STATUS_INFO; + +typedef enum _DSROLE_OPERATION_STATE { + DsRoleOperationIdle = 0, + DsRoleOperationActive, + DsRoleOperationNeedReboot +} DSROLE_OPERATION_STATE; + +typedef struct _DSROLE_OPERATION_STATE_INFO { + DSROLE_OPERATION_STATE OperationState; +} DSROLE_OPERATION_STATE_INFO, *PDSROLE_OPERATION_STATE_INFO; + +typedef struct _DSROLER_PRIMARY_DOMAIN_INFO_BASIC { + DSROLE_MACHINE_ROLE MachineRole; + ULONG Flags; + [unique, string] wchar_t *DomainNameFlat; + [unique, string] wchar_t *DomainNameDns; + [unique, string] wchar_t *DomainForestName; + GUID DomainGuid; +} DSROLER_PRIMARY_DOMAIN_INFO_BASIC, *PDSROLER_PRIMARY_DOMAIN_INFO_BASIC; + +typedef [switch_type(DSROLE_PRIMARY_DOMAIN_INFO_LEVEL)] union _DSROLER_PRIMARY_DOMAIN_INFORMATION { + [case(DsRolePrimaryDomainInfoBasic)] DSROLER_PRIMARY_DOMAIN_INFO_BASIC DomainInfoBasic; + [case(DsRoleUpgradeStatus)] DSROLE_UPGRADE_STATUS_INFO UpgradStatusInfo; + [case(DsRoleOperationState)] DSROLE_OPERATION_STATE_INFO OperationStateInfo; +} DSROLER_PRIMARY_DOMAIN_INFORMATION, *PDSROLER_PRIMARY_DOMAIN_INFORMATION; + +[ + uuid(3919286a-b10c-11d0-9ba8-00c04fd92ef5), + version(0.0), + pointer_default(unique), + endpoint("ncacn_np:[\\pipe\\lsarpc]") +#ifndef __midl + ,explicit_handle +#endif +] +interface dssetup +{ + DWORD + __stdcall + DsRolerGetPrimaryDomainInformation( + [in] handle_t hBinding, + [in] DSROLE_PRIMARY_DOMAIN_INFO_LEVEL InfoLevel, + [out, switch_is(InfoLevel)] PDSROLER_PRIMARY_DOMAIN_INFORMATION *DomainInfo); +} Propchange: trunk/reactos/include/reactos/idl/dssetup.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 60444: [UNICODE] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: akhaldi Date: Sun Sep 29 10:52:38 2013 New Revision: 60444 URL: http://svn.reactos.org/svn/reactos?rev=60444&view=rev Log: [UNICODE] * Sync with Wine 1.7.1. CORE-7469 Added: trunk/reactos/tools/unicode/c_10001.c (with props) trunk/reactos/tools/unicode/c_10002.c (with props) trunk/reactos/tools/unicode/c_10003.c (with props) trunk/reactos/tools/unicode/c_10004.c (with props) trunk/reactos/tools/unicode/c_10005.c (with props) trunk/reactos/tools/unicode/c_10008.c (with props) trunk/reactos/tools/unicode/c_10010.c (with props) trunk/reactos/tools/unicode/c_10017.c (with props) trunk/reactos/tools/unicode/c_10021.c (with props) trunk/reactos/tools/unicode/c_10082.c (with props) Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/unicode/CMakeLists.txt trunk/reactos/tools/unicode/c_037.c trunk/reactos/tools/unicode/c_10000.c trunk/reactos/tools/unicode/c_10006.c trunk/reactos/tools/unicode/c_10007.c trunk/reactos/tools/unicode/c_10029.c trunk/reactos/tools/unicode/c_1006.c trunk/reactos/tools/unicode/c_10079.c trunk/reactos/tools/unicode/c_10081.c trunk/reactos/tools/unicode/c_1026.c trunk/reactos/tools/unicode/c_1250.c trunk/reactos/tools/unicode/c_1251.c trunk/reactos/tools/unicode/c_1252.c trunk/reactos/tools/unicode/c_1253.c trunk/reactos/tools/unicode/c_1254.c trunk/reactos/tools/unicode/c_1255.c trunk/reactos/tools/unicode/c_1256.c trunk/reactos/tools/unicode/c_1257.c trunk/reactos/tools/unicode/c_1258.c trunk/reactos/tools/unicode/c_1361.c trunk/reactos/tools/unicode/c_20127.c trunk/reactos/tools/unicode/c_20866.c trunk/reactos/tools/unicode/c_20932.c trunk/reactos/tools/unicode/c_21866.c trunk/reactos/tools/unicode/c_28591.c trunk/reactos/tools/unicode/c_28592.c trunk/reactos/tools/unicode/c_28593.c trunk/reactos/tools/unicode/c_28594.c trunk/reactos/tools/unicode/c_28595.c trunk/reactos/tools/unicode/c_28596.c trunk/reactos/tools/unicode/c_28597.c trunk/reactos/tools/unicode/c_28598.c trunk/reactos/tools/unicode/c_28599.c trunk/reactos/tools/unicode/c_28600.c trunk/reactos/tools/unicode/c_28603.c trunk/reactos/tools/unicode/c_28604.c trunk/reactos/tools/unicode/c_28605.c trunk/reactos/tools/unicode/c_28606.c trunk/reactos/tools/unicode/c_424.c trunk/reactos/tools/unicode/c_437.c trunk/reactos/tools/unicode/c_500.c trunk/reactos/tools/unicode/c_737.c trunk/reactos/tools/unicode/c_775.c trunk/reactos/tools/unicode/c_850.c trunk/reactos/tools/unicode/c_852.c trunk/reactos/tools/unicode/c_855.c trunk/reactos/tools/unicode/c_856.c trunk/reactos/tools/unicode/c_857.c trunk/reactos/tools/unicode/c_860.c trunk/reactos/tools/unicode/c_861.c trunk/reactos/tools/unicode/c_862.c trunk/reactos/tools/unicode/c_863.c trunk/reactos/tools/unicode/c_864.c trunk/reactos/tools/unicode/c_865.c trunk/reactos/tools/unicode/c_866.c trunk/reactos/tools/unicode/c_869.c trunk/reactos/tools/unicode/c_874.c trunk/reactos/tools/unicode/c_875.c trunk/reactos/tools/unicode/c_878.c trunk/reactos/tools/unicode/c_932.c trunk/reactos/tools/unicode/c_936.c trunk/reactos/tools/unicode/c_949.c trunk/reactos/tools/unicode/c_950.c trunk/reactos/tools/unicode/casemap.c trunk/reactos/tools/unicode/cptable.c trunk/reactos/tools/unicode/string.c trunk/reactos/tools/unicode/wctype.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/unicode/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/CMakeLists.t… Modified: trunk/reactos/tools/unicode/c_037.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_037.c?rev=… Modified: trunk/reactos/tools/unicode/c_10000.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10000.c?re… Added: trunk/reactos/tools/unicode/c_10001.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10001.c?re… Added: trunk/reactos/tools/unicode/c_10002.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10002.c?re… Added: trunk/reactos/tools/unicode/c_10003.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10003.c?re… Added: trunk/reactos/tools/unicode/c_10004.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10004.c?re… Added: trunk/reactos/tools/unicode/c_10005.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10005.c?re… Modified: trunk/reactos/tools/unicode/c_10006.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10006.c?re… Modified: trunk/reactos/tools/unicode/c_10007.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10007.c?re… Added: trunk/reactos/tools/unicode/c_10008.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10008.c?re… Added: trunk/reactos/tools/unicode/c_10010.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10010.c?re… Added: trunk/reactos/tools/unicode/c_10017.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10017.c?re… Added: trunk/reactos/tools/unicode/c_10021.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10021.c?re… Modified: trunk/reactos/tools/unicode/c_10029.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10029.c?re… Modified: trunk/reactos/tools/unicode/c_1006.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1006.c?rev… Modified: trunk/reactos/tools/unicode/c_10079.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10079.c?re… Modified: trunk/reactos/tools/unicode/c_10081.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10081.c?re… Added: trunk/reactos/tools/unicode/c_10082.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_10082.c?re… Modified: trunk/reactos/tools/unicode/c_1026.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1026.c?rev… Modified: trunk/reactos/tools/unicode/c_1250.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1250.c?rev… Modified: trunk/reactos/tools/unicode/c_1251.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1251.c?rev… Modified: trunk/reactos/tools/unicode/c_1252.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1252.c?rev… Modified: trunk/reactos/tools/unicode/c_1253.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1253.c?rev… Modified: trunk/reactos/tools/unicode/c_1254.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1254.c?rev… Modified: trunk/reactos/tools/unicode/c_1255.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1255.c?rev… Modified: trunk/reactos/tools/unicode/c_1256.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1256.c?rev… Modified: trunk/reactos/tools/unicode/c_1257.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1257.c?rev… Modified: trunk/reactos/tools/unicode/c_1258.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1258.c?rev… Modified: trunk/reactos/tools/unicode/c_1361.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_1361.c?rev… Modified: trunk/reactos/tools/unicode/c_20127.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20127.c?re… Modified: trunk/reactos/tools/unicode/c_20866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20866.c?re… Modified: trunk/reactos/tools/unicode/c_20932.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_20932.c?re… Modified: trunk/reactos/tools/unicode/c_21866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_21866.c?re… Modified: trunk/reactos/tools/unicode/c_28591.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28591.c?re… Modified: trunk/reactos/tools/unicode/c_28592.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28592.c?re… Modified: trunk/reactos/tools/unicode/c_28593.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28593.c?re… Modified: trunk/reactos/tools/unicode/c_28594.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28594.c?re… Modified: trunk/reactos/tools/unicode/c_28595.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28595.c?re… Modified: trunk/reactos/tools/unicode/c_28596.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28596.c?re… Modified: trunk/reactos/tools/unicode/c_28597.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28597.c?re… Modified: trunk/reactos/tools/unicode/c_28598.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28598.c?re… Modified: trunk/reactos/tools/unicode/c_28599.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28599.c?re… Modified: trunk/reactos/tools/unicode/c_28600.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28600.c?re… Modified: trunk/reactos/tools/unicode/c_28603.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28603.c?re… Modified: trunk/reactos/tools/unicode/c_28604.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28604.c?re… Modified: trunk/reactos/tools/unicode/c_28605.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28605.c?re… Modified: trunk/reactos/tools/unicode/c_28606.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_28606.c?re… Modified: trunk/reactos/tools/unicode/c_424.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_424.c?rev=… Modified: trunk/reactos/tools/unicode/c_437.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_437.c?rev=… Modified: trunk/reactos/tools/unicode/c_500.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_500.c?rev=… Modified: trunk/reactos/tools/unicode/c_737.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_737.c?rev=… Modified: trunk/reactos/tools/unicode/c_775.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_775.c?rev=… Modified: trunk/reactos/tools/unicode/c_850.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_850.c?rev=… Modified: trunk/reactos/tools/unicode/c_852.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_852.c?rev=… Modified: trunk/reactos/tools/unicode/c_855.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_855.c?rev=… Modified: trunk/reactos/tools/unicode/c_856.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_856.c?rev=… Modified: trunk/reactos/tools/unicode/c_857.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_857.c?rev=… Modified: trunk/reactos/tools/unicode/c_860.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_860.c?rev=… Modified: trunk/reactos/tools/unicode/c_861.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_861.c?rev=… Modified: trunk/reactos/tools/unicode/c_862.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_862.c?rev=… Modified: trunk/reactos/tools/unicode/c_863.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_863.c?rev=… Modified: trunk/reactos/tools/unicode/c_864.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_864.c?rev=… Modified: trunk/reactos/tools/unicode/c_865.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_865.c?rev=… Modified: trunk/reactos/tools/unicode/c_866.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_866.c?rev=… Modified: trunk/reactos/tools/unicode/c_869.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_869.c?rev=… Modified: trunk/reactos/tools/unicode/c_874.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_874.c?rev=… Modified: trunk/reactos/tools/unicode/c_875.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_875.c?rev=… Modified: trunk/reactos/tools/unicode/c_878.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_878.c?rev=… Modified: trunk/reactos/tools/unicode/c_932.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_932.c?rev=… Modified: trunk/reactos/tools/unicode/c_936.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_936.c?rev=… Modified: trunk/reactos/tools/unicode/c_949.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_949.c?rev=… Modified: trunk/reactos/tools/unicode/c_950.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/c_950.c?rev=… Modified: trunk/reactos/tools/unicode/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/casemap.c?re… Modified: trunk/reactos/tools/unicode/cptable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/cptable.c?re… Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/string.c?rev… Modified: trunk/reactos/tools/unicode/wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wctype.c?rev…

1 0

[ekohl] 60443: [SAMSRV] SamrDeleteAlias: Remove all members from an alias before it will be deleted.
by ekohl＠svn.reactos.org 29 Sep '13

29 Sep '13

Author: ekohl Date: Sun Sep 29 08:53:24 2013 New Revision: 60443 URL: http://svn.reactos.org/svn/reactos?rev=60443&view=rev Log: [SAMSRV] SamrDeleteAlias: Remove all members from an alias before it will be deleted. Modified: trunk/reactos/dll/win32/samsrv/alias.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h Modified: trunk/reactos/dll/win32/samsrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/alias.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/alias.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/alias.c [iso-8859-1] Sun Sep 29 08:53:24 2013 @@ -218,4 +218,159 @@ return Status; } + +NTSTATUS +SampGetMembersInAlias(IN PSAM_DB_OBJECT AliasObject, + OUT PULONG MemberCount, + OUT PSAMPR_SID_INFORMATION *MemberArray) +{ + HANDLE MembersKeyHandle = NULL; + PSAMPR_SID_INFORMATION Members = NULL; + ULONG Count = 0; + ULONG DataLength; + ULONG Index; + NTSTATUS Status; + + /* Open the members key of the alias object */ + Status = SampRegOpenKey(AliasObject->KeyHandle, + L"Members", + KEY_READ, + &MembersKeyHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SampRegOpenKey failed with status 0x%08lx\n", Status); + goto done; + } + + /* Get the number of members */ + Status = SampRegQueryKeyInfo(MembersKeyHandle, + NULL, + &Count); + if (!NT_SUCCESS(Status)) + { + ERR("SampRegQueryKeyInfo failed with status 0x%08lx\n", Status); + goto done; + } + + /* Allocate the member array */ + Members = midl_user_allocate(Count * sizeof(SAMPR_SID_INFORMATION)); + if (Members == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Enumerate the members */ + Index = 0; + while (TRUE) + { + /* Get the size of the next SID */ + DataLength = 0; + Status = SampRegEnumerateValue(MembersKeyHandle, + Index, + NULL, + NULL, + NULL, + NULL, + &DataLength); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + break; + } + + /* Allocate a buffer for the SID */ + Members[Index].SidPointer = midl_user_allocate(DataLength); + if (Members[Index].SidPointer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Read the SID into the buffer */ + Status = SampRegEnumerateValue(MembersKeyHandle, + Index, + NULL, + NULL, + NULL, + (PVOID)Members[Index].SidPointer, + &DataLength); + if (!NT_SUCCESS(Status)) + { + goto done; + } + + Index++; + } + + if (NT_SUCCESS(Status)) + { + *MemberCount = Count; + *MemberArray = Members; + } + +done: + return Status; +} + + +NTSTATUS +SampRemoveAllMembersFromAlias(IN PSAM_DB_OBJECT AliasObject) +{ + HANDLE MembersKeyHandle = NULL; + PSAMPR_SID_INFORMATION MemberArray = NULL; + ULONG MemberCount = 0; + ULONG Index; + NTSTATUS Status; + + TRACE("(%p)\n", AliasObject); + + /* Open the members key of the alias object */ + Status = SampRegOpenKey(AliasObject->KeyHandle, + L"Members", + KEY_READ, + &MembersKeyHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SampRegOpenKey failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Get a list of all members of the alias */ + Status = SampGetMembersInAlias(AliasObject, + &MemberCount, + &MemberArray); + if (!NT_SUCCESS(Status)) + { + ERR("SampGetMembersInAlias failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Remove all members from the alias */ + for (Index = 0; Index < MemberCount; Index++) + { + Status = SampRemoveMemberFromAlias(AliasObject, + MemberArray[Index].SidPointer); + if (!NT_SUCCESS(Status)) + goto done; + } + +done: + if (MemberArray != NULL) + { + for (Index = 0; Index < MemberCount; Index++) + { + if (MemberArray[Index].SidPointer != NULL) + midl_user_free(MemberArray[Index].SidPointer); + } + + midl_user_free(MemberArray); + } + + SampRegCloseKey(&MembersKeyHandle); + + return Status; +} + /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sun Sep 29 08:53:24 2013 @@ -4980,7 +4980,13 @@ goto done; } - /* FIXME: Remove all members from the alias */ + /* Remove all members from the alias */ + Status = SampRemoveAllMembersFromAlias(AliasObject); + if (!NT_SUCCESS(Status)) + { + TRACE("SampRemoveAllMembersFromAlias() failed (Status 0x%08lx)\n", Status); + goto done; + } /* Delete the alias from the database */ Status = SampDeleteAccountDbObject(AliasObject); @@ -5085,10 +5091,8 @@ OUT PSAMPR_PSID_ARRAY_OUT Members) { PSAM_DB_OBJECT AliasObject; - HANDLE MembersKeyHandle = NULL; PSAMPR_SID_INFORMATION MemberArray = NULL; - ULONG ValueCount = 0; - ULONG DataLength; + ULONG MemberCount = 0; ULONG Index; NTSTATUS Status; @@ -5109,83 +5113,14 @@ goto done; } - /* Open the members key of the alias objct */ - Status = SampRegOpenKey(AliasObject->KeyHandle, - L"Members", - KEY_READ, - &MembersKeyHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SampRegOpenKey failed with status 0x%08lx\n", Status); - goto done; - } - - /* Get the number of members */ - Status = SampRegQueryKeyInfo(MembersKeyHandle, - NULL, - &ValueCount); - if (!NT_SUCCESS(Status)) - { - ERR("SampRegQueryKeyInfo failed with status 0x%08lx\n", Status); - goto done; - } - - /* Allocate the member array */ - MemberArray = midl_user_allocate(ValueCount * sizeof(SAMPR_SID_INFORMATION)); - if (MemberArray == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - /* Enumerate the members */ - Index = 0; - while (TRUE) - { - /* Get the size of the next SID */ - DataLength = 0; - Status = SampRegEnumerateValue(MembersKeyHandle, - Index, - NULL, - NULL, - NULL, - NULL, - &DataLength); - if (!NT_SUCCESS(Status)) - { - if (Status == STATUS_NO_MORE_ENTRIES) - Status = STATUS_SUCCESS; - break; - } - - /* Allocate a buffer for the SID */ - MemberArray[Index].SidPointer = midl_user_allocate(DataLength); - if (MemberArray[Index].SidPointer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto done; - } - - /* Read the SID into the buffer */ - Status = SampRegEnumerateValue(MembersKeyHandle, - Index, - NULL, - NULL, - NULL, - (PVOID)MemberArray[Index].SidPointer, - &DataLength); - if (!NT_SUCCESS(Status)) - { - goto done; - } - - Index++; - } + Status = SampGetMembersInAlias(AliasObject, + &MemberCount, + &MemberArray); /* Return the number of members and the member array */ if (NT_SUCCESS(Status)) { - Members->Count = ValueCount; + Members->Count = MemberCount; Members->Sids = MemberArray; } @@ -5195,7 +5130,7 @@ { if (MemberArray != NULL) { - for (Index = 0; Index < ValueCount; Index++) + for (Index = 0; Index < MemberCount; Index++) { if (MemberArray[Index].SidPointer != NULL) midl_user_free(MemberArray[Index].SidPointer); @@ -5204,9 +5139,6 @@ midl_user_free(MemberArray); } } - - /* Close the members key */ - SampRegCloseKey(&MembersKeyHandle); RtlReleaseResource(&SampResource); Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun Sep 29 08:53:24 2013 @@ -141,6 +141,14 @@ SampRemoveMemberFromAlias(IN PSAM_DB_OBJECT AliasObject, IN PRPC_SID MemberId); +NTSTATUS +SampGetMembersInAlias(IN PSAM_DB_OBJECT AliasObject, + OUT PULONG MemberCount, + OUT PSAMPR_SID_INFORMATION *MemberArray); + +NTSTATUS +SampRemoveAllMembersFromAlias(IN PSAM_DB_OBJECT AliasObject); + /* database.c */

1 0

[ekohl] 60442: [ADVAPI32] EqualSid: Set last error to ERROR_SUCCESS before calling RtlEqualSid.
by ekohl＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: ekohl Date: Sat Sep 28 19:36:27 2013 New Revision: 60442 URL: http://svn.reactos.org/svn/reactos?rev=60442&view=rev Log: [ADVAPI32] EqualSid: Set last error to ERROR_SUCCESS before calling RtlEqualSid. Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Sat Sep 28 19:36:27 2013 @@ -1439,6 +1439,7 @@ EqualSid(PSID pSid1, PSID pSid2) { + SetLastError(ERROR_SUCCESS); return RtlEqualSid (pSid1, pSid2); }

1 0

[aandrejevic] 60441: [SOFT386] Stubplement opcode group handlers.
by aandrejevic＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: aandrejevic Date: Sat Sep 28 18:56:58 2013 New Revision: 60441 URL: http://svn.reactos.org/svn/reactos?rev=60441&view=rev Log: [SOFT386] Stubplement opcode group handlers. Added: branches/ntvdm/lib/soft386/opgroups.c (with props) branches/ntvdm/lib/soft386/opgroups.h (with props) Modified: branches/ntvdm/lib/soft386/CMakeLists.txt branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/CMakeLists.tx… ============================================================================== --- branches/ntvdm/lib/soft386/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/CMakeLists.txt [iso-8859-1] Sat Sep 28 18:56:58 2013 @@ -4,6 +4,7 @@ list(APPEND SOURCE soft386.c opcodes.c + opgroups.c common.c) add_library(soft386 ${SOURCE}) Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sat Sep 28 18:56:58 2013 @@ -18,6 +18,7 @@ #include <soft386.h> #include "opcodes.h" +#include "opgroups.h" #include "common.h" /* PUBLIC VARIABLES ***********************************************************/ @@ -153,10 +154,10 @@ Soft386OpcodeShortConditionalJmp, Soft386OpcodeShortConditionalJmp, Soft386OpcodeShortConditionalJmp, - NULL, // TODO: OPCODE 0x80 NOT SUPPORTED - NULL, // TODO: OPCODE 0x81 NOT SUPPORTED - NULL, // TODO: OPCODE 0x82 NOT SUPPORTED - NULL, // TODO: OPCODE 0x83 NOT SUPPORTED + Soft386OpcodeGroup80, + Soft386OpcodeGroup81, + Soft386OpcodeGroup82, + Soft386OpcodeGroup83, Soft386OpcodeTestByteModrm, Soft386OpcodeTestModrm, Soft386OpcodeXchgByteModrm, @@ -168,7 +169,7 @@ Soft386OpcodeMovStoreSeg, Soft386OpcodeLea, Soft386OpcodeMovLoadSeg, - NULL, // TODO: OPCODE 0x8F NOT SUPPORTED + Soft386OpcodeGroup8F, Soft386OpcodeNop, Soft386OpcodeExchangeEax, Soft386OpcodeExchangeEax, @@ -217,14 +218,14 @@ Soft386OpcodeMovRegImm, Soft386OpcodeMovRegImm, Soft386OpcodeMovRegImm, - NULL, // TODO: OPCODE 0xC0 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC1 NOT SUPPORTED + Soft386OpcodeGroupC0, + Soft386OpcodeGroupC1, Soft386OpcodeRet, Soft386OpcodeRet, Soft386OpcodeLdsLes, Soft386OpcodeLdsLes, - NULL, // TODO: OPCODE 0xC6 NOT SUPPORTED - NULL, // TODO: OPCODE 0xC7 NOT SUPPORTED + Soft386OpcodeGroupC6, + Soft386OpcodeGroupC7, Soft386OpcodeEnter, Soft386OpcodeLeave, Soft386OpcodeRetFarImm, @@ -233,10 +234,10 @@ Soft386OpcodeInt, Soft386OpcodeInt, Soft386OpcodeIret, - NULL, // TODO: OPCODE 0xD0 NOT SUPPORTED - NULL, // TODO: OPCODE 0xD1 NOT SUPPORTED - NULL, // TODO: OPCODE 0xD2 NOT SUPPORTED - NULL, // TODO: OPCODE 0xD3 NOT SUPPORTED + Soft386OpcodeGroupD0, + Soft386OpcodeGroupD1, + Soft386OpcodeGroupD2, + Soft386OpcodeGroupD3, Soft386OpcodeAam, Soft386OpcodeAad, NULL, // TODO: OPCODE 0xD6 NOT SUPPORTED @@ -271,16 +272,16 @@ Soft386OpcodePrefix, Soft386OpcodeHalt, Soft386OpcodeComplCarry, - NULL, // TODO: OPCODE 0xF6 NOT SUPPORTED - NULL, // TODO: OPCODE 0xF7 NOT SUPPORTED + Soft386OpcodeGroupF6, + Soft386OpcodeGroupF7, Soft386OpcodeClearCarry, Soft386OpcodeSetCarry, Soft386OpcodeClearInt, Soft386OpcodeSetInt, Soft386OpcodeClearDir, Soft386OpcodeSetDir, - NULL, // TODO: OPCODE 0xFE NOT SUPPORTED - NULL, // TODO: OPCODE 0xFF NOT SUPPORTED + Soft386OpcodeGroupFE, + Soft386OpcodeGroupFF, }; /* PUBLIC FUNCTIONS ***********************************************************/ Added: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c (added) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Sat Sep 28 18:56:58 2013 @@ -0,0 +1,127 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: 386/486 CPU Emulation Library + * FILE: opgroups.c + * PURPOSE: Opcode group handlers. + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +// #define WIN32_NO_STATUS +// #define _INC_WINDOWS +#include <windef.h> + +// #define NDEBUG +#include <debug.h> + +#include <soft386.h> +#include "opcodes.h" +#include "common.h" + +/* PUBLIC FUNCTIONS ***********************************************************/ + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup80) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup81) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup82) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup83) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup8F) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC0) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC1) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC6) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC7) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD0) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD1) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD2) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD3) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupF6) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupF7) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupFE) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupFF) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +/* EOF */ + Propchange: branches/ntvdm/lib/soft386/opgroups.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/lib/soft386/opgroups.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.h?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.h (added) +++ branches/ntvdm/lib/soft386/opgroups.h [iso-8859-1] Sat Sep 28 18:56:58 2013 @@ -0,0 +1,35 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: 386/486 CPU Emulation Library + * FILE: opgroups.h + * PURPOSE: Opcode group handlers. (header file) + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _OPGROUPS_H_ +#define _OPGROUPS_H_ + +/* DEFINES ********************************************************************/ + +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup80); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup81); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup82); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup83); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroup8F); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC0); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC1); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC6); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupC7); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD0); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD1); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD2); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupD3); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupF6); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupF7); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupFE); +SOFT386_OPCODE_HANDLER(Soft386OpcodeGroupFF); + +#endif // _OPGROUPS_H_ + +/* EOF */ + Propchange: branches/ntvdm/lib/soft386/opgroups.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 60440: [XMLLITE_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:43:21 2013 New Revision: 60440 URL: http://svn.reactos.org/svn/reactos?rev=60440&view=rev Log: [XMLLITE_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt trunk/rostests/winetests/xmllite/reader.c Modified: trunk/rostests/winetests/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/CMakeLi… ============================================================================== --- trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:43:21 2013 @@ -1,19 +1,10 @@ - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE reader.c writer.c testlist.c) -if(NOT MSVC) - # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #allow_warnings(xmllite_winetest) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") -endif() - add_executable(xmllite_winetest ${SOURCE}) -target_link_libraries(xmllite_winetest wine uuid) set_module_type(xmllite_winetest win32cui) -add_importlibs(xmllite_winetest xmllite ole32 msvcrt kernel32 ntdll) +add_importlibs(xmllite_winetest ole32 msvcrt kernel32) add_cd_file(TARGET xmllite_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Sat Sep 28 15:43:21 2013 @@ -747,7 +747,6 @@ hr = IXmlReader_GetDepth(reader, &count); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); -todo_wine ok(count == 1, "Expected 1, got %d\n", count); hr = IXmlReader_MoveToElement(reader); @@ -776,6 +775,7 @@ const char *value; HRESULT hr; HRESULT hr_broken; /* this is set to older version results */ + int todo : 1; }; static struct test_entry comment_tests[] = { @@ -1053,18 +1053,16 @@ str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(len == lstrlenW(sysW), "got %u\n", len); ok(!lstrcmpW(str, sysW), "got %s\n", wine_dbgstr_w(str)); -} + len = 0; str = NULL; hr = IXmlReader_GetValue(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(len == lstrlenW(sysvalW), "got %u\n", len); ok(!lstrcmpW(str, sysvalW), "got %s\n", wine_dbgstr_w(str)); -} + hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1072,9 +1070,10 @@ str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); - +} len = 0; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); @@ -1170,16 +1169,20 @@ ok(hr == S_OK, "got %08x\n", hr); ok(depth == 0, "got %d\n", depth); + type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Element, "got %d\n", type); depth = 1; hr = IXmlReader_GetDepth(reader, &depth); ok(hr == S_OK, "got %08x\n", hr); ok(depth == 0, "got %d\n", depth); + type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Element, "got %d\n", type); depth = 0; hr = IXmlReader_GetDepth(reader, &depth); @@ -1322,6 +1325,9 @@ static struct test_entry cdata_tests[] = { { "<a><![CDATA[ ]]data ]]></a>", "", " ]]data ", S_OK }, { "<a><![CDATA[<![CDATA[ data ]]]]></a>", "", "<![CDATA[ data ]]", S_OK }, + { "<a><![CDATA[\n \r\n \n\n ]]></a>", "", "\n \n \n\n ", S_OK, S_OK, 1 }, + { "<a><![CDATA[\r \r\r\n \n\n ]]></a>", "", "\n \n\n \n\n ", S_OK, S_OK, 1 }, + { "<a><![CDATA[\r\r \n\r \r \n\n ]]></a>", "", "\n\n \n\n \n \n\n ", S_OK }, { NULL } }; @@ -1365,15 +1371,122 @@ ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); + str_exp = a2w(test->name); + len = 1; str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + + free_str(str_exp); + + len = 1; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); ok(len == strlen(test->name), "got %u\n", len); str_exp = a2w(test->name); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); free_str(str_exp); + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str_exp = a2w(test->value); + if (test->todo) + { + todo_wine { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } + } + else + { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } + free_str(str_exp); + } + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + +static struct test_entry text_tests[] = { + { "<a>simple text</a>", "", "simple text", S_OK }, + { "<a>text ]]> text</a>", "", "", WC_E_CDSECTEND }, + { NULL } +}; + +static void test_read_text(void) +{ + struct test_entry *test = text_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + + /* read one more to get to CDATA */ + if (type == XmlNodeType_Element) + { + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + } + + if (test->hr_broken) + ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + else + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_Text, "got %d for %s\n", type, test->xml); + + str_exp = a2w(test->name); + + len = 1; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + + free_str(str_exp); + len = 1; str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); @@ -1383,6 +1496,159 @@ ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); free_str(str_exp); + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str_exp = a2w(test->value); + if (test->todo) + { + todo_wine { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } + } + else + { + ok(len == strlen(test->value), "got %u\n", len); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + } + free_str(str_exp); + } + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + +struct test_entry_empty { + const char *xml; + BOOL empty; +}; + +static struct test_entry_empty empty_element_tests[] = { + { "<a></a>", FALSE }, + { "<a/>", TRUE }, + { NULL } +}; + +static void test_isemptyelement(void) +{ + struct test_entry_empty *test = empty_element_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + BOOL ret; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(type == XmlNodeType_Element, "got %d\n", type); + + ret = IXmlReader_IsEmptyElement(reader); + ok(ret == test->empty, "got %d, expected %d. xml=%s\n", ret, test->empty, test->xml); + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + +static struct test_entry attributes_tests[] = { + { "<a attr1=\"attrvalue\"/>", "attr1", "attrvalue", S_OK }, + { "<a attr1=\"a\'\'ttrvalue\"/>", "attr1", "a\'\'ttrvalue", S_OK }, + { "<a attr1=\'a\"ttrvalue\'/>", "attr1", "a\"ttrvalue", S_OK }, + { "<a attr1=\' \'/>", "attr1", " ", S_OK }, + { "<a attr1=\" \"/>", "attr1", " ", S_OK }, + { "<a attr1=\"\r\n \r \n \t\n\r\"/>", "attr1", " ", S_OK }, + { "<a attr1=\" val \"/>", "attr1", " val ", S_OK }, + { "<a attr1=\"\r\n\tval\n\"/>", "attr1", " val ", S_OK }, + { "<a attr1=\"val \"/>", "attr1", "val ", S_OK }, + { "<a attr1=\"val \"/>", "attr1", "val ", S_OK }, + { "<a attr1=\"<>&'"\"/>", "attr1", "<>&\'\"", S_OK }, + { "<a attr1=\"&entname;\"/>", NULL, NULL, WC_E_UNDECLAREDENTITY }, + { "<a attr1=\"val\"/>", NULL, NULL, WC_E_XMLCHARACTER }, + { "<a attr1=\"val &#a;\"/>", NULL, NULL, WC_E_DIGIT, WC_E_SEMICOLON }, + { "<a attr1=\"val &#12a;\"/>", NULL, NULL, WC_E_SEMICOLON }, + { "<a attr1=\"val &#x12g;\"/>", NULL, NULL, WC_E_SEMICOLON }, + { "<a attr1=\"val &#xg;\"/>", NULL, NULL, WC_E_HEXDIGIT, WC_E_SEMICOLON }, + { "<a attr1=attrvalue/>", NULL, NULL, WC_E_QUOTE }, + { "<a attr1=\"attr<value\"/>", NULL, NULL, WC_E_LESSTHAN }, + { "<a attr1=\"&entname\"/>", NULL, NULL, WC_E_SEMICOLON }, + { NULL } +}; + +static void test_read_attribute(void) +{ + struct test_entry *test = attributes_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + + if (test->hr_broken) + ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + else + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml); + + hr = IXmlReader_MoveToFirstAttribute(reader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + len = 1; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + len = 1; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine { + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + } /* value */ len = 1; str = NULL; @@ -1417,11 +1683,14 @@ test_reader_create(); test_readerinput(); test_reader_state(); + test_read_attribute(); test_read_cdata(); test_read_comment(); test_read_pi(); test_read_dtd(); test_read_element(); + test_isemptyelement(); + test_read_text(); test_read_full(); test_read_pending(); test_readvaluechunk();

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs