Index: dxglcfg/dxglcfg.c |
— | — | @@ -1004,6 +1004,7 @@ |
1005 | 1005 | SetCombo(hWnd, IDC_DPISCALE, cfg->DPIScale, cfgmask->DPIScale, tristate);
|
1006 | 1006 | SetAspectCombo(hWnd, IDC_ASPECT, cfg->aspect, cfgmask->aspect, tristate);
|
1007 | 1007 | }
|
| 1008 | + break;
|
1008 | 1009 | case IDC_VIDMODE:
|
1009 | 1010 | cfg->scaler = GetCombo(hWnd,IDC_VIDMODE,&cfgmask->scaler);
|
1010 | 1011 | EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
Index: dxglcfg2/dxglcfg2.c |
— | — | @@ -451,7 +451,7 @@ |
452 | 452 | TCHAR verpath[64];
|
453 | 453 | WORD translation[2];
|
454 | 454 | DWORD cursel;
|
455 | | - DRAWITEMSTRUCT* drawitem = (DRAWITEMSTRUCT*)lParam;
|
| 455 | + DRAWITEMSTRUCT* drawitem;
|
456 | 456 | BOOL hasname;
|
457 | 457 | void *verinfo;
|
458 | 458 | COLORREF OldTextColor,OldBackColor;
|
— | — | @@ -463,6 +463,8 @@ |
464 | 464 | LPTSTR regpath;
|
465 | 465 | LPTSTR regkey;
|
466 | 466 | BOOL failed;
|
| 467 | + RECT r;
|
| 468 | + drawitem = (DRAWITEMSTRUCT*)lParam;
|
467 | 469 | switch (Msg)
|
468 | 470 | {
|
469 | 471 | case WM_INITDIALOG:
|
— | — | @@ -516,7 +518,7 @@ |
517 | 519 | ReleaseDC(hGLWnd,dc);
|
518 | 520 | DestroyWindow(hGLWnd);
|
519 | 521 | // Load global settings.
|
520 | | - // scaler
|
| 522 | +/* // scaler
|
521 | 523 | _tcscpy(buffer,_T("Change desktop resolution"));
|
522 | 524 | SendDlgItemMessage(hWnd,IDC_VIDMODE,CB_ADDSTRING,0,(LPARAM)buffer);
|
523 | 525 | _tcscpy(buffer,_T("Stretch to screen"));
|
— | — | @@ -711,7 +713,7 @@ |
712 | 714 | SendDlgItemMessage(hWnd,IDC_DPISCALE,CB_ADDSTRING,1,(LPARAM)buffer);
|
713 | 715 | _tcscpy(buffer, _T("Windows AppCompat"));
|
714 | 716 | SendDlgItemMessage(hWnd,IDC_DPISCALE,CB_ADDSTRING,2,(LPARAM)buffer);
|
715 | | - SendDlgItemMessage(hWnd,IDC_DPISCALE,CB_SETCURSEL,cfg->DPIScale,0);
|
| 717 | + SendDlgItemMessage(hWnd,IDC_DPISCALE,CB_SETCURSEL,cfg->DPIScale,0);*/
|
716 | 718 | // Add installed programs
|
717 | 719 | current_app = 1;
|
718 | 720 | appcount = 1;
|
— | — | @@ -831,10 +833,14 @@ |
832 | 834 | free(keyname);
|
833 | 835 | for(i = 0; i < appcount; i++)
|
834 | 836 | {
|
835 | | - SendDlgItemMessage(hWnd,IDC_APPS,LB_ADDSTRING,0,(LPARAM)apps[i].name);
|
| 837 | + SendDlgItemMessage(hWnd,IDC_APPS,CB_ADDSTRING,0,(LPARAM)apps[i].name);
|
836 | 838 | }
|
837 | 839 | current_app = 0;
|
838 | | - SendDlgItemMessage(hWnd,IDC_APPS,LB_SETCURSEL,0,0);
|
| 840 | + SendDlgItemMessage(hWnd,IDC_APPS,CB_SETCURSEL,0,0);
|
| 841 | + GetWindowRect(GetDlgItem(hWnd, IDC_APPS), &r);
|
| 842 | + SetWindowPos(GetDlgItem(hWnd, IDC_APPS), HWND_TOP, r.left, r.top, r.right - r.left,
|
| 843 | + (r.bottom - r.top) + (16 * (GetSystemMetrics(SM_CYSMICON) + 1)+(2*GetSystemMetrics(SM_CYBORDER))),
|
| 844 | + SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
|
839 | 845 | if(osver.dwMajorVersion >= 6)
|
840 | 846 | {
|
841 | 847 | if(OpenProcessToken(GetCurrentProcess(),TOKEN_QUERY,&token))
|
— | — | @@ -851,7 +857,7 @@ |
852 | 858 | }
|
853 | 859 | else
|
854 | 860 | {
|
855 | | - EnableWindow(GetDlgItem(hWnd, IDC_DPISCALE), FALSE);
|
| 861 | + //EnableWindow(GetDlgItem(hWnd, IDC_DPISCALE), FALSE);
|
856 | 862 | }
|
857 | 863 | if(token) CloseHandle(token);
|
858 | 864 | return TRUE;
|
— | — | @@ -932,7 +938,7 @@ |
933 | 939 | else EnableWindow(GetDlgItem(hWnd,IDC_REMOVE),TRUE);
|
934 | 940 | }
|
935 | 941 | else EnableWindow(GetDlgItem(hWnd,IDC_REMOVE),FALSE);
|
936 | | - // Set 3-state status
|
| 942 | +/* // Set 3-state status
|
937 | 943 | if(current_app && !tristate)
|
938 | 944 | {
|
939 | 945 | tristate = TRUE;
|
— | — | @@ -1002,9 +1008,10 @@ |
1003 | 1009 | SetCheck(hWnd,IDC_EXTRAMODES,cfg->ExtraModes,cfgmask->ExtraModes,tristate);
|
1004 | 1010 | SetText(hWnd,IDC_SHADER,cfg->shaderfile,cfgmask->shaderfile,tristate);
|
1005 | 1011 | SetCombo(hWnd, IDC_DPISCALE, cfg->DPIScale, cfgmask->DPIScale, tristate);
|
1006 | | - SetAspectCombo(hWnd, IDC_ASPECT, cfg->aspect, cfgmask->aspect, tristate);
|
| 1012 | + SetAspectCombo(hWnd, IDC_ASPECT, cfg->aspect, cfgmask->aspect, tristate);*/
|
1007 | 1013 | }
|
1008 | | - case IDC_VIDMODE:
|
| 1014 | + break;
|
| 1015 | +/* case IDC_VIDMODE:
|
1009 | 1016 | cfg->scaler = GetCombo(hWnd,IDC_VIDMODE,&cfgmask->scaler);
|
1010 | 1017 | EnableWindow(GetDlgItem(hWnd,IDC_APPLY),TRUE);
|
1011 | 1018 | *dirty = TRUE;
|
— | — | @@ -1101,7 +1108,7 @@ |
1102 | 1109 | EnableWindow(GetDlgItem(hWnd, IDC_APPLY), TRUE);
|
1103 | 1110 | *dirty = TRUE;
|
1104 | 1111 | }
|
1105 | | - break;
|
| 1112 | + break;*/
|
1106 | 1113 | case IDC_ADD:
|
1107 | 1114 | selectedfile[0] = 0;
|
1108 | 1115 | ZeroMemory(&filename,OPENFILENAME_SIZE_VERSION_400);
|
Index: dxglcfg2/dxglcfg2.rc |
— | — | @@ -28,55 +28,35 @@ |
29 | 29 | // Dialog resources
|
30 | 30 | //
|
31 | 31 | LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
32 | | -IDD_DXGLCFG DIALOG 0, 0, 405, 265
|
| 32 | +IDD_DXGLCFG DIALOG 0, 0, 405, 250
|
33 | 33 | STYLE DS_3DLOOK | DS_CONTEXTHELP | DS_SETFONT | WS_CAPTION | WS_SYSMENU
|
34 | | -CAPTION "DXGL Config"
|
| 34 | +CAPTION "DXGL Config (Experimental)"
|
35 | 35 | FONT 8, "Ms Shell Dlg 2"
|
36 | 36 | {
|
37 | | - DEFPUSHBUTTON "OK", IDOK, 247, 247, 50, 14
|
38 | | - PUSHBUTTON "Cancel", IDCANCEL, 299, 247, 50, 14
|
39 | | - LTEXT "", IDC_STATIC, 4, 244, 397, 1, SS_LEFT | SS_SUNKEN
|
40 | | - PUSHBUTTON "&Apply", IDC_APPLY, 351, 247, 50, 14, WS_DISABLED
|
41 | | - LISTBOX IDC_APPS, 4, 14, 181, 212, WS_TABSTOP | WS_VSCROLL | LBS_NOINTEGRALHEIGHT | LBS_OWNERDRAWFIXED | LBS_NOTIFY
|
42 | | - LTEXT "Applications", IDC_STATIC, 4, 4, 39, 8, SS_LEFT
|
43 | | - PUSHBUTTON "A&dd...", IDC_ADD, 4, 228, 90, 14
|
44 | | - PUSHBUTTON "&Remove", IDC_REMOVE, 96, 228, 90, 14, WS_DISABLED
|
45 | | - GROUPBOX "Graphics", IDC_STATIC, 190, 4, 211, 238
|
46 | | - LTEXT "Video mode", IDC_STATIC, 195, 14, 38, 8, SS_LEFT
|
47 | | - COMBOBOX IDC_VIDMODE, 195, 24, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
48 | | - AUTOCHECKBOX "Change display color depth", IDC_COLOR, 299, 14, 100, 10
|
49 | | - LTEXT "Scaling method", IDC_STATIC, 195, 69, 49, 8, SS_LEFT
|
50 | | - COMBOBOX IDC_SCALE, 195, 79, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
51 | | - LTEXT "Vertical sync", IDC_STATIC, 299, 69, 41, 8, SS_LEFT
|
52 | | - COMBOBOX IDC_VSYNC, 299, 79, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
53 | | - LTEXT "Post-processing shader", IDC_STATIC, 195, 94, 90, 8, SS_LEFT
|
54 | | - EDITTEXT IDC_SHADER, 195, 104, 183, 14, ES_AUTOHSCROLL
|
55 | | - PUSHBUTTON "...", IDC_BROWSESHADER, 379, 104, 20, 14
|
56 | | - LTEXT "Screen aspect ratio", IDC_STATIC, 195, 120, 63, 8, SS_LEFT
|
57 | | - LTEXT "DPI scaling mode", IDC_STATIC, 299, 120, 55, 8, SS_LEFT
|
58 | | - COMBOBOX IDC_ASPECT, 195, 130, 102, 30, CBS_DROPDOWN | CBS_HASSTRINGS
|
59 | | - COMBOBOX IDC_DPISCALE, 299, 130, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
60 | | - LTEXT "Texture filter", IDC_STATIC, 195, 145, 43, 8, SS_LEFT
|
61 | | - COMBOBOX IDC_TEXFILTER, 195, 155, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
62 | | - LTEXT "Anisotropic filtering", IDC_STATIC, 299, 145, 62, 8, SS_LEFT
|
63 | | - COMBOBOX IDC_ANISO, 299, 155, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
64 | | - LTEXT "Antialiasing (MSAA)", IDC_STATIC, 195, 170, 63, 8, SS_LEFT
|
65 | | - COMBOBOX IDC_MSAA, 195, 180, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
66 | | - LTEXT "Renderer aspect ratio", IDC_STATIC, 299, 170, 71, 8, SS_LEFT
|
67 | | - COMBOBOX IDC_ASPECT3D, 299, 180, 100, 14, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
68 | | - AUTOCHECKBOX "Adjust primary resolution", IDC_HIGHRES, 299, 28, 96, 8
|
69 | | - AUTOCHECKBOX "Support all color depths", IDC_UNCOMMONCOLOR, 299, 55, 91, 8
|
70 | | - AUTOCHECKBOX "Add extra display modes", IDC_EXTRAMODES, 299, 42, 95, 8
|
71 | | - LTEXT "Sort video modes", IDC_STATIC, 195, 39, 56, 8, SS_LEFT
|
72 | | - COMBOBOX IDC_SORTMODES, 195, 49, 101, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
73 | | - LTEXT "Texture format", IDC_STATIC, 195, 195, 50, 8, SS_LEFT
|
74 | | - COMBOBOX IDC_TEXTUREFORMAT, 195, 205, 102, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
75 | | - LTEXT "Texture access method", IDC_STATIC, 299, 195, 76, 8, SS_LEFT
|
76 | | - COMBOBOX IDC_TEXUPLOAD, 299, 205, 100, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
| 37 | + CONTROL "", IDC_TABS, WC_TABCONTROL, 0, 7, 35, 391, 192, WS_EX_LEFT
|
| 38 | + DEFPUSHBUTTON "OK", IDOK, 244, 229, 50, 14, 0, WS_EX_LEFT
|
| 39 | + PUSHBUTTON "Cancel", IDCANCEL, 296, 229, 50, 14, 0, WS_EX_LEFT
|
| 40 | + PUSHBUTTON "&Apply", IDC_APPLY, 348, 229, 50, 14, WS_DISABLED, WS_EX_LEFT
|
| 41 | + COMBOBOX IDC_APPS, 7, 17, 207, 195, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_NOINTEGRALHEIGHT | CBS_OWNERDRAWFIXED, WS_EX_LEFT
|
| 42 | + LTEXT "Application profile", IDC_STATIC, 7, 7, 58, 8, SS_LEFT, WS_EX_LEFT
|
| 43 | + PUSHBUTTON "A&dd...", IDC_ADD, 216, 17, 90, 14, 0, WS_EX_LEFT
|
| 44 | + PUSHBUTTON "&Remove", IDC_REMOVE, 308, 17, 90, 14, WS_DISABLED, WS_EX_LEFT
|
77 | 45 | }
|
78 | 46 |
|
79 | 47 |
|
80 | 48 |
|
| 49 | +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
| 50 | +IDD_LOADING DIALOG 0, 0, 246, 41
|
| 51 | +STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_POPUP | WS_SYSMENU
|
| 52 | +EXSTYLE WS_EX_WINDOWEDGE
|
| 53 | +FONT 8, "Ms Shell Dlg"
|
| 54 | +{
|
| 55 | + LTEXT "Loading profiles...", 0, 95, 10, 56, 8, SS_LEFT, WS_EX_LEFT
|
| 56 | + CONTROL "", 0, PROGRESS_CLASS, 0, 7, 20, 232, 14, WS_EX_LEFT
|
| 57 | +}
|
| 58 | +
|
| 59 | +
|
| 60 | +
|
81 | 61 | //
|
82 | 62 | // Icon resources
|
83 | 63 | //
|
Index: dxglcfg2/resource.h |
— | — | @@ -23,25 +23,9 @@ |
24 | 24 | #define IDI_DXGL 107
|
25 | 25 | #define IDI_DXGLSM 109
|
26 | 26 | #define IDI_STAR 111
|
27 | | -#define IDC_ASPECT3D 1000
|
28 | | -#define IDC_HIGHRES 1002
|
29 | | -#define IDC_SORTMODES 1003
|
30 | | -#define IDC_UNCOMMONCOLOR 1004
|
31 | | -#define IDC_APPLY 1015
|
32 | | -#define IDC_APPS 1037
|
33 | | -#define IDC_ADD 1038
|
34 | | -#define IDC_REMOVE 1039
|
35 | | -#define IDC_VIDMODE 1041
|
36 | | -#define IDC_SCALE 1042
|
37 | | -#define IDC_VSYNC 1043
|
38 | | -#define IDC_SHADER 1044
|
39 | | -#define IDC_BROWSESHADER 1045
|
40 | | -#define IDC_TEXFILTER 1046
|
41 | | -#define IDC_ANISO 1047
|
42 | | -#define IDC_MSAA 1048
|
43 | | -#define IDC_COLOR 1049
|
44 | | -#define IDC_EXTRAMODES 1055
|
45 | | -#define IDC_TEXTUREFORMAT 1058
|
46 | | -#define IDC_TEXUPLOAD 1059
|
47 | | -#define IDC_ASPECT 1061
|
48 | | -#define IDC_DPISCALE 1063
|
| 27 | +#define IDD_LOADING 113
|
| 28 | +#define IDC_APPLY 1000
|
| 29 | +#define IDC_APPS 1001
|
| 30 | +#define IDC_ADD 1002
|
| 31 | +#define IDC_REMOVE 1003
|
| 32 | +#define IDC_TABS 1004
|
Index: dxglcfg2 |
Property changes on: dxglcfg2 |
___________________________________________________________________ |
Modified: svn:ignore |
## -1,2 +1,3 ## |
49 | 33 | dxglcfg2.vcxproj.user |
50 | 34 | Release |
| 35 | +Debug |