Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 29234: - Allow changing the screen resolution in the advanced adapter settings through desk.cpl - desk.cpl doesn't publish a monitor id
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 09:23:58 2007 New Revision: 29234 URL: http://svn.reactos.org/svn/reactos?rev=29234&view=rev Log: - Allow changing the screen resolution in the advanced adapter settings through desk.cpl - desk.cpl doesn't publish a monitor id Modified: trunk/reactos/dll/cpl/desk/desk.def trunk/reactos/dll/cpl/desk/devsett.c trunk/reactos/dll/win32/shellext/deskadp/deskadp.c trunk/reactos/dll/win32/shellext/deskadp/deskadp.h trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc trunk/reactos/include/reactos/dll/desk/deskcplx.h Modified: trunk/reactos/dll/cpl/desk/desk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.def?rev=… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.def (original) +++ trunk/reactos/dll/cpl/desk/desk.def Thu Sep 27 09:23:58 2007 @@ -3,5 +3,6 @@ EXPORTS CPlApplet DisplayClassInstaller +DisplaySaveSettings ; EOF Modified: trunk/reactos/dll/cpl/desk/devsett.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/devsett.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/devsett.c (original) +++ trunk/reactos/dll/cpl/desk/devsett.c Thu Sep 27 09:23:58 2007 @@ -7,6 +7,8 @@ #include "desk.h" +#include <cfgmgr32.h> + #define NDEBUG #include <debug.h> @@ -23,7 +25,6 @@ CLIPFORMAT cfDisplayId; /* "Display ID" */ CLIPFORMAT cfMonitorName; /* "Monitor Name" */ CLIPFORMAT cfMonitorDevice; /* "Monitor Device" */ - CLIPFORMAT cfMonitorId; /* "Monitor ID" */ CLIPFORMAT cfDisplayKey; /* "Display Key" */ CLIPFORMAT cfDisplayStateFlags; /* "Display State Flags" */ CLIPFORMAT cfPruningMode; /* "Pruning Mode" */ @@ -34,7 +35,6 @@ PWSTR pDisplayId; PWSTR pMonitorName; PWSTR pMonitorDevice; - PWSTR pMonitorId; DESK_EXT_INTERFACE ExtInterface; @@ -171,9 +171,47 @@ static PWSTR pCDevSettings_GetDeviceInstanceId(const WCHAR *pszDevice) { - /* FIXME: Implement */ + DEVINST DevInst; + CONFIGRET cr; + ULONG BufLen; + LPWSTR lpDevInstId = NULL; + DPRINT1("CDevSettings::GetDeviceInstanceId(%ws) UNIMPLEMENTED!\n", pszDevice); - return NULL; + + cr = CM_Locate_DevNodeW(&DevInst, + (DEVINSTID_W)pszDevice, + CM_LOCATE_DEVNODE_NORMAL); + if (cr == CR_SUCCESS) + { + DbgPrint("Success1\n"); + cr = CM_Get_Device_ID_Size(&BufLen, + DevInst, + 0); + if (cr == CR_SUCCESS) + { + DbgPrint("Success2\n"); + lpDevInstId = LocalAlloc(LMEM_FIXED, + (BufLen + 1) * sizeof(WCHAR)); + + if (lpDevInstId != NULL) + { + DbgPrint("Success3\n"); + cr = CM_Get_Device_IDW(DevInst, + lpDevInstId, + BufLen, + 0); + + if (cr != CR_SUCCESS) + { + LocalFree((HLOCAL)lpDevInstId); + lpDevInstId = NULL; + } + DbgPrint("instance id: %ws\n", lpDevInstId); + } + } + } + + return lpDevInstId; } @@ -401,7 +439,6 @@ This->cfDisplayStateFlags = RegisterClipboardFormat(DESK_EXT_DISPLAYSTATEFLAGS); This->cfMonitorName = RegisterClipboardFormat(DESK_EXT_MONITORNAME); This->cfMonitorDevice = RegisterClipboardFormat(DESK_EXT_MONITORDEVICE); - This->cfMonitorId = RegisterClipboardFormat(DESK_EXT_MONITORID); This->cfPruningMode = RegisterClipboardFormat(DESK_EXT_PRUNINGMODE); /* Copy the device name */ @@ -411,14 +448,12 @@ DPRINT1("This->pDisplayName: %ws\n", This->pDisplayName); This->pDisplayKey = pCDevSettings_AllocAndCopyString(DisplayDeviceInfo->DeviceKey); DPRINT1("This->pDisplayKey: %ws\n", This->pDisplayKey); - This->pDisplayId = pCDevSettings_GetDeviceInstanceId(This->pDisplayDevice); + This->pDisplayId = pCDevSettings_GetDeviceInstanceId(DisplayDeviceInfo->DeviceID); DPRINT1("This->pDisplayId: %ws\n", This->pDisplayId); This->pMonitorName = pCDevSettings_GetMonitorName(This->pDisplayDevice); DPRINT1("This->pMonitorName: %ws\n", This->pMonitorName); This->pMonitorDevice = pCDevSettings_GetMonitorDevice(This->pDisplayDevice); DPRINT1("This->pMonitorDevice: %ws\n", This->pMonitorDevice); - This->pMonitorId = pCDevSettings_GetDeviceInstanceId( This->pMonitorDevice); - DPRINT1("This->pMonitorId: %ws\n", This->pMonitorId); /* Check pruning mode */ This->bModesPruned = ((DisplayDeviceInfo->DeviceStateFlags & DISPLAY_DEVICE_MODESPRUNED) != 0); @@ -465,7 +500,6 @@ pCDevSettings_FreeString(&This->pDisplayId); pCDevSettings_FreeString(&This->pMonitorName); pCDevSettings_FreeString(&This->pMonitorDevice); - pCDevSettings_FreeString(&This->pMonitorId); } static HRESULT STDMETHODCALLTYPE @@ -561,11 +595,6 @@ { pszRet = This->pMonitorDevice; DPRINT1("CDevSettings::GetData returns monitor device %ws\n", pszRet); - } - else if (pformatetcIn->cfFormat == This->cfMonitorId) - { - pszRet = This->pMonitorId; - DPRINT1("CDevSettings::GetData returns monitor id %ws\n", pszRet); } else if (pformatetcIn->cfFormat == This->cfExtInterface) { @@ -688,7 +717,6 @@ pformatetc->cfFormat == This->cfDisplayStateFlags || pformatetc->cfFormat == This->cfMonitorDevice || pformatetc->cfFormat == This->cfMonitorName || - pformatetc->cfFormat == This->cfMonitorId || pformatetc->cfFormat == This->cfPruningMode) { return S_OK; @@ -774,7 +802,7 @@ IEnumFORMATETC** ppenumFormatEtc) { HRESULT hr; - FORMATETC fetc[10]; + FORMATETC fetc[9]; PCDevSettings This = impl_from_IDataObject(iface); *ppenumFormatEtc = NULL; @@ -798,8 +826,6 @@ pCDevSettings_FillFormatEtc(&fetc[7], This->cfMonitorDevice); pCDevSettings_FillFormatEtc(&fetc[8], - This->cfMonitorId); - pCDevSettings_FillFormatEtc(&fetc[9], This->cfPruningMode); hr = SHCreateStdEnumFmtEtc(sizeof(fetc) / sizeof(fetc[0]), @@ -877,3 +903,12 @@ return NULL; } + +LONG WINAPI +DisplaySaveSettings(PVOID pContext, + HWND hwndPropSheet) +{ + //PCDevSettings This = impl_from_IDataObject((IDataObject *)Context); + DPRINT("DisplaySaveSettings() UNIMPLEMENTED!\n"); + return DISP_CHANGE_BADPARAM; +} Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 09:23:58 2007 @@ -151,6 +151,38 @@ } } +static BOOL +ChangeSelectedMode(PDESKDISPLAYADAPTER This, + HWND hwndListAllModesDlg) +{ + INT i; + PDEVMODEW lpSelDevMode = NULL; + BOOL bRet = FALSE; + + i = (INT)SendDlgItemMessage(hwndListAllModesDlg, + IDC_ALLVALIDMODES, + LB_GETCURSEL, + 0, + 0); + + if (i >= 0) + { + lpSelDevMode = (PDEVMODEW)SendDlgItemMessage(hwndListAllModesDlg, + IDC_ALLVALIDMODES, + LB_GETITEMDATA, + (WPARAM)i, + 0); + } + + if (lpSelDevMode != NULL) + { + This->lpSelDevMode = lpSelDevMode; + bRet = TRUE; + } + + return bRet; +} + static INT_PTR CALLBACK ListAllModesDlgProc(HWND hwndDlg, UINT uMsg, @@ -183,7 +215,14 @@ switch (LOWORD(wParam)) { case IDOK: + if (ChangeSelectedMode(This, + hwndDlg)) + { + EndDialog(hwndDlg, + IDOK); + } break; + case IDCANCEL: EndDialog(hwndDlg, IDCANCEL); @@ -203,11 +242,25 @@ static VOID ShowListAllModes(PDESKDISPLAYADAPTER This) { - DialogBoxParam(hInstance, - MAKEINTRESOURCE(IDD_LISTALLMODES), - This->hwndDlg, - ListAllModesDlgProc, - (LPARAM)This); + PDEVMODEW lpPrevSel; + + lpPrevSel = This->lpSelDevMode; + + if (This->DeskExtInterface != NULL && + DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_LISTALLMODES), + This->hwndDlg, + ListAllModesDlgProc, + (LPARAM)This) == IDOK) + { + if (lpPrevSel != This->lpSelDevMode) + { + (void)PropSheet_Changed(GetParent(This->hwndDlg), + This->hwndDlg); + This->DeskExtInterface->SetCurrentMode(This->DeskExtInterface->Context, + This->lpSelDevMode); + } + } } static VOID @@ -271,6 +324,49 @@ SetDlgItemTextW(This->hwndDlg, IDC_BIOSINFORMATION, This->DeskExtInterface->BiosString); + + This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + } + else + This->lpDevModeOnInit = NULL; + + This->lpSelDevMode = This->lpDevModeOnInit; +} + +static LONG +ApplyDisplayAdapterChanges(PDESKDISPLAYADAPTER This) +{ + LONG lChangeRet; + + if (This->DeskExtInterface != NULL) + { + /* Change the display settings through desk.cpl */ + lChangeRet = DeskCplExtDisplaySaveSettings(This->DeskExtInterface, + This->hwndDlg); + if (lChangeRet == DISP_CHANGE_SUCCESSFUL) + { + /* Save the new mode */ + This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); + return PSNRET_NOERROR; + } + else if (lChangeRet == DISP_CHANGE_RESTART) + { + /* Notify desk.cpl that the user needs to reboot */ + PropSheet_RestartWindows(GetParent(This->hwndDlg)); + return PSNRET_NOERROR; + } + } + + return PSNRET_INVALID_NOCHANGEPAGE; +} + +static VOID +ResetDisplayAdapterChanges(PDESKDISPLAYADAPTER This) +{ + if (This->DeskExtInterface != NULL && This->lpDevModeOnInit != NULL) + { + This->DeskExtInterface->SetCurrentMode(This->DeskExtInterface->Context, + This->lpDevModeOnInit); } } @@ -315,6 +411,27 @@ } break; + + case WM_NOTIFY: + { + NMHDR *nmh = (NMHDR *)lParam; + + switch (nmh->code) + { + case PSN_APPLY: + { + SetWindowLong(hwndDlg, + DWL_MSGRESULT, + ApplyDisplayAdapterChanges(This)); + break; + } + + case PSN_RESET: + ResetDisplayAdapterChanges(This); + break; + } + break; + } } return Ret; Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Thu Sep 27 09:23:58 2007 @@ -12,6 +12,8 @@ PDESK_EXT_INTERFACE DeskExtInterface; IDataObject *pdtobj; LPTSTR lpDeviceId; + PDEVMODEW lpSelDevMode; + PDEVMODEW lpDevModeOnInit; } DESKDISPLAYADAPTER, *PDESKDISPLAYADAPTER; extern LONG dll_refs; @@ -54,7 +56,7 @@ LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam); -static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf3}}; +static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf9}}; ULONG __cdecl DbgPrint(PCCH Format,...); Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Thu Sep 27 09:23:58 2007 @@ -27,7 +27,7 @@ CAPTION "List All Modes" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15, WS_DISABLED + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 PUSHBUTTON "Cancel", IDCANCEL, 167, 115, 50, 15 GROUPBOX "List of valid modes", -1, 6, 7, 212, 98 LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL Modified: trunk/reactos/include/reactos/dll/desk/deskcplx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/desk/d… ============================================================================== --- trunk/reactos/include/reactos/dll/desk/deskcplx.h (original) +++ trunk/reactos/include/reactos/dll/desk/deskcplx.h Thu Sep 27 09:23:58 2007 @@ -12,7 +12,6 @@ #define DESK_EXT_DISPLAYSTATEFLAGS TEXT("Display State Flags") #define DESK_EXT_MONITORNAME TEXT("Monitor Name") #define DESK_EXT_MONITORDEVICE TEXT("Monitor Device") -#define DESK_EXT_MONITORID TEXT("Monitor ID") typedef PDEVMODEW (DESK_EXT_CALLBACK *PDESK_EXT_ENUMALLMODES)(PVOID Context, DWORD Index); typedef PDEVMODEW (DESK_EXT_CALLBACK *PDESK_EXT_GETCURRENTMODE)(PVOID Context); @@ -42,6 +41,8 @@ WCHAR AdapterString[128]; WCHAR BiosString[128]; } DESK_EXT_INTERFACE, *PDESK_EXT_INTERFACE; + +LONG WINAPI DisplaySaveSettings(PVOID pContext, HWND hwndPropSheet); static PDESK_EXT_INTERFACE __inline QueryDeskCplExtInterface(IDataObject *pdo) @@ -117,4 +118,32 @@ return lpStr; } +static LONG __inline +DeskCplExtDisplaySaveSettings(PDESK_EXT_INTERFACE DeskExtInterface, + HWND hwndDlg) +{ + typedef LONG (WINAPI *PDISPLAYSAVESETTINGS)(PVOID, HWND); + HMODULE hModDeskCpl; + PDISPLAYSAVESETTINGS pDisplaySaveSettings; + LONG lRet = DISP_CHANGE_BADPARAM; + + /* We could use GetModuleHandle() instead, but then this routine + wouldn't work if some other application hosts the shell extension */ + hModDeskCpl = LoadLibrary(TEXT("desk.cpl")); + if (hModDeskCpl != NULL) + { + pDisplaySaveSettings = (PDISPLAYSAVESETTINGS)GetProcAddress(hModDeskCpl, + "DisplaySaveSettings"); + if (pDisplaySaveSettings != NULL) + { + lRet = pDisplaySaveSettings(DeskExtInterface->Context, + hwndDlg); + } + + FreeLibrary(hModDeskCpl); + } + + return lRet; +} + #endif /* __DESKCPLX__H */

1 0

[weiden] 29233: Display the display adapter properties with extended pages
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 07:08:45 2007 New Revision: 29233 URL: http://svn.reactos.org/svn/reactos?rev=29233&view=rev Log: Display the display adapter properties with extended pages Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 07:08:45 2007 @@ -5,7 +5,7 @@ static HINSTANCE hInstance; -typedef INT_PTR (WINAPI *PDEVICEPROPERTIESEXW)(HWND,LPCWSTR,LPCWSTR,DWORD,BOOL); +typedef INT_PTR (WINAPI *PDEVICEPROPERTIESW)(HWND,LPCWSTR,LPCWSTR,BOOL); static VOID GetColorDescription(PDEVMODEW lpDevMode, @@ -214,20 +214,19 @@ ShowAdapterProperties(PDESKDISPLAYADAPTER This) { HMODULE hDevMgr; - PDEVICEPROPERTIESEXW pDevicePropertiesExW; + PDEVICEPROPERTIESW pDevicePropertiesW; hDevMgr = LoadLibrary(TEXT("devmgr.dll")); if (hDevMgr != NULL) { - pDevicePropertiesExW = (PDEVICEPROPERTIESEXW)GetProcAddress(hDevMgr, - "DevicePropertiesExW"); - if (pDevicePropertiesExW != NULL) + pDevicePropertiesW = (PDEVICEPROPERTIESW)GetProcAddress(hDevMgr, + "DevicePropertiesW"); + if (pDevicePropertiesW != NULL) { - pDevicePropertiesExW(This->hwndDlg, - NULL, - This->lpDeviceId, - 0, - FALSE); + pDevicePropertiesW(This->hwndDlg, + NULL, + This->lpDeviceId, + FALSE); } FreeLibrary(hDevMgr);

1 0

[weiden] 29232: Fix implementation of DevicePropertiesA/W to show extended pages
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 07:04:52 2007 New Revision: 29232 URL: http://svn.reactos.org/svn/reactos?rev=29232&view=rev Log: Fix implementation of DevicePropertiesA/W to show extended pages Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/include/reactos/dll/devmgr/devmgr.h Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c Thu Sep 27 07:04:52 2007 @@ -1813,10 +1813,10 @@ { INT_PTR Ret = -1; - if (dwFlags & ~(DPF_UNKNOWN | DPF_DEVICE_STATUS_ACTION)) + if (dwFlags & ~(DPF_EXTENDED | DPF_DEVICE_STATUS_ACTION)) { DPRINT1("DevPropertiesExW: Invalid flags: 0x%x\n", - dwFlags & ~(DPF_UNKNOWN | DPF_DEVICE_STATUS_ACTION)); + dwFlags & ~(DPF_EXTENDED | DPF_DEVICE_STATUS_ACTION)); SetLastError(ERROR_INVALID_FLAGS); return -1; } @@ -1907,7 +1907,7 @@ return DevicePropertiesExA(hWndParent, lpMachineName, lpDeviceID, - 0, + DPF_EXTENDED, bShowDevMgr); } @@ -1944,7 +1944,7 @@ return DevicePropertiesExW(hWndParent, lpMachineName, lpDeviceID, - 0, + DPF_EXTENDED, bShowDevMgr); } Modified: trunk/reactos/include/reactos/dll/devmgr/devmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/devmgr… ============================================================================== --- trunk/reactos/include/reactos/dll/devmgr/devmgr.h (original) +++ trunk/reactos/include/reactos/dll/devmgr/devmgr.h Thu Sep 27 07:04:52 2007 @@ -137,7 +137,7 @@ IN UINT uNumberOfGuids, IN HWPAGE_DISPLAYMODE DisplayMode); -#define DPF_UNKNOWN (0x1) +#define DPF_EXTENDED (0x1) #define DPF_DEVICE_STATUS_ACTION (0x2) INT_PTR

1 0

[weiden] 29231: Implement DevicePropertiesA/W by calling DevicePropertiesExA/W and move function prototypes to a private header
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 06:49:31 2007 New Revision: 29231 URL: http://svn.reactos.org/svn/reactos?rev=29231&view=rev Log: Implement DevicePropertiesA/W by calling DevicePropertiesExA/W and move function prototypes to a private header Added: trunk/reactos/include/reactos/dll/devmgr/ trunk/reactos/include/reactos/dll/devmgr/devmgr.h (with props) Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/devmgr.spec trunk/reactos/dll/win32/devmgr/precomp.h trunk/reactos/dll/win32/devmgr/stubs.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c Thu Sep 27 06:49:31 2007 @@ -1877,6 +1877,80 @@ /*************************************************************************** * NAME EXPORTED + * DevicePropertiesA + * + * DESCRIPTION + * Invokes the device properties dialog directly + * + * ARGUMENTS + * hWndParent: Handle to the parent window + * lpMachineName: Machine Name, NULL is the local machine + * lpDeviceID: Specifies the device whose properties are to be shown + * bShowDevMgr: If non-zero it displays the device manager instead of + * the device property dialog + * + * RETURN VALUE + * >=0: if no errors occured + * -1: if errors occured + * + * REVISIONS + * + * @implemented + */ +int +WINAPI +DevicePropertiesA(HWND hWndParent, + LPCSTR lpMachineName, + LPCSTR lpDeviceID, + BOOL bShowDevMgr) +{ + return DevicePropertiesExA(hWndParent, + lpMachineName, + lpDeviceID, + 0, + bShowDevMgr); +} + + +/*************************************************************************** + * NAME EXPORTED + * DevicePropertiesW + * + * DESCRIPTION + * Invokes the device properties dialog directly + * + * ARGUMENTS + * hWndParent: Handle to the parent window + * lpMachineName: Machine Name, NULL is the local machine + * lpDeviceID: Specifies the device whose properties are to be shown + * bShowDevMgr: If non-zero it displays the device manager instead of + * the device property dialog + * + * RETURN VALUE + * >=0: if no errors occured + * -1: if errors occured + * + * REVISIONS + * + * @implemented + */ +int +WINAPI +DevicePropertiesW(HWND hWndParent, + LPCWSTR lpMachineName, + LPCWSTR lpDeviceID, + BOOL bShowDevMgr) +{ + return DevicePropertiesExW(hWndParent, + lpMachineName, + lpDeviceID, + 0, + bShowDevMgr); +} + + +/*************************************************************************** + * NAME EXPORTED * DeviceProperties_RunDLLA * * DESCRIPTION @@ -1975,8 +2049,7 @@ } DevicePropertiesW(hWndParent, - hInst, szMachineName, szDeviceID, - 0); + FALSE); } Modified: trunk/reactos/dll/win32/devmgr/devmgr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.sp… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.spec (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.spec Thu Sep 27 06:49:31 2007 @@ -2,8 +2,8 @@ 5 stdcall DeviceProperties_RunDLLA(ptr ptr str long) 6 stdcall DeviceProperties_RunDLLW(ptr ptr wstr long) - 7 stdcall DevicePropertiesA(ptr ptr str str long) - 8 stdcall DevicePropertiesW(ptr ptr wstr wstr long) + 7 stdcall DevicePropertiesA(ptr str str long) + 8 stdcall DevicePropertiesW(ptr wstr wstr long) 9 stdcall DeviceManager_ExecuteA(ptr ptr str long) 10 stdcall DeviceManager_ExecuteW(ptr ptr wstr long) 11 stdcall DeviceProblemTextA(ptr long long str long) Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h Thu Sep 27 06:49:31 2007 @@ -6,189 +6,12 @@ #include <setupapi.h> #include <cfgmgr32.h> #include <commctrl.h> +#include <dll/devmgr/devmgr.h> #include "resource.h" extern HINSTANCE hDllInstance; ULONG DbgPrint(PCCH Format,...); - -BOOL -WINAPI -DeviceManager_ExecuteA(HWND hWndParent, - HINSTANCE hInst, - LPCSTR lpMachineName, - int nCmdShow); - -BOOL -WINAPI -DeviceManager_ExecuteW(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpMachineName, - int nCmdShow); - -VOID -WINAPI -DeviceProperties_RunDLLA(HWND hWndParent, - HINSTANCE hInst, - LPCSTR lpDeviceCmd, - int nCmdShow); - -VOID -WINAPI -DeviceProperties_RunDLLW(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpDeviceCmd, - int nCmdShow); - -int -WINAPI -DevicePropertiesA(HWND hWndParent, - HINSTANCE hInst, - LPCSTR lpMachineName, - LPCSTR lpDeviceID, - DWORD Unknown); - -int -WINAPI -DevicePropertiesW(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID, - DWORD Unknown); - -UINT -WINAPI -DeviceProblemTextA(IN HMACHINE hMachine OPTIONAL, - IN DEVINST dnDevInst, - IN ULONG uProblemId, - OUT LPSTR lpString, - IN UINT uMaxString); - -UINT -WINAPI -DeviceProblemTextW(IN HMACHINE hMachine OPTIONAL, - IN DEVINST dnDevInst, - IN ULONG uProblemId, - OUT LPWSTR lpString, - IN UINT uMaxString); - -BOOL -WINAPI -DeviceProblemWizardA(IN HWND hWndParent OPTIONAL, - IN LPCSTR lpMachineName OPTIONAL, - IN LPCSTR lpDeviceID); - - -BOOL -WINAPI -DeviceProblemWizardW(IN HWND hWndParent OPTIONAL, - IN LPCWSTR lpMachineName OPTIONAL, - IN LPCWSTR lpDeviceID); - -VOID -WINAPI -DeviceProblemWizard_RunDLLA(HWND hWndParent, - HINSTANCE hInst, - LPCSTR lpDeviceCmd, - int nCmdShow); - -VOID -WINAPI -DeviceProblemWizard_RunDLLW(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpDeviceCmd, - int nCmdShow); - -#define DEV_PRINT_ABSTRACT (0) -#define DEV_PRINT_SELECTED (1) -#define DEV_PRINT_ALL (2) - -BOOL -WINAPI -DeviceManagerPrintA(LPCSTR lpMachineName, - LPCSTR lpPrinter, - int nPrintMode, - UINT uNumberOfGuids, - LPGUID lpGuids); - -BOOL -WINAPI -DeviceManagerPrintW(LPCWSTR lpMachineName, - LPCWSTR lpPrinter, - int nPrintMode, - UINT uNumberOfGuids, - LPGUID lpGuids); - -INT_PTR -WINAPI -DeviceAdvancedPropertiesA(IN HWND hWndParent OPTIONAL, - IN LPCSTR lpMachineName OPTIONAL, - IN LPCSTR lpDeviceID); - -INT_PTR -WINAPI -DeviceAdvancedPropertiesW(IN HWND hWndParent OPTIONAL, - IN LPCWSTR lpMachineName OPTIONAL, - IN LPCWSTR lpDeviceID); - -typedef enum -{ - HWPD_STANDARDLIST = 0, - HWPD_LARGELIST, - HWPD_MAX = HWPD_LARGELIST -} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; - -HWND -WINAPI -DeviceCreateHardwarePage(HWND hWndParent, - LPGUID lpGuid); - -HWND -WINAPI -DeviceCreateHardwarePageEx(IN HWND hWndParent, - IN LPGUID lpGuids, - IN UINT uNumberOfGuids, - IN HWPAGE_DISPLAYMODE DisplayMode); - -#define DPF_UNKNOWN (0x1) -#define DPF_DEVICE_STATUS_ACTION (0x2) -INT_PTR -WINAPI -DevicePropertiesExA(IN HWND hWndParent OPTIONAL, - IN LPCSTR lpMachineName OPTIONAL, - IN LPCSTR lpDeviceID OPTIONAL, - IN DWORD dwFlags OPTIONAL, - IN BOOL bShowDevMgr); - -INT_PTR -WINAPI -DevicePropertiesExW(IN HWND hWndParent OPTIONAL, - IN LPCWSTR lpMachineName OPTIONAL, - IN LPCWSTR lpDeviceID OPTIONAL, - IN DWORD dwFlags OPTIONAL, - IN BOOL bShowDevMgr); - -#ifdef UNICODE -#define DeviceManager_Execute DeviceManager_ExecuteW -#define DeviceProperties_RunDLL DeviceProperties_RunDLLW -#define DeviceProperties DevicePropertiesW -#define DeviceProblemText DeviceProblemTextW -#define DeviceProblemWizard DeviceProblemWizardW -#define DeviceProblemWizard_RunDLL DeviceProblemWizard_RunDLLW -#define DeviceManagerPrint DeviceManagerPrintW -#define DeviceAdvancedProperties DeviceAdvancedPropertiesW -#define DevicePropertiesEx DevicePropertiesExW -#else -#define DeviceManager_Execute DeviceManager_ExecuteA -#define DeviceProperties_RunDLL DeviceProperties_RunDLLA -#define DeviceProperties DevicePropertiesA -#define DeviceProblemText DeviceProblemTextA -#define DeviceProblemWizard DeviceProblemWizardA -#define DeviceProblemWizard_RunDLL DeviceProblemWizard_RunDLLA -#define DeviceManagerPrint DeviceManagerPrintA -#define DeviceAdvancedProperties DeviceAdvancedPropertiesA -#define DevicePropertiesEx DevicePropertiesExA -#endif /* ADVPROP.C */ Modified: trunk/reactos/dll/win32/devmgr/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/devmgr/stubs.c (original) +++ trunk/reactos/dll/win32/devmgr/stubs.c Thu Sep 27 06:49:31 2007 @@ -91,82 +91,6 @@ { UNIMPLEMENTED; return FALSE; -} - - -/*************************************************************************** - * NAME EXPORTED - * DevicePropertiesA - * - * DESCRIPTION - * Invokes the device properties dialog directly - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * hInst: Handle to the application instance - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown - * Unknown: Unknown parameter, see NOTEs - * - * RETURN VALUE - * >=0: if no errors occured - * -1: if errors occured - * - * REVISIONS - * - * NOTE - * Unknown seems to be a BOOL, not sure what it does - * - * @unimplemented - */ -int -WINAPI -DevicePropertiesA(HWND hWndParent, - HINSTANCE hInst, - LPCSTR lpMachineName, - LPCSTR lpDeviceID, - DWORD Unknown) -{ - UNIMPLEMENTED; - return -1; -} - - -/*************************************************************************** - * NAME EXPORTED - * DevicePropertiesW - * - * DESCRIPTION - * Invokes the device properties dialog directly - * - * ARGUMENTS - * hWndParent: Handle to the parent window - * hInst: Handle to the application instance - * lpMachineName: Machine Name, NULL is the local machine - * lpDeviceID: Specifies the device whose properties are to be shown - * Unknown: Unknown parameter, see NOTEs - * - * RETURN VALUE - * >=0: if no errors occured - * -1: if errors occured - * - * REVISIONS - * - * NOTE - * Unknown seems to be a BOOL, not sure what it does - * - * @unimplemented - */ -int -WINAPI -DevicePropertiesW(HWND hWndParent, - HINSTANCE hInst, - LPCWSTR lpMachineName, - LPCWSTR lpDeviceID, - DWORD Unknown) -{ - UNIMPLEMENTED; - return -1; } Added: trunk/reactos/include/reactos/dll/devmgr/devmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/dll/devmgr… ============================================================================== --- trunk/reactos/include/reactos/dll/devmgr/devmgr.h (added) +++ trunk/reactos/include/reactos/dll/devmgr/devmgr.h Thu Sep 27 06:49:31 2007 @@ -1,0 +1,181 @@ +#ifndef __DEVMGR__H +#define __DEVMGR__H + +BOOL +WINAPI +DeviceManager_ExecuteA(HWND hWndParent, + HINSTANCE hInst, + LPCSTR lpMachineName, + int nCmdShow); + +BOOL +WINAPI +DeviceManager_ExecuteW(HWND hWndParent, + HINSTANCE hInst, + LPCWSTR lpMachineName, + int nCmdShow); + +VOID +WINAPI +DeviceProperties_RunDLLA(HWND hWndParent, + HINSTANCE hInst, + LPCSTR lpDeviceCmd, + int nCmdShow); + +VOID +WINAPI +DeviceProperties_RunDLLW(HWND hWndParent, + HINSTANCE hInst, + LPCWSTR lpDeviceCmd, + int nCmdShow); + +int +WINAPI +DevicePropertiesA(HWND hWndParent, + LPCSTR lpMachineName, + LPCSTR lpDeviceID, + BOOL bShowDevMgr); + +int +WINAPI +DevicePropertiesW(HWND hWndParent, + LPCWSTR lpMachineName, + LPCWSTR lpDeviceID, + BOOL bShowDevMgr); + +UINT +WINAPI +DeviceProblemTextA(IN HMACHINE hMachine OPTIONAL, + IN DEVINST dnDevInst, + IN ULONG uProblemId, + OUT LPSTR lpString, + IN UINT uMaxString); + +UINT +WINAPI +DeviceProblemTextW(IN HMACHINE hMachine OPTIONAL, + IN DEVINST dnDevInst, + IN ULONG uProblemId, + OUT LPWSTR lpString, + IN UINT uMaxString); + +BOOL +WINAPI +DeviceProblemWizardA(IN HWND hWndParent OPTIONAL, + IN LPCSTR lpMachineName OPTIONAL, + IN LPCSTR lpDeviceID); + + +BOOL +WINAPI +DeviceProblemWizardW(IN HWND hWndParent OPTIONAL, + IN LPCWSTR lpMachineName OPTIONAL, + IN LPCWSTR lpDeviceID); + +VOID +WINAPI +DeviceProblemWizard_RunDLLA(HWND hWndParent, + HINSTANCE hInst, + LPCSTR lpDeviceCmd, + int nCmdShow); + +VOID +WINAPI +DeviceProblemWizard_RunDLLW(HWND hWndParent, + HINSTANCE hInst, + LPCWSTR lpDeviceCmd, + int nCmdShow); + +#define DEV_PRINT_ABSTRACT (0) +#define DEV_PRINT_SELECTED (1) +#define DEV_PRINT_ALL (2) + +BOOL +WINAPI +DeviceManagerPrintA(LPCSTR lpMachineName, + LPCSTR lpPrinter, + int nPrintMode, + UINT uNumberOfGuids, + LPGUID lpGuids); + +BOOL +WINAPI +DeviceManagerPrintW(LPCWSTR lpMachineName, + LPCWSTR lpPrinter, + int nPrintMode, + UINT uNumberOfGuids, + LPGUID lpGuids); + +INT_PTR +WINAPI +DeviceAdvancedPropertiesA(IN HWND hWndParent OPTIONAL, + IN LPCSTR lpMachineName OPTIONAL, + IN LPCSTR lpDeviceID); + +INT_PTR +WINAPI +DeviceAdvancedPropertiesW(IN HWND hWndParent OPTIONAL, + IN LPCWSTR lpMachineName OPTIONAL, + IN LPCWSTR lpDeviceID); + +typedef enum +{ + HWPD_STANDARDLIST = 0, + HWPD_LARGELIST, + HWPD_MAX = HWPD_LARGELIST +} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; + +HWND +WINAPI +DeviceCreateHardwarePage(HWND hWndParent, + LPGUID lpGuid); + +HWND +WINAPI +DeviceCreateHardwarePageEx(IN HWND hWndParent, + IN LPGUID lpGuids, + IN UINT uNumberOfGuids, + IN HWPAGE_DISPLAYMODE DisplayMode); + +#define DPF_UNKNOWN (0x1) +#define DPF_DEVICE_STATUS_ACTION (0x2) + +INT_PTR +WINAPI +DevicePropertiesExA(IN HWND hWndParent OPTIONAL, + IN LPCSTR lpMachineName OPTIONAL, + IN LPCSTR lpDeviceID OPTIONAL, + IN DWORD dwFlags OPTIONAL, + IN BOOL bShowDevMgr); + +INT_PTR +WINAPI +DevicePropertiesExW(IN HWND hWndParent OPTIONAL, + IN LPCWSTR lpMachineName OPTIONAL, + IN LPCWSTR lpDeviceID OPTIONAL, + IN DWORD dwFlags OPTIONAL, + IN BOOL bShowDevMgr); + +#ifdef UNICODE +#define DeviceManager_Execute DeviceManager_ExecuteW +#define DeviceProperties_RunDLL DeviceProperties_RunDLLW +#define DeviceProperties DevicePropertiesW +#define DeviceProblemText DeviceProblemTextW +#define DeviceProblemWizard DeviceProblemWizardW +#define DeviceProblemWizard_RunDLL DeviceProblemWizard_RunDLLW +#define DeviceManagerPrint DeviceManagerPrintW +#define DeviceAdvancedProperties DeviceAdvancedPropertiesW +#define DevicePropertiesEx DevicePropertiesExW +#else +#define DeviceManager_Execute DeviceManager_ExecuteA +#define DeviceProperties_RunDLL DeviceProperties_RunDLLA +#define DeviceProperties DevicePropertiesA +#define DeviceProblemText DeviceProblemTextA +#define DeviceProblemWizard DeviceProblemWizardA +#define DeviceProblemWizard_RunDLL DeviceProblemWizard_RunDLLA +#define DeviceManagerPrint DeviceManagerPrintA +#define DeviceAdvancedProperties DeviceAdvancedPropertiesA +#define DevicePropertiesEx DevicePropertiesExA +#endif + +#endif /* __DEVMGR__H */ Propchange: trunk/reactos/include/reactos/dll/devmgr/devmgr.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[weiden] 29230: Don't show prefix in labels filled with hardware information
by weiden＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: weiden Date: Thu Sep 27 06:05:23 2007 New Revision: 29230 URL: http://svn.reactos.org/svn/reactos?rev=29230&view=rev Log: Don't show prefix in labels filled with hardware information Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Thu Sep 27 06:05:23 2007 @@ -6,19 +6,19 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Adapter Type", -1, 7, 3, 237, 50 - LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX PUSHBUTTON "&Properties", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 GROUPBOX "Adapter Information", -1, 7, 56, 237, 75 LTEXT "Chip Type:", -1, 13, 68, 58, 8 - LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX LTEXT "DAC Type:", -1, 13, 80, 58, 8 - LTEXT "", IDC_DACTYPE, 71, 80, 160, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX LTEXT "Memory Size:", -1, 13, 92, 58, 8 - LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX LTEXT "Adapter String:", -1, 13, 104, 58, 8 - LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX LTEXT "BIOS Information:", -1, 13, 116, 58, 8 - LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX PUSHBUTTON "&List All Modes...", IDC_LISTALLMODES, 7, 139, 75, 14 END

1 0

[tkreuzer] 29229: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2696 for more details.
by tkreuzer＠svn.reactos.org 27 Sep '07

27 Sep '07

Author: tkreuzer Date: Thu Sep 27 04:25:42 2007 New Revision: 29229 URL: http://svn.reactos.org/svn/reactos?rev=29229&view=rev Log: Ukrainian translations by Artem Reznikov (temarez AT yandex DOT ru) See issue #2696 for more details. Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc Thu Sep 27 04:25:42 2007 @@ -77,7 +77,7 @@ IDD_PAGE_POINTER DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Âêàç³âíèê" +CAPTION "Âêàç³âíèêè" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ñõåìà", -1, 5, 5, 170, 45 @@ -85,7 +85,7 @@ PUSHBUTTON "Çáåðåãòè &ÿê...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "Â&èäàëèòè", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE - LTEXT "&Íàëàøòóâàííÿ", -1, 5, 60, 40, 10 + LTEXT "&Íàñòðîéêà", -1, 5, 60, 40, 10 LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Ââ³ìêíóòè &ò³íü âêàç³âíèêà", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "&Çà çàìîâ÷óâàííÿì", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 @@ -135,7 +135,7 @@ IDD_PAGE_WHEEL DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Êîëèñ÷àòêî" +CAPTION "Êîë³ùàòêî" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Ïðîêðóòêà", -1, 5, 5, 230, 80 @@ -168,7 +168,7 @@ IDS_SIZEALL "Ïåðåì³ùåííÿ" IDS_UPARROW "Ñïåö³àëüíå âèä³ëåííÿ" IDS_HAND "Âèá³ð ïîñèëàííÿ" - IDS_NONE "(Íåìàº)" + IDS_NONE "(íåìàº)" IDS_SYSTEM_SCHEME "(ñèñòåìíà ñõåìà)" IDS_BROWSE_FILTER "Âêàç³âíèêè (*.ani, *.cur)\0*.ani;*.cur\0Àí³ìîâàí³ âêàç³âíèêè (*.ani)\0*.ani\0Çâè÷àéí³ âêàç³âíèêè (*.cur)\0*.cur\0Óñ³ ôàéëè\0*.*\0\0" IDS_BROWSE_TITLE "Îãëÿä" Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc Thu Sep 27 04:25:42 2007 @@ -32,7 +32,7 @@ IDD_SOUNDS DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Çâóêîâèé ñóïðîâ³ä ïîä³é" +CAPTION "Çâóêè" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Çâóêîâà ñõåìà âèçíà÷àº çâóêè, ÿê³ ñóïðîâîäæóþòü ïîä³¿ â ñèñòåì³ ReactOS ³ ó ïðîãðàìàõ. Ìîæíà âèáðàòè îäíó ç íàÿâíèõ ñõåì àáî ñòâîðèòè íîâó.",-1,8,7,230,40 @@ -107,8 +107,9 @@ BEGIN IDS_CPLNAME "Çâóêîâ³ ³ àóä³î ïðèñòðî¿" IDS_CPLDESCRIPTION "Çì³íà çâóêîâèõ ñõåì âàøîãî êîìï'þòåðà, íàñòðîþâàííÿ êîëîíîê ³ çàïèñóþ÷èõ ïðèñòðî¿â." - IDS_NO_SOUND "(None)" + IDS_NO_SOUND "(íåìàº)" END + Modified: trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/uk-U… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc Thu Sep 27 04:25:42 2007 @@ -157,7 +157,7 @@ IDS_TIMEOUT7 "÷åðåç 20 õâ" IDS_TIMEOUT8 "÷åðåç 25 õâ" IDS_TIMEOUT9 "÷åðåç 30 õâ" - IDS_TIMEOUT10 "÷åðåç 45 mins" + IDS_TIMEOUT10 "÷åðåç 45 õâ" IDS_TIMEOUT11 "÷åðåç 1 ãîäèíó" IDS_TIMEOUT12 "÷åðåç 2 ãîäèíè" IDS_TIMEOUT13 "÷åðåç 3 ãîäèíè" @@ -166,3 +166,4 @@ IDS_TIMEOUT16 "í³êîëè" END +

1 0

[weiden] 29228: Select currently selected mode by default
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 03:37:09 2007 New Revision: 29228 URL: http://svn.reactos.org/svn/reactos?rev=29228&view=rev Log: Select currently selected mode by default Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 03:37:09 2007 @@ -85,7 +85,7 @@ HWND hwndListAllModesDlg) { TCHAR szFormat[64], szBuffer[64], szColors[64], szRefreshRate[64]; - PDEVMODEW lpDevMode; + PDEVMODEW lpDevMode, lpCurrentDevMode; DWORD dwIndex = 0; INT i; @@ -98,6 +98,8 @@ { szFormat[0] = TEXT('\0'); } + + lpCurrentDevMode = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context); do { @@ -133,6 +135,15 @@ LB_SETITEMDATA, (WPARAM)i, (LPARAM)lpDevMode); + + if (lpDevMode == lpCurrentDevMode) + { + SendDlgItemMessage(hwndListAllModesDlg, + IDC_ALLVALIDMODES, + LB_SETCURSEL, + (WPARAM)i, + 0); + } } } @@ -300,7 +311,6 @@ break; case IDC_LISTALLMODES: - MessageBox(hwndDlg, _T("Bla"), NULL, 0); ShowListAllModes(This); break; }

1 0

[weiden] 29227: Fix compilation error
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 03:17:48 2007 New Revision: 29227 URL: http://svn.reactos.org/svn/reactos?rev=29227&view=rev Log: Fix compilation error Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 03:17:48 2007 @@ -129,7 +129,7 @@ if (i >= 0) { SendDlgItemMessage(hwndListAllModesDlg, - IDC_ALLVALIDMODES. + IDC_ALLVALIDMODES, LB_SETITEMDATA, (WPARAM)i, (LPARAM)lpDevMode);

1 0

[weiden] 29226: Fix CLSID (accidently committed a change for testing purpose)
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 03:15:42 2007 New Revision: 29226 URL: http://svn.reactos.org/svn/reactos?rev=29226&view=rev Log: Fix CLSID (accidently committed a change for testing purpose) Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Thu Sep 27 03:15:42 2007 @@ -54,7 +54,7 @@ LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam); -static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf9}}; +static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf3}}; ULONG __cdecl DbgPrint(PCCH Format,...);

1 0

[weiden] 29225: Implement the "List all modes" dialog, read-only for now
by weiden＠svn.reactos.org 26 Sep '07

26 Sep '07

Author: weiden Date: Thu Sep 27 03:10:41 2007 New Revision: 29225 URL: http://svn.reactos.org/svn/reactos?rev=29225&view=rev Log: Implement the "List all modes" dialog, read-only for now Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c trunk/reactos/dll/win32/shellext/deskadp/deskadp.h trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc trunk/reactos/dll/win32/shellext/deskadp/precomp.h trunk/reactos/dll/win32/shellext/deskadp/resource.h Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.c (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.c Thu Sep 27 03:10:41 2007 @@ -6,6 +6,198 @@ static HINSTANCE hInstance; typedef INT_PTR (WINAPI *PDEVICEPROPERTIESEXW)(HWND,LPCWSTR,LPCWSTR,DWORD,BOOL); + +static VOID +GetColorDescription(PDEVMODEW lpDevMode, + LPTSTR lpBuffer, + DWORD dwBufferLen) +{ + UINT uid = 0; + + switch (lpDevMode->dmBitsPerPel) + { + case 4: + uid = IDS_4BPP; + break; + case 8: + uid = IDS_8BPP; + break; + case 15: + uid = IDS_15BPP; + break; + case 16: + uid = IDS_16BPP; + break; + case 24: + uid = IDS_24BPP; + break; + case 32: + uid = IDS_32BPP; + break; + } + + if (uid == 0 || + !LoadString(hInstance, + uid, + lpBuffer, + dwBufferLen)) + { + lpBuffer[0] = TEXT('\0'); + } +} + +static VOID +GetRefreshRateDescription(PDEVMODEW lpDevMode, + LPTSTR lpBuffer, + DWORD dwBufferLen) +{ + TCHAR szFormat[64]; + + if (lpDevMode->dmDisplayFrequency <= 1) + { + if (!LoadString(hInstance, + IDS_DEFREFRESHRATE, + lpBuffer, + dwBufferLen)) + { + lpBuffer[0] = TEXT('\0'); + } + } + else + { + if (!LoadString(hInstance, + IDES_REFRESHRATEFMT, + szFormat, + sizeof(szFormat) / sizeof(szFormat[0]))) + { + szFormat[0] = TEXT('\0'); + } + + _sntprintf(lpBuffer, + dwBufferLen, + szFormat, + lpDevMode->dmDisplayFrequency); + } +} + +static VOID +InitListAllModesDialog(PDESKDISPLAYADAPTER This, + HWND hwndListAllModesDlg) +{ + TCHAR szFormat[64], szBuffer[64], szColors[64], szRefreshRate[64]; + PDEVMODEW lpDevMode; + DWORD dwIndex = 0; + INT i; + + if (This->DeskExtInterface != NULL) + { + if (!LoadString(hInstance, + IDS_MODEFMT, + szFormat, + sizeof(szFormat) / sizeof(szFormat[0]))) + { + szFormat[0] = TEXT('\0'); + } + + do + { + lpDevMode = This->DeskExtInterface->EnumAllModes(This->DeskExtInterface->Context, + dwIndex++); + if (lpDevMode != NULL) + { + GetColorDescription(lpDevMode, + szColors, + sizeof(szColors) / sizeof(szColors[0])); + + GetRefreshRateDescription(lpDevMode, + szRefreshRate, + sizeof(szRefreshRate) / sizeof(szRefreshRate[0])); + + _sntprintf(szBuffer, + sizeof(szBuffer) / sizeof(szBuffer[0]), + szFormat, + lpDevMode->dmPelsWidth, + lpDevMode->dmPelsHeight, + szColors, + szRefreshRate); + + i = (INT)SendDlgItemMessage(hwndListAllModesDlg, + IDC_ALLVALIDMODES, + LB_ADDSTRING, + 0, + (LPARAM)szBuffer); + if (i >= 0) + { + SendDlgItemMessage(hwndListAllModesDlg, + IDC_ALLVALIDMODES. + LB_SETITEMDATA, + (WPARAM)i, + (LPARAM)lpDevMode); + } + } + + } while (lpDevMode != NULL); + } +} + +static INT_PTR CALLBACK +ListAllModesDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PDESKDISPLAYADAPTER This; + INT_PTR Ret = 0; + + if (uMsg != WM_INITDIALOG) + { + This = (PDESKDISPLAYADAPTER)GetWindowLongPtr(hwndDlg, + DWL_USER); + } + + switch (uMsg) + { + case WM_INITDIALOG: + This = (PDESKDISPLAYADAPTER)lParam; + SetWindowLongPtr(hwndDlg, + DWL_USER, + (LONG_PTR)This); + + InitListAllModesDialog(This, + hwndDlg); + Ret = TRUE; + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + break; + case IDCANCEL: + EndDialog(hwndDlg, + IDCANCEL); + break; + } + break; + + case WM_CLOSE: + EndDialog(hwndDlg, + IDCANCEL); + break; + } + + return Ret; +} + +static VOID +ShowListAllModes(PDESKDISPLAYADAPTER This) +{ + DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_LISTALLMODES), + This->hwndDlg, + ListAllModesDlgProc, + (LPARAM)This); +} static VOID ShowAdapterProperties(PDESKDISPLAYADAPTER This) @@ -106,6 +298,11 @@ case IDC_ADAPTERPROPERTIES: ShowAdapterProperties(This); break; + + case IDC_LISTALLMODES: + MessageBox(hwndDlg, _T("Bla"), NULL, 0); + ShowListAllModes(This); + break; } break; Modified: trunk/reactos/dll/win32/shellext/deskadp/deskadp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/deskadp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/deskadp.h Thu Sep 27 03:10:41 2007 @@ -54,7 +54,7 @@ LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam); -static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf3}}; +static const GUID CLSID_IDeskDisplayAdapter = {0x42071712,0x76d4,0x11d1,{0x8b,0x24,0x00,0xa0,0xc9,0x06,0x8f,0xf9}}; ULONG __cdecl DbgPrint(PCCH Format,...); Modified: trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/en-US.rc Thu Sep 27 03:10:41 2007 @@ -19,5 +19,30 @@ LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8 LTEXT "BIOS Information:", -1, 13, 116, 58, 8 LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8 + PUSHBUTTON "&List All Modes...", IDC_LISTALLMODES, 7, 139, 75, 14 END +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "List All Modes" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15, WS_DISABLED + PUSHBUTTON "Cancel", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "List of valid modes", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d by %d, %s, %s" + IDS_DEFREFRESHRATE "Default Refresh" + IDES_REFRESHRATEFMT "%d Hertz" + IDS_4BPP "16 Colors" + IDS_8BPP "256 Colors" + IDS_15BPP "High Color (15 bit)" + IDS_16BPP "High Color (16 bit)" + IDS_24BPP "True Color (24 bit)" + IDS_32BPP "True Color (32 bit)" +END + Modified: trunk/reactos/dll/win32/shellext/deskadp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/precomp.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/precomp.h Thu Sep 27 03:10:41 2007 @@ -4,6 +4,7 @@ #define COBJMACROS #include <windows.h> #include <tchar.h> +#include <stdio.h> #include <shlobj.h> #include <dll/desk/deskcplx.h> #include "deskadp.h" Modified: trunk/reactos/dll/win32/shellext/deskadp/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/resource.h (original) +++ trunk/reactos/dll/win32/shellext/deskadp/resource.h Thu Sep 27 03:10:41 2007 @@ -2,6 +2,7 @@ #define __RESOURCE__H #define IDD_DISPLAYADAPTER 100 +#define IDD_LISTALLMODES 101 #define IDC_ADAPTERNAME 201 #define IDC_ADAPTERPROPERTIES 202 @@ -10,5 +11,18 @@ #define IDC_MEMORYSIZE 205 #define IDC_ADAPTERSTRING 206 #define IDC_BIOSINFORMATION 207 +#define IDC_LISTALLMODES 208 + +#define IDC_ALLVALIDMODES 301 + +#define IDS_MODEFMT 101 +#define IDS_DEFREFRESHRATE 102 +#define IDES_REFRESHRATEFMT 103 +#define IDS_4BPP 104 +#define IDS_8BPP 105 +#define IDS_15BPP 106 +#define IDS_16BPP 107 +#define IDS_24BPP 108 +#define IDS_32BPP 109 #endif /* __RESOURCE__H */

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