Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:23:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMICONTROL] Avoid (DLGPROC) cast (#5693)

Browse source 
Yes, might slightly improve with x64,
but that wasn't even my main motivation.
(DLGPROC)-casts are nonsense even for x86 actually.
This commit is contained in:
Joachim Henze 2023-09-17 19:47:23 +02:00 • committed by GitHub
parent fd626dc163
commit 806da4421c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp
View file

@ -210,7 +210,6 @@ BOOL playTestTone()
return TRUE; return TRUE;
} }
BOOL CALLBACK DSEnumProc(LPGUID lpGUID, LPCTSTR lpszDesc, LPCTSTR lpszDrvName, LPVOID lpContext) BOOL CALLBACK DSEnumProc(LPGUID lpGUID, LPCTSTR lpszDesc, LPCTSTR lpszDrvName, LPVOID lpContext)
{ {
LPGUID* pGUID = (LPGUID*)lpContext; LPGUID* pGUID = (LPGUID*)lpContext;
@ -312,7 +311,6 @@ BOOL setCurrentChannelConfig()
LocalFree(guid); LocalFree(guid);
} }
return FALSE; return FALSE;
} }
@ -414,7 +412,6 @@ BOOL getDeviceInterfaceDetail(const GUID* category, CMIDEV* pDev)
} }
return TRUE; return TRUE;
} }
BOOL getDriverData(CMIDEV* pDev) BOOL getDriverData(CMIDEV* pDev)
@ -545,7 +542,6 @@ void updateChannelBoxes(HWND hWnd)
} }
} }
BOOL setDlgItems(HWND hWnd) BOOL setDlgItems(HWND hWnd)
{ {
HWND hWndItem; HWND hWndItem;
@ -626,7 +622,6 @@ BOOL setDlgItems(HWND hWnd)
SendMessage(GetDlgItem(hWndChild[0], IDC_EN_CENTER2MIC), BM_SETCHECK, (cmiData.enableCenter2Mic ? BST_CHECKED : BST_UNCHECKED), 0); SendMessage(GetDlgItem(hWndChild[0], IDC_EN_CENTER2MIC), BM_SETCHECK, (cmiData.enableCenter2Mic ? BST_CHECKED : BST_UNCHECKED), 0);
SendMessage(GetDlgItem(hWndChild[0], IDC_NOROUTE_MIC), BM_SETCHECK, (!cmiData.enableCenter2Mic ? BST_CHECKED : BST_UNCHECKED), 0); SendMessage(GetDlgItem(hWndChild[0], IDC_NOROUTE_MIC), BM_SETCHECK, (!cmiData.enableCenter2Mic ? BST_CHECKED : BST_UNCHECKED), 0);
return TRUE; return TRUE;
} }
@ -687,7 +682,7 @@ BOOL initDialog(HWND hWnd)
PrintLastError("TabCtrl_InsertItem()"); PrintLastError("TabCtrl_InsertItem()");
return FALSE; return FALSE;
} }
hWndChild[i] = CreateDialogParam(hInst, MAKEINTRESOURCE(tabsResource[i]), hWndTab, (DLGPROC)TabDlgProc, 0); hWndChild[i] = CreateDialogParam(hInst, MAKEINTRESOURCE(tabsResource[i]), hWndTab, TabDlgProc, 0);
} }
hURLFont = CreateFont(20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, VARIABLE_PITCH | FF_SWISS, "MS Shell Dlg"); hURLFont = CreateFont(20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, VARIABLE_PITCH | FF_SWISS, "MS Shell Dlg");
@ -753,7 +748,7 @@ void openURL(int control)
ShellExecute(hWndMain, "open", buffer, NULL, NULL, SW_SHOWNORMAL); ShellExecute(hWndMain, "open", buffer, NULL, NULL, SW_SHOWNORMAL);
} }
LRESULT CALLBACK TabDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK TabDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
{ {
switch(msg) { switch(msg) {
case WM_COMMAND: case WM_COMMAND:
@ -777,7 +772,7 @@ LRESULT CALLBACK TabDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
if ( (GetDlgItem(hWndChild[3], IDC_URL1) == (HANDLE)lParam) || (GetDlgItem(hWndChild[3], IDC_URL2) == (HANDLE)lParam) ) { if ( (GetDlgItem(hWndChild[3], IDC_URL1) == (HANDLE)lParam) || (GetDlgItem(hWndChild[3], IDC_URL2) == (HANDLE)lParam) ) {
SetTextColor((HDC)wParam, 0xFF0000); SetTextColor((HDC)wParam, 0xFF0000);
SetBkMode((HDC)wParam, TRANSPARENT); SetBkMode((HDC)wParam, TRANSPARENT);
return (LRESULT)GetSysColorBrush(COLOR_BTNFACE); return (INT_PTR)GetSysColorBrush(COLOR_BTNFACE);
} }
} }
@ -823,7 +818,6 @@ void deleteDriverFiles() {
} }
} }
void performUninstall() { void performUninstall() {
deleteDriverFiles(); deleteDriverFiles();
RegDeleteKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\CMIDriver"); RegDeleteKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\CMIDriver");
@ -931,7 +925,6 @@ void InitURLControl()
if (RegisterClassEx(&wce) == 0) { if (RegisterClassEx(&wce) == 0) {
PrintLastError("RegisterClassEx()"); PrintLastError("RegisterClassEx()");
} }
} }
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow) int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR szCmdLine, int iCmdShow)

3
drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h
View file

@ -64,10 +64,9 @@ typedef struct _CMIDEV {
HDEVINFO Info; HDEVINFO Info;
SP_DEVINFO_DATA InfoData; SP_DEVINFO_DATA InfoData;
PSP_DEVICE_INTERFACE_DETAIL_DATA InterfaceDetailData; PSP_DEVICE_INTERFACE_DETAIL_DATA InterfaceDetailData;
} CMIDEV; } CMIDEV;
static LRESULT CALLBACK TabDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); static INT_PTR CALLBACK TabDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
HINSTANCE hInst; HINSTANCE hInst;
HWND hWndMain; HWND hWndMain;