Reactos

[DXDIAG] Rename WIDTH, HEIGHT, InitListViewColumns and SetDeviceDetails. Zap WindowProc. #179

+19 -25
+15 -21
base/applications/dxdiag/ddtest.c
··· 13 13 BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen); 14 14 VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface); 15 15 VOID DDUpdateFrame(LPDIRECTDRAWSURFACE lpDDPrimarySurface ,LPDIRECTDRAWSURFACE lpDDBackBuffer, BOOL Fullscreen, INT *posX, INT *posY, INT *gainX, INT *gainY, RECT *rectDD); 16 - static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); 17 16 18 17 #define TEST_DURATION 10000 19 - #define WIDTH 640 20 - #define HEIGHT 480 18 + #define DD_TEST_WIDTH 640 19 + #define DD_TEST_HEIGHT 480 21 20 #define DD_TEST_STEP 5 22 21 #define DD_SQUARE_SIZE 100 23 22 #define DD_SQUARE_STEP 2 ··· 79 78 80 79 winClass.cbSize = sizeof(WNDCLASSEX); 81 80 winClass.style = CS_DBLCLKS | CS_OWNDC | CS_HREDRAW | CS_VREDRAW; 82 - winClass.lpfnWndProc = WindowProc; 81 + winClass.lpfnWndProc = DefWindowProc; 83 82 winClass.cbClsExtra = 0; 84 83 winClass.cbWndExtra = 0; 85 84 winClass.hInstance = hInstance; ··· 94 93 return; 95 94 96 95 hWnd = CreateWindowEx(0, winClass.lpszClassName, NULL,WS_POPUP, 97 - (GetSystemMetrics(SM_CXSCREEN) - WIDTH)/2, 98 - (GetSystemMetrics(SM_CYSCREEN) - HEIGHT)/2, 99 - WIDTH, HEIGHT, NULL, NULL, hInstance, NULL); 96 + (GetSystemMetrics(SM_CXSCREEN) - DD_TEST_WIDTH)/2, 97 + (GetSystemMetrics(SM_CYSCREEN) - DD_TEST_HEIGHT)/2, 98 + DD_TEST_WIDTH, DD_TEST_HEIGHT, NULL, NULL, hInstance, NULL); 100 99 101 100 if (!hWnd){ 102 101 return; ··· 176 175 HBRUSH BlackBrush, WhiteBrush; 177 176 BOOL Colour = FALSE; 178 177 179 - rct.left = (GetSystemMetrics(SM_CXSCREEN) - WIDTH)/2; 180 - rct.right = (GetSystemMetrics(SM_CXSCREEN) - WIDTH)/2 + WIDTH; 181 - rct.top = (GetSystemMetrics(SM_CYSCREEN) - HEIGHT)/2; 182 - rct.bottom = (GetSystemMetrics(SM_CYSCREEN) - HEIGHT)/2 + HEIGHT; 178 + rct.left = (GetSystemMetrics(SM_CXSCREEN) - DD_TEST_WIDTH)/2; 179 + rct.right = (GetSystemMetrics(SM_CXSCREEN) - DD_TEST_WIDTH)/2 + DD_TEST_WIDTH; 180 + rct.top = (GetSystemMetrics(SM_CYSCREEN) - DD_TEST_HEIGHT)/2; 181 + rct.bottom = (GetSystemMetrics(SM_CYSCREEN) - DD_TEST_HEIGHT)/2 + DD_TEST_HEIGHT; 183 182 184 183 BlackBrush = CreateSolidBrush(RGB(0,0,0)); 185 184 WhiteBrush = CreateSolidBrush(RGB(255,255,255)); ··· 225 224 lpDD->lpVtbl->Release(lpDD); 226 225 return FALSE; 227 226 } 228 - if(lpDD->lpVtbl->SetDisplayMode(lpDD, WIDTH, HEIGHT, 32) != DD_OK) 227 + if(lpDD->lpVtbl->SetDisplayMode(lpDD, DD_TEST_WIDTH, DD_TEST_HEIGHT, 32) != DD_OK) 229 228 { 230 229 lpDD->lpVtbl->Release(lpDD); 231 230 return FALSE; ··· 268 267 ZeroMemory(&DDBBSurfaceDesc,sizeof(DDBBSurfaceDesc)); 269 268 DDBBSurfaceDesc.dwSize = sizeof(DDBBSurfaceDesc); 270 269 DDBBSurfaceDesc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; 271 - DDBBSurfaceDesc.dwHeight = HEIGHT; 272 - DDBBSurfaceDesc.dwWidth = WIDTH; 270 + DDBBSurfaceDesc.dwHeight = DD_TEST_HEIGHT; 271 + DDBBSurfaceDesc.dwWidth = DD_TEST_WIDTH; 273 272 DDBBSurfaceDesc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; 274 273 275 274 if(lpDD->lpVtbl->CreateSurface(lpDD, &DDBBSurfaceDesc, &lpDDBackBuffer, NULL) != DD_OK) ··· 345 344 WhiteBrush = CreateSolidBrush(RGB(255,255,255)); 346 345 FillRect(hdc, &rct, WhiteBrush); 347 346 348 - if(*posX >= (WIDTH - DD_SQUARE_SIZE)) *gainX = -(*gainX); 349 - if(*posY >= (HEIGHT - DD_SQUARE_SIZE)) *gainY = -(*gainY); 347 + if(*posX >= (DD_TEST_WIDTH - DD_SQUARE_SIZE)) *gainX = -(*gainX); 348 + if(*posY >= (DD_TEST_HEIGHT - DD_SQUARE_SIZE)) *gainY = -(*gainY); 350 349 if(*posX < 0) *gainX = -1*(*gainX); 351 350 if(*posY < 0) *gainY = -1*(*gainY); 352 351 ··· 365 364 } 366 365 } 367 366 } 368 - 369 - static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) 370 - { 371 - return DefWindowProc(hWnd, msg, wParam, lParam); 372 - }
+2 -2
base/applications/dxdiag/display.c
··· 160 160 161 161 static 162 162 void 163 - SetDeviceDetails(HWND * hDlgCtrls, LPCGUID classGUID, LPGUID * deviceGUID) 163 + DisplayPageSetDeviceDetails(HWND * hDlgCtrls, LPCGUID classGUID, LPGUID * deviceGUID) 164 164 { 165 165 HDEVINFO hInfo; 166 166 DWORD dwIndex = 0; ··· 305 305 hDlgCtrls[3] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_VERSION); 306 306 hDlgCtrls[4] = GetDlgItem(hwndDlg, IDC_STATIC_ADAPTER_DATE); 307 307 308 - SetDeviceDetails(hDlgCtrls, &GUID_DEVCLASS_DISPLAY, NULL); 308 + DisplayPageSetDeviceDetails(hDlgCtrls, &GUID_DEVCLASS_DISPLAY, NULL); 309 309 return TRUE; 310 310 } 311 311
+2 -2
base/applications/dxdiag/input.c
··· 151 151 } 152 152 153 153 VOID 154 - InitListViewColumns(PINPUT_DIALOG_CONTEXT pContext) 154 + InputPageInitListViewColumns(PINPUT_DIALOG_CONTEXT pContext) 155 155 { 156 156 WCHAR szText[256]; 157 157 LVCOLUMNW lvcolumn; ··· 195 195 ZeroMemory(&Context, sizeof(Context)); 196 196 Context.pObj = pObj; 197 197 Context.hwndDlg = hwndDlg; 198 - InitListViewColumns(&Context); 198 + InputPageInitListViewColumns(&Context); 199 199 pObj->lpVtbl->EnumDevices(pObj, DI8DEVCLASS_ALL, DirectInputEnumDevCb, (PVOID)&Context, DIEDFL_ALLDEVICES); 200 200 201 201 pObj->lpVtbl->Release(pObj);