Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[dchapyshev] 33127: - Update Russian translation
by dchapyshev＠svn.reactos.org 23 Apr '08

23 Apr '08

Author: dchapyshev Date: Wed Apr 23 10:54:29 2008 New Revision: 33127 URL: http://svn.reactos.org/svn/reactos?rev=33127&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Wed Apr 23 10:54:29 2008 @@ -20,12 +20,12 @@ BEGIN LTEXT "Äàííàÿ ïðîãðàììà ïîçâîëÿåò ïîëó÷èòü ïîäðîáíûå ñâåäåíèÿ îá óñòàíîâëåííûõ êîìïîíåíòàõ è äðàéâåðàõ ReactX.", -1, 10, 10, 343, 17 LTEXT "Åñëè èçâåñòíà âîçìîæíàÿ ïðè÷èíà íåïîëàäêè, ìîæíî ñðàçó âûáðàòü ñîîòâåòñòâóþùóþ âêëàäêó. Â ïðîòèâíîì ñëó÷àå èñïîëüçóéòå êíîïêó ""Ñëåäóþùàÿ ñòðàíèöà"" äëÿ ïîñëåäîâàòåëüíîãî ïðîñìîòðà ñòðàíèö.", -1, 10, 30, 343, 25 - GROUPBOX "Ñâåäåíèÿ î ñèñòåìå", -1, 10, 55, 343, 130, SS_RIGHT + GROUPBOX "Ñâåäåíèÿ î ñèñòåìå", -1, 10, 58, 343, 130, SS_RIGHT LTEXT "Òåêóùèå âðåìÿ è äàòà:", -1, 70, 70, 80, 10, SS_RIGHT LTEXT "Èìÿ êîìïüþòåðà:", -1, 70, 80, 80, 10, SS_RIGHT - LTEXT "Îïåðàöèîííàÿ ñèñòåìà:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Îïåðàöèîííàÿ ñèñòåìà:", -1, 70, 90, 100, 10, SS_RIGHT LTEXT "ßçûê:", -1, 70, 100, 80, 10, SS_RIGHT - LTEXT "Èçãîòîâèòåëü êîìïüþòåðà:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "Èçãîòîâèòåëü êîìïüþòåðà:", -1, 70, 110, 100, 10, SS_RIGHT LTEXT "Ìîäåëü êîìïüþòåðà:", -1, 70, 120, 80, 10, SS_RIGHT LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT LTEXT "Ïðîöåññîð:", -1, 70, 140, 80, 10, SS_RIGHT @@ -69,11 +69,11 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "DirectInput Devices", -1, 10, 10, 352, 80 + GROUPBOX "Óñòðîéñòâà DirectInput", -1, 10, 10, 352, 80 CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60 - GROUPBOX "Input Devices", -1, 10, 100, 352, 60 + GROUPBOX "Óñòðîéñòâà ââîäà", -1, 10, 100, 352, 60 CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 110, 332, 40, 0x00000200 - GROUPBOX "Information", -1, 10, 170, 352, 50 + GROUPBOX "Èíôîðìàöèÿ", -1, 10, 170, 352, 50 EDITTEXT IDC_RICH_INFO, 20, 180, 332, 30, WS_DISABLED | WS_TABSTOP END @@ -104,16 +104,16 @@ IDS_FORMAT_UNIPROC "%s (%u ÖÏ)" IDS_FORMAT_MPPROC "%s (%u ÖÏ)" IDS_VERSION_UNKNOWN "Íåèçâåñòíàÿ âåðñèÿ" - IDS_DEVICE_STATUS_ATTACHED "Connected" - IDS_DEVICE_STATUS_MISSING "Disconnected" - IDS_DEVICE_STATUS_UNKNOWN "Unknown" - IDS_DEVICE_NAME "Device name" - IDS_DEVICE_STATUS "Status" - IDS_DEVICE_CONTROLLER "Controller ID" - IDS_DEVICE_MANUFACTURER "Manufacturer ID" - IDS_DEVICE_PRODUCT "Product ID" + IDS_DEVICE_STATUS_ATTACHED "Ïîäêëþ÷åíî" + IDS_DEVICE_STATUS_MISSING "Îòêëþ÷åíî" + IDS_DEVICE_STATUS_UNKNOWN "Íåèçâåñòíî" + IDS_DEVICE_NAME "Èìÿ óñòðîéñòâà" + IDS_DEVICE_STATUS "Ñîñòîÿíèå" + IDS_DEVICE_CONTROLLER "ID êîíòðîëëåðà" + IDS_DEVICE_MANUFACTURER "ID ïðîèçâîäèòåëÿ" + IDS_DEVICE_PRODUCT "ID ïðîäóêòà" IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Driver" - IDS_NOT_APPLICABLE "Not applicable" - IDS_OPTION_YES "Yes" + IDS_NOT_APPLICABLE "Í/Ä" + IDS_OPTION_YES "Äà" END

1 0

[dreimer] 33126: Revert r33093. It breaks build for me and fixes no circular dependency for the rest. Set the new added wine dlls to autosync in readme.wine.
by dreimer＠svn.reactos.org 23 Apr '08

23 Apr '08

Author: dreimer Date: Wed Apr 23 04:55:55 2008 New Revision: 33126 URL: http://svn.reactos.org/svn/reactos?rev=33126&view=rev Log: Revert r33093. It breaks build for me and fixes no circular dependency for the rest. Set the new added wine dlls to autosync in readme.wine. Removed: trunk/reactos/dll/win32/msi/msiserver_v2.idl Modified: trunk/reactos/dll/win32/msi/msi.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] Wed Apr 23 04:55:55 2008 @@ -1,6 +1,3 @@ -<module name="msi_msiserver_typelib" type="embeddedtypelib" allowwarnings="true"> - <file>msiserver_v2.idl</file> -</module> <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> @@ -9,11 +6,9 @@ <importlibrary definition="msi.spec.def" /> <include base="msi">.</include> <include base="ReactOS">include/reactos/wine</include> - <include base="msi" root="intermediate">.</include> <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> - <dependency>msi_msiserver_typelib</dependency> <file>action.c</file> <file>alter.c</file> <file>appsearch.c</file> @@ -57,6 +52,7 @@ <file>where.c</file> <file>msiserver.idl</file> <file>msi.rc</file> + <include base="msi" root="intermediate">.</include> <file>msi.spec</file> <library>wine</library> <library>urlmon</library> @@ -75,5 +71,9 @@ <library>odbccp32</library> <library>uuid</library> <library>ntdll</library> + <dependency>msi_msiserver_typelib</dependency> </module> -</group> +<module name="msi_msiserver_typelib" type="embeddedtypelib" allowwarnings="true"> + <file>msiserver.idl</file> +</module> +</group> Removed: trunk/reactos/dll/win32/msi/msiserver_v2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver_v2… ============================================================================== --- trunk/reactos/dll/win32/msi/msiserver_v2.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msiserver_v2.idl (removed) @@ -1,1 +1,0 @@ -#include "msiserver.idl" 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] Wed Apr 23 04:55:55 2008 @@ -72,7 +72,7 @@ reactos/dll/win32/oleaut32 # Autosync reactos/dll/win32/oledlg # Autosync reactos/dll/win32/olepro32 # Autosync -reactos/dll/win32/pdh # Out of sync +reactos/dll/win32/pdh # Autosync reactos/dll/win32/powrprof # Autosync reactos/dll/win32/printui # Autosync reactos/dll/win32/rasapi32 # Autosync @@ -88,15 +88,15 @@ reactos/dll/win32/shdocvw # Synced to Wine-0_9_5 reactos/dll/win32/shfolder # Autosync reactos/dll/win32/shlwapi # Autosync -reactos/dll/win32/stdole2.tlb # Out of Sync -reactos/dll/win32/tapi32 # Out of sync +reactos/dll/win32/stdole2.tlb # Autosync +reactos/dll/win32/tapi32 # Autosync reactos/dll/win32/twain_32 # Out of sync reactos/dll/win32/urlmon # Autosync -reactos/dll/win32/usp10 # Out of sync +reactos/dll/win32/usp10 # Autosync reactos/dll/win32/uxtheme # Autosync reactos/dll/win32/version # Autosync reactos/dll/win32/wininet # Autosync -reactos/dll/win32/winhttp # Out of Sync +reactos/dll/win32/winhttp # Autosync reactos/dll/win32/wintrust # Out of sync reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628

1 0

[greatlrd] 33125: start setup edd directdraw local
by greatlrd＠svn.reactos.org 23 Apr '08

23 Apr '08

Author: greatlrd Date: Wed Apr 23 00:45:59 2008 New Revision: 33125 URL: http://svn.reactos.org/svn/reactos?rev=33125&view=rev Log: start setup edd directdraw local Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Wed Apr 23 00:45:59 2008 @@ -24,6 +24,7 @@ ULONG gdwDirectDrawContext; void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl); EDD_DIRECTDRAW_GLOBAL edd_DdirectDraw_Global; +EDD_DIRECTDRAW_LOCAL edd_DirectDrawLocalList; /************************************************************************/ @@ -183,9 +184,16 @@ ((PGDIDEVICE)pDC->pPDev)->pEDDgpl = &edd_DdirectDraw_Global; RtlZeroMemory(&edd_DdirectDraw_Global,sizeof(EDD_DIRECTDRAW_GLOBAL)); + /* FIXME this should be alloc by win32k */ + RtlZeroMemory(&edd_DirectDrawLocalList,sizeof(EDD_DIRECTDRAW_LOCAL)); + /* setup hdev for edd_DdirectDraw_Global xp */ edd_DdirectDraw_Global.hDev = (PVOID)pDC->pPDev; edd_DdirectDraw_Global.hPDev = (PVOID)pDC->pPDev; + edd_DdirectDraw_Global.peDirectDrawLocalList = &edd_DirectDrawLocalList; + + /* setup hdev for edd_DdirectDraw_Local xp */ + edd_DirectDrawLocalList.peDirectDrawGlobal = &edd_DdirectDraw_Global; DC_UnlockDc(pDC); /* get the pfnDdCreateDirectDrawObject after we load the drv */

1 0

[greatlrd] 33124: change directx struct
by greatlrd＠svn.reactos.org 23 Apr '08

23 Apr '08

Author: greatlrd Date: Wed Apr 23 00:44:20 2008 New Revision: 33124 URL: http://svn.reactos.org/svn/reactos?rev=33124&view=rev Log: change directx struct Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Wed Apr 23 00:44:20 2008 @@ -2,33 +2,32 @@ #ifndef _DXINTERNEL_ #define _DXINTERNEL_ -typedef struct _DD_BASEOBJECT -{ - HANDLE hHmgr; - ULONG ulShareCount; - LONG cExclusiveLock; - PVOID Tid; -} DD_BASEOBJECT, *PDD_BASEOBJECT; +#define PDD_BASEOBJECT POBJ +#define DD_BASEOBJECT BASEOBJECT +/* _EDD_DIRECTDRAW_LOCAL is 0x54 byte big on windows xp */ typedef struct _EDD_DIRECTDRAW_LOCAL { // // GDI Object Header // DD_BASEOBJECT pobj; - - struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal; - struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal2; - struct _EDD_SURFACE * peSurface_DdList; - ULONG unk_01c[2]; - struct _EDD_DIRECTDRAW_LOCAL * peDirectDrawLocalNext; - FLATPTR fpProcess; - FLONG fl; - HANDLE UniqueProcess; - PEPROCESS Process; - ULONG unk_038[2]; - VOID *unk_040; - VOID *unk_044; +/* 0x10 */ struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal; +/* 0x1C */ struct _EDD_SURFACE * peSurface_DdList; +/* 0x1C */ ULONG unk_01c; +/* 0x20 */ ULONG unk_020; +/* 0x24 */ struct _EDD_DIRECTDRAW_GLOBAL * peDirectDrawGlobal2; +/* 0x28 */ FLATPTR fpProcess; +/* 0x2C */ FLONG fl; +/* 0x30 */ HANDLE UniqueProcess; +/* 0x34 */ PEPROCESS Process; +/* 0x38 */ ULONG unk_038; +/* 0x3C */ ULONG unk_03C; +/* 0x40 */ VOID *unk_040; +/* 0x44 */ VOID *unk_044; +/* 0x48 */ ULONG unk_048; +/* 0x4C */ ULONG unk_04C; +/* 0x50 */ ULONG unk_050; } EDD_DIRECTDRAW_LOCAL, PEDD_DIRECTDRAW_LOCAL;

1 0

[greatlrd] 33123: comment out one line for now. for we will use same struct as gdi object in dx/reactx header.
by greatlrd＠svn.reactos.org 23 Apr '08

23 Apr '08

Author: greatlrd Date: Wed Apr 23 00:23:51 2008 New Revision: 33123 URL: http://svn.reactos.org/svn/reactos?rev=33123&view=rev Log: comment out one line for now. for we will use same struct as gdi object in dx/reactx header. Modified: trunk/reactos/drivers/directx/dxg/eng.c Modified: trunk/reactos/drivers/directx/dxg/eng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/eng.c?… ============================================================================== --- trunk/reactos/drivers/directx/dxg/eng.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/eng.c [iso-8859-1] Wed Apr 23 00:23:51 2008 @@ -38,7 +38,7 @@ if (pSurface) { pEDDSurface = (PEDD_SURFACE)( ((PBYTE)pSurface) - sizeof(DD_BASEOBJECT)); - InterlockedDecrement(&pEDDSurface->pobj.cExclusiveLock); + // InterlockedDecrement(&pEDDSurface->pobj.cExclusiveLock); retVal = TRUE; }

1 0

[greatlrd] 33122: take offline some code, this file should be take code from win32k. it is same as gdi handle alloc doing it.
by greatlrd＠svn.reactos.org 23 Apr '08

23 Apr '08

Author: greatlrd Date: Wed Apr 23 00:21:59 2008 New Revision: 33122 URL: http://svn.reactos.org/svn/reactos?rev=33122&view=rev Log: take offline some code, this file should be take code from win32k. it is same as gdi handle alloc doing it. Modified: trunk/reactos/drivers/directx/dxg/ddhmg.c Modified: trunk/reactos/drivers/directx/dxg/ddhmg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/ddhmg.… ============================================================================== --- trunk/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] Wed Apr 23 00:21:59 2008 @@ -161,6 +161,7 @@ pEntry = (PDD_ENTRY)((PBYTE)gpentDdHmgr + (sizeof(DD_ENTRY) * Index)); if ( VerifyObjectOwner(pEntry) ) { + /* FIXME if ( (pEntry->Objt == ObjectType ) && (pEntry->FullUnique == (((DWORD)DdHandle >> 21) & 0x7FF) ) && (pEntry->pobj->cExclusiveLock == 0) && @@ -170,6 +171,7 @@ pEntry->pobj->Tid = PsGetCurrentThread(); Object = pEntry->pobj; } + */ } }

1 0

[janderwald] 33121: - enlarge the dialog window - load treeview classes on startup - link to dinput8 + dxguid library - start implementing DirectInput dialog - use DirectInput version 8 for now
by janderwald＠svn.reactos.org 22 Apr '08

22 Apr '08

Author: janderwald Date: Tue Apr 22 18:19:50 2008 New Revision: 33121 URL: http://svn.reactos.org/svn/reactos?rev=33121&view=rev Log: - enlarge the dialog window - load treeview classes on startup - link to dinput8 + dxguid library - start implementing DirectInput dialog - use DirectInput version 8 for now Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/dxdiag/dxdiag.rbuild trunk/reactos/base/applications/dxdiag/input.c trunk/reactos/base/applications/dxdiag/lang/en-US.rc trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/dxdiag/resource.h Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Tue Apr 22 18:19:50 2008 @@ -187,7 +187,7 @@ UNREFERENCED_PARAMETER(nCmdShow); InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); - InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES | ICC_STANDARD_CLASSES; + InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES | ICC_STANDARD_CLASSES | ICC_TREEVIEW_CLASSES; InitCommonControlsEx(&InitControls); hInst = hInstance; Modified: trunk/reactos/base/applications/dxdiag/dxdiag.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.rbuild [iso-8859-1] Tue Apr 22 18:19:50 2008 @@ -12,6 +12,8 @@ <library>comctl32</library> <library>shell32</library> <library>version</library> + <library>dinput8</library> + <library>dxguid</library> <file>system.c</file> <file>display.c</file> <file>sound.c</file> Modified: trunk/reactos/base/applications/dxdiag/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/i… ============================================================================== --- trunk/reactos/base/applications/dxdiag/input.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/input.c [iso-8859-1] Tue Apr 22 18:19:50 2008 @@ -9,6 +9,194 @@ #include "precomp.h" +typedef struct +{ + HWND hwndDlg; + IDirectInput8W * pObj; + HWND hDevList; + HWND hPortTree; + INT Count; +}INPUT_DIALOG_CONTEXT, *PINPUT_DIALOG_CONTEXT; + + +BOOL CALLBACK DirectInputEnumDevCb( + LPCDIDEVICEINSTANCEW lpddi, + LPVOID pvRef +) +{ + HRESULT hResult; + WCHAR szText[100]; + IDirectInputDevice8W * pDev = NULL; + //DIPROPGUIDANDPATH GuidPath; + //DIPROPSTRING TypeName; + DIPROPDWORD VendorID; + DIDEVCAPS DevCaps; + DWORD dwProductID; + DWORD dwManufacturerID; + LVITEMW Item; + LRESULT lResult; + + PINPUT_DIALOG_CONTEXT pContext = (PINPUT_DIALOG_CONTEXT)pvRef; + + if (!pContext) + return DIENUM_STOP; + + ZeroMemory(&Item, sizeof(LVITEMW)); + Item.mask = LVIF_TEXT; + Item.pszText = (LPWSTR)lpddi->tszProductName; + Item.iItem = pContext->Count; + /* insert device item */ + lResult = SendMessageW(pContext->hDevList, LVM_INSERTITEM, 0, (LPARAM)&Item); + if (lResult == -1) + return DIENUM_CONTINUE; + + /* is the device attached */ + szText[0] = L'\0'; + hResult = pContext->pObj->lpVtbl->GetDeviceStatus(pContext->pObj, &lpddi->guidInstance); + if (hResult == DI_OK) + LoadStringW(hInst, IDS_DEVICE_STATUS_ATTACHED, szText, sizeof(szText) / sizeof(WCHAR)); + else if (hResult == DI_NOTATTACHED) + LoadStringW(hInst, IDS_DEVICE_STATUS_MISSING, szText, sizeof(szText) / sizeof(WCHAR)); + else + LoadStringW(hInst, IDS_DEVICE_STATUS_UNKNOWN, szText, sizeof(szText) / sizeof(WCHAR)); + + if (szText[0]) + { + szText[(sizeof(szText) / sizeof(WCHAR))-1] = L'\0'; + Item.iSubItem = 1; + Item.pszText = szText; + SendMessageW(pContext->hDevList, LVM_SETITEM, lResult, (LPARAM)&Item); + } + + hResult = pContext->pObj->lpVtbl->CreateDevice(pContext->pObj, &lpddi->guidInstance, &pDev, NULL); + + if (hResult != DI_OK) + return DIENUM_STOP; + + ZeroMemory(&VendorID, sizeof(DIPROPDWORD)); + VendorID.diph.dwSize = sizeof(DIPROPDWORD); + VendorID.diph.dwHeaderSize = sizeof(DIPROPHEADER); + + hResult = pDev->lpVtbl->GetProperty(pDev, DIPROP_VIDPID, (LPDIPROPHEADER)&VendorID); + if (hResult == DI_OK) + { + /* set manufacturer id */ + dwManufacturerID = LOWORD(VendorID.dwData); + swprintf(szText, L"0x%04X", dwManufacturerID); + Item.iSubItem = 3; + SendMessageW(pContext->hDevList, LVM_SETITEM, lResult, (LPARAM)&Item); + /* set product id */ + dwProductID = HIWORD(VendorID.dwData); + swprintf(szText, L"0x%04X", dwProductID); + Item.iSubItem = 4; + SendMessageW(pContext->hDevList, LVM_SETITEM, lResult, (LPARAM)&Item); + } + else + { + szText[0] = L'\0'; + LoadStringW(hInst, IDS_NOT_APPLICABLE, szText, sizeof(szText) / sizeof(WCHAR)); + szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0'; + /* set manufacturer id */ + Item.iSubItem = 3; + SendMessageW(pContext->hDevList, LVM_SETITEM, lResult, (LPARAM)&Item); + /* set product id */ + Item.iSubItem = 4; + SendMessageW(pContext->hDevList, LVM_SETITEM, lResult, (LPARAM)&Item); + } + + /* check for force feedback support */ + DevCaps.dwSize = sizeof(DIDEVCAPS); // use DIDEVCAPS_DX3 for DX3 support + hResult = pDev->lpVtbl->GetCapabilities(pDev, &DevCaps); + szText[0] = L'\0'; + if (hResult == DI_OK) + { + if (DevCaps.dwFlags & DIDC_FORCEFEEDBACK) + LoadStringW(hInst, IDS_OPTION_YES, szText, sizeof(szText)/sizeof(WCHAR)); + else + LoadStringW(hInst, IDS_NOT_APPLICABLE, szText, sizeof(szText)/sizeof(WCHAR)); + } + else + { + LoadStringW(hInst, IDS_NOT_APPLICABLE, szText, sizeof(szText)/sizeof(WCHAR)); + } + + Item.iSubItem = 5; + SendMessageW(pContext->hDevList, LVM_SETITEM, lResult, (LPARAM)&Item); + + +#if 0 + ZeroMemory(&GuidPath, sizeof(DIPROPGUIDANDPATH)); + GuidPath.diph.dwSize = sizeof(DIPROPGUIDANDPATH); + GuidPath.diph.dwHeaderSize = sizeof(DIPROPHEADER); + GuidPath.diph.dwHow = DIPH_DEVICE; + hResult = pDev->lpVtbl->GetProperty(pDev, DIPROP_GUIDANDPATH, (LPDIPROPHEADER)&GuidPath); + + ZeroMemory(&TypeName, sizeof(TypeName)); + TypeName.diph.dwSize = sizeof(TypeName); + TypeName.diph.dwHeaderSize = sizeof(DIPROPHEADER); + TypeName.diph.dwHow = DIPH_DEVICE; + hResult = pDev->lpVtbl->GetProperty(pDev, DIPROP_GETPORTDISPLAYNAME, (LPDIPROPHEADER)&TypeName); + + +#endif + + + pDev->lpVtbl->Release(pDev); + pContext->Count++; + + + return DIENUM_CONTINUE; +} + +VOID +InitListViewColumns(PINPUT_DIALOG_CONTEXT pContext) +{ + WCHAR szText[256]; + LVCOLUMNW lvcolumn; + INT Index; + + + pContext->hDevList = GetDlgItem(pContext->hwndDlg, IDC_LIST_DEVICE); + + ZeroMemory(&lvcolumn, sizeof(LVCOLUMNW)); + lvcolumn.pszText = szText; + lvcolumn.mask = LVCF_FMT | LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH; + lvcolumn.fmt = LVCFMT_LEFT; + lvcolumn.cx = 100; + + for(Index = 0; Index < 6; Index++) + { + szText[0] = L'\0'; + LoadStringW(hInst, IDS_DEVICE_NAME + Index, szText, sizeof(szText) / sizeof(WCHAR)); + szText[(sizeof(szText) / sizeof(WCHAR))-1] = L'\0'; + if (SendMessageW(pContext->hDevList, LVM_INSERTCOLUMNW, Index, (LPARAM)&lvcolumn) == -1) + return; + } +} + +static +void +InitializeDirectInputDialog(HWND hwndDlg) +{ + INPUT_DIALOG_CONTEXT Context; + HRESULT hResult; + IDirectInput8W * pObj; + + hResult = DirectInput8Create(hInst, DIRECTINPUT_VERSION, &IID_IDirectInput8W, (LPVOID*)&pObj, NULL); + if (hResult != DI_OK) + return; + + ZeroMemory(&Context, sizeof(Context)); + Context.pObj = pObj; + Context.hwndDlg = hwndDlg; + InitListViewColumns(&Context); + hResult = pObj->lpVtbl->EnumDevices(pObj, DI8DEVCLASS_ALL, DirectInputEnumDevCb, (PVOID)&Context, DIEDFL_ALLDEVICES); + + pObj->lpVtbl->Release(pObj); +} + + + INT_PTR CALLBACK InputPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { @@ -18,6 +206,7 @@ case WM_INITDIALOG: { SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + InitializeDirectInputDialog(hDlg); return TRUE; } } Modified: trunk/reactos/base/applications/dxdiag/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/en-US.rc [iso-8859-1] Tue Apr 22 18:19:50 2008 @@ -1,17 +1,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 260 +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 280 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "ReactX-Diagnostic program" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,195 - PUSHBUTTON "&Help", IDC_BUTTON_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&Next Page", IDC_BUTTON_NEXT, 137, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Save All Information...", IDC_BUTTON_SAVE_INFO, 201, 201, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Exit", IDC_BUTTON_EXIT, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,250 + PUSHBUTTON "&Help", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Next Page", IDC_BUTTON_NEXT, 137, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Save All Information...", IDC_BUTTON_SAVE_INFO, 201, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Exit", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 @@ -65,10 +65,16 @@ END -IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "DirectInput Devices", -1, 10, 10, 352, 80 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60 + GROUPBOX "Input Devices", -1, 10, 100, 352, 60 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 110, 332, 40, 0x00000200 + GROUPBOX "Information", -1, 10, 170, 352, 50 + EDITTEXT IDC_RICH_INFO, 20, 180, 332, 30, WS_DISABLED | WS_TABSTOP END IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 @@ -98,4 +104,15 @@ IDS_FORMAT_UNIPROC "%s (%u CPU)" IDS_FORMAT_MPPROC "%s (%u CPUs)" IDS_VERSION_UNKNOWN "Unknown Version" + IDS_DEVICE_STATUS_ATTACHED "Connected" + IDS_DEVICE_STATUS_MISSING "Disconnected" + IDS_DEVICE_STATUS_UNKNOWN "Unknown" + IDS_DEVICE_NAME "Device name" + IDS_DEVICE_STATUS "Status" + IDS_DEVICE_CONTROLLER "Controller ID" + IDS_DEVICE_MANUFACTURER "Manufacturer ID" + IDS_DEVICE_PRODUCT "Product ID" + IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Driver" + IDS_NOT_APPLICABLE "Not applicable" + IDS_OPTION_YES "Yes" END Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] Tue Apr 22 18:19:50 2008 @@ -1,17 +1,17 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 220 +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 280 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "ReactX - Programme de diagnostic" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,195 - PUSHBUTTON "Aide", IDC_BUTTON_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "Page suiva&nte", IDC_BUTTON_NEXT, 137, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Enregi&strer toutes les informations...", IDC_BUTTON_SAVE_INFO, 201, 201, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Quitt&er", IDC_BUTTON_EXIT, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,250 + PUSHBUTTON "Aide", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Page suiva&nte", IDC_BUTTON_NEXT, 137, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Enregi&strer toutes les informations...", IDC_BUTTON_SAVE_INFO, 201, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Quitt&er", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 @@ -65,10 +65,16 @@ END -IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "DirectInput Devices", -1, 10, 10, 352, 80 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60 + GROUPBOX "Input Devices", -1, 10, 100, 352, 60 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 110, 332, 40, 0x00000200 + GROUPBOX "Information", -1, 10, 170, 352, 50 + EDITTEXT IDC_RICH_INFO, 20, 180, 332, 30, WS_DISABLED | WS_TABSTOP END IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 @@ -98,4 +104,15 @@ IDS_FORMAT_UNIPROC "%s (%u CPU)" IDS_FORMAT_MPPROC "%s (%u CPUs)" IDS_VERSION_UNKNOWN "Unknown Version" + IDS_DEVICE_STATUS_ATTACHED "Connected" + IDS_DEVICE_STATUS_MISSING "Disconnected" + IDS_DEVICE_STATUS_UNKNOWN "Unknown" + IDS_DEVICE_NAME "Device name" + IDS_DEVICE_STATUS "Status" + IDS_DEVICE_CONTROLLER "Controller ID" + IDS_DEVICE_MANUFACTURER "Manufacturer ID" + IDS_DEVICE_PRODUCT "Product ID" + IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Driver" + IDS_NOT_APPLICABLE "Not applicable" + IDS_OPTION_YES "Yes" END Modified: trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/pl-PL.rc [iso-8859-1] Tue Apr 22 18:19:50 2008 @@ -7,18 +7,18 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 220 +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 280 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Narzêdzie diagnostyki ReactX" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,195 - PUSHBUTTON "&Pomoc", IDC_BUTTON_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&Nastêpna Strona", IDC_BUTTON_NEXT, 137, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Zapisz wszystkie informacje...", IDC_BUTTON_SAVE_INFO, 201, 201, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Wyjcie", IDC_BUTTON_EXIT, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,250 + PUSHBUTTON "&Pomoc", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Nastêpna Strona", IDC_BUTTON_NEXT, 137, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Zapisz wszystkie informacje...", IDC_BUTTON_SAVE_INFO, 201, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Wyjcie", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 @@ -72,10 +72,16 @@ END -IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "DirectInput Devices", -1, 10, 10, 352, 80 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60 + GROUPBOX "Input Devices", -1, 10, 100, 352, 60 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 110, 332, 40, 0x00000200 + GROUPBOX "Information", -1, 10, 170, 352, 50 + EDITTEXT IDC_RICH_INFO, 20, 180, 332, 30, WS_DISABLED | WS_TABSTOP END IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 @@ -105,4 +111,16 @@ IDS_FORMAT_UNIPROC "%s (%u CPU)" IDS_FORMAT_MPPROC "%s (%u CPUs)" IDS_VERSION_UNKNOWN "Unknown Version" + IDS_DEVICE_STATUS_ATTACHED "Connected" + IDS_DEVICE_STATUS_MISSING "Disconnected" + IDS_DEVICE_STATUS_UNKNOWN "Unknown" + IDS_DEVICE_NAME "Device name" + IDS_DEVICE_STATUS "Status" + IDS_DEVICE_CONTROLLER "Controller ID" + IDS_DEVICE_MANUFACTURER "Manufacturer ID" + IDS_DEVICE_PRODUCT "Product ID" + IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Driver" + IDS_NOT_APPLICABLE "Not applicable" + IDS_OPTION_YES "Yes" + END Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Tue Apr 22 18:19:50 2008 @@ -1,17 +1,17 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 220 +IDD_MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 280 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Ñðåäñòâî äèàãíîñòèêè ReactX" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,195 - PUSHBUTTON "&Ñïðàâêà", IDC_BUTTON_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "&Ñëåäóþùàÿ ñòðàíèöà", IDC_BUTTON_NEXT, 101, 201, 94, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Ñ&îõðàíèòü âñþ èíôîðìàöèþ...", IDC_BUTTON_SAVE_INFO, 199, 201, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Âûõîä", IDC_BUTTON_EXIT, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,374,250 + PUSHBUTTON "&Ñïðàâêà", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Ñëåäóþùàÿ ñòðàíèöà", IDC_BUTTON_NEXT, 101, 261, 94, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ñ&îõðàíèòü âñþ èíôîðìàöèþ...", IDC_BUTTON_SAVE_INFO, 199, 261, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Âûõîä", IDC_BUTTON_EXIT, 323, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 @@ -65,10 +65,16 @@ END -IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 +IDD_INPUT_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN + GROUPBOX "DirectInput Devices", -1, 10, 10, 352, 80 + CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 332, 60 + GROUPBOX "Input Devices", -1, 10, 100, 352, 60 + CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 110, 332, 40, 0x00000200 + GROUPBOX "Information", -1, 10, 170, 352, 50 + EDITTEXT IDC_RICH_INFO, 20, 180, 332, 30, WS_DISABLED | WS_TABSTOP END IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE 0, 0, 362, 190 @@ -98,4 +104,16 @@ IDS_FORMAT_UNIPROC "%s (%u ÖÏ)" IDS_FORMAT_MPPROC "%s (%u ÖÏ)" IDS_VERSION_UNKNOWN "Íåèçâåñòíàÿ âåðñèÿ" + IDS_DEVICE_STATUS_ATTACHED "Connected" + IDS_DEVICE_STATUS_MISSING "Disconnected" + IDS_DEVICE_STATUS_UNKNOWN "Unknown" + IDS_DEVICE_NAME "Device name" + IDS_DEVICE_STATUS "Status" + IDS_DEVICE_CONTROLLER "Controller ID" + IDS_DEVICE_MANUFACTURER "Manufacturer ID" + IDS_DEVICE_PRODUCT "Product ID" + IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Driver" + IDS_NOT_APPLICABLE "Not applicable" + IDS_OPTION_YES "Yes" + END Modified: trunk/reactos/base/applications/dxdiag/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/p… ============================================================================== --- trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] Tue Apr 22 18:19:50 2008 @@ -1,9 +1,15 @@ #ifndef PRECOMP_H__ #define PRECOMP_H__ +#define DIRECTINPUT_VERSION 0x0800 + #include <stdio.h> #include <windows.h> +#include <setupapi.h> +#include <devguid.h> #include <commctrl.h> + +#include <dinput.h> #include "resource.h" typedef struct @@ -11,7 +17,6 @@ HWND hDialogs[7]; }DXDIAG_CONTEXT, *PDXDIAG_CONTEXT; - Modified: trunk/reactos/base/applications/dxdiag/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… ============================================================================== --- trunk/reactos/base/applications/dxdiag/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/resource.h [iso-8859-1] Tue Apr 22 18:19:50 2008 @@ -19,6 +19,8 @@ #define IDC_BUTTON_SAVE_INFO 1003 #define IDC_BUTTON_EXIT 1004 +/* system dialog constants */ + #define IDC_STATIC_TIME 2000 #define IDC_STATIC_COMPUTER 2001 #define IDC_STATIC_OS 2002 @@ -31,6 +33,12 @@ #define IDC_STATIC_SWAP 2009 #define IDC_STATIC_VERSION 2010 + +/* DirectInput dialog constants */ + +#define IDC_LIST_DEVICE 6000 +#define IDC_TREE_PORT 6001 +#define IDC_RICH_INFO 6002 /* string resource constants */ #define IDS_MAIN_DIALOG 10000 @@ -46,6 +54,17 @@ #define IDS_FORMAT_UNIPROC 10010 #define IDS_FORMAT_MPPROC 10011 #define IDS_VERSION_UNKNOWN 10012 +#define IDS_DEVICE_STATUS_ATTACHED 10013 +#define IDS_DEVICE_STATUS_MISSING 10014 +#define IDS_DEVICE_STATUS_UNKNOWN 10015 +#define IDS_DEVICE_NAME 10016 +#define IDS_DEVICE_STATUS 10017 +#define IDS_DEVICE_CONTROLLER 10018 +#define IDS_DEVICE_MANUFACTURER 10019 +#define IDS_DEVICE_PRODUCT 10020 +#define IDS_DEVICE_FORCEFEEDBACK 10021 +#define IDS_NOT_APPLICABLE 10100 +#define IDS_OPTION_YES 10101 /* icon resource constants */ #define IDI_APPICON 20000

1 0

[hyperion] 33120: modified include/psdk/ntdef.h Make C_ASSERT standards-compliant. Hopefully fixed for good
by hyperion＠svn.reactos.org 22 Apr '08

22 Apr '08

Author: hyperion Date: Tue Apr 22 18:09:05 2008 New Revision: 33120 URL: http://svn.reactos.org/svn/reactos?rev=33120&view=rev Log: modified include/psdk/ntdef.h Make C_ASSERT standards-compliant. Hopefully fixed for good Modified: trunk/reactos/include/psdk/ntdef.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Tue Apr 22 18:09:05 2008 @@ -130,6 +130,11 @@ #define MAXUSHORT 0xffff #define MAXULONG 0xffffffff #define MAXLONGLONG (0x7fffffffffffffffLL) -#define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1] + +#define __C_ASSERT_JOIN(X, Y) __C_ASSERT_DO_JOIN(X, Y) +#define __C_ASSERT_DO_JOIN(X, Y) __C_ASSERT_DO_JOIN2(X, Y) +#define __C_ASSERT_DO_JOIN2(X, Y) X##Y + +#define C_ASSERT(e) typedef char __C_ASSERT_JOIN(__C_ASSERT__, __LINE__)[(e) ? 1 : -1] #endif /* _NTDEF_H */

1 0

[janderwald] 33119: - add missing constants required for dxdiag
by janderwald＠svn.reactos.org 22 Apr '08

22 Apr '08

Author: janderwald Date: Tue Apr 22 17:52:44 2008 New Revision: 33119 URL: http://svn.reactos.org/svn/reactos?rev=33119&view=rev Log: - add missing constants required for dxdiag Modified: trunk/reactos/include/psdk/dinput.h Modified: trunk/reactos/include/psdk/dinput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dinput.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dinput.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dinput.h [iso-8859-1] Tue Apr 22 17:52:44 2008 @@ -718,6 +718,12 @@ } DIPROPGUIDANDPATH, *LPDIPROPGUIDANDPATH; typedef const DIPROPGUIDANDPATH *LPCDIPROPGUIDANDPATH; +typedef struct DIPROPSTRING { + DIPROPHEADER diph; + WCHAR wsz[MAX_PATH]; +} DIPROPSTRING, *LPDIPROPSTRING; +typedef const DIPROPSTRING *LPCDIPROPSTRING; + /* special property GUIDs */ #ifdef __cplusplus #define MAKEDIPROP(prop) (*(const GUID *)(prop)) @@ -746,8 +752,33 @@ #define DIPROPCALIBRATIONMODE_COOKED 0 #define DIPROPCALIBRATIONMODE_RAW 1 +#if DIRECTINPUT_VERSION >= 0x050a #define DIPROP_CALIBRATION MAKEDIPROP(11) #define DIPROP_GUIDANDPATH MAKEDIPROP(12) +#define DIPROP_INSTANCENAME MAKEDIPROP(13) +#define DIPROP_PRODUCTNAME MAKEDIPROP(14) +#endif + +#if DIRECTINPUT_VERSION >= 0x5B2 +#define DIPROP_JOYSTICKID MAKEDIPROP(15) +#define DIPROP_GETPORTDISPLAYNAME MAKEDIPROP(16) +#endif + +#if DIRECTINPUT_VERSION >= 0x0700 +#define DIPROP_PHYSICALRANGE MAKEDIPROP(18) +#define DIPROP_LOGICALRANGE MAKEDIPROP(19) +#endif + +#if(DIRECTINPUT_VERSION >= 0x0800) +#define DIPROP_KEYNAME MAKEDIPROP(20) +#define DIPROP_CPOINTS MAKEDIPROP(21) +#define DIPROP_APPDATA MAKEDIPROP(22) +#define DIPROP_SCANCODE MAKEDIPROP(23) +#define DIPROP_VIDPID MAKEDIPROP(24) +#define DIPROP_USERNAME MAKEDIPROP(25) +#define DIPROP_TYPENAME MAKEDIPROP(26) +#endif + typedef struct DIDEVCAPS_DX3 { DWORD dwSize;

1 0

[hyperion] 33118: I am stupid and buildbot is broken
by hyperion＠svn.reactos.org 22 Apr '08

22 Apr '08

Author: hyperion Date: Tue Apr 22 17:51:30 2008 New Revision: 33118 URL: http://svn.reactos.org/svn/reactos?rev=33118&view=rev Log: I am stupid and buildbot is broken Modified: trunk/reactos/include/psdk/ntdef.h Modified: trunk/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdef.h [iso-8859-1] Tue Apr 22 17:51:30 2008 @@ -130,6 +130,6 @@ #define MAXUSHORT 0xffff #define MAXULONG 0xffffffff #define MAXLONGLONG (0x7fffffffffffffffLL) -#define C_ASSERT(e) typedef __C_ASSERT__ char[(e)?1:-1] +#define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1] #endif /* _NTDEF_H */

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2008