wine-devel January 2012

wine-devel@winehq.org

83 participants
193 discussions

Regarding my dinput patches
by Lucas Zawacki 18 Jan '12

18 Jan '12

I want to get my dinput patches in before the code freeze, and besides the ones that I tried to commit last week I have some patches touching EnumDevicesBySemantics and ConfigureDevices, but I can't commit them before the DIPROP_USERNAME and configuration file patches are in too. Seeing that I'll have to change a lot of things in the patches to get them in I want to ask some questions: * Is %APPDATA%\DirectInput\User Maps a better place to store the configuration files? * Should I use the … [View More]

2 1

To translate 'Program Files' or not to translate?
by Francois Gouget 17 Jan '12

17 Jan '12

That is the question! We have a bunch of shell paths to translate in shell32.rc. However, based on my French Windows VMs and computers I believe a number of them should not be translated: * As far as I can tell 'Program Files' is never translated. * Same thing for 'SendTo' and 'Recent'. * 'Application Data' appears to be translated in NT4 but not on Windows 2000 and greater. Generally speaking translating a path causes all sorts of trouble with broken applications. For instance … [View More]one regularly ends up with a 'Common Files' folder as well as the French 'Fichiers Communs' one, even on a clean Windows install! Looking at Windows 2000 and greater it seems that Microsoft first decided to only translate the folders most visible to the user. That would explain why 'Application Data', 'Local Settings' and their ilk are not translated. But the very latest fashion (e.g. Windows 7), appears to be to never translate the actual on-disk folder name and use 'desktop.ini' files to get a localized name in the GUI. So for instance on Windows 7 the 'Program Files' folder is called that way on disk but it appears as 'Programmes' in Windows Explorer because of the desktop.ini file (as an anecdote 'Program Files (x86)' has no 'desktop.ini' file and thus is not translated in Explorer. What a mess!). So what do we want to do? The patch below marks the paths that are not meant to be translated as such to reduce the translators burden and avoid mistakes. Some paths mix parts that need to be translated with other that shouldn't. Given the CSIDL_Data structure I'm not sure that can be avoided but I'll be happy with any patch that avoids that. In the meantime I use the message context to give instructions to the translator. Does this make sense? Any better solution? diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 92d9d72..3aaa0f2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -200,31 +200,31 @@ the folder?" IDS_PERSONAL "My Documents" IDS_FAVORITES "Favorites" IDS_STARTUP "Start Menu\\Programs\\StartUp" - IDS_RECENT "Recent" - IDS_SENDTO "SendTo" + IDS_RECENT "#msgctxt#do not translate#Recent" + IDS_SENDTO "#msgctxt#do not translate#SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "My Music" IDS_MYVIDEO "My Videos" IDS_DESKTOPDIRECTORY "#msgctxt#directory#Desktop" IDS_NETHOOD "NetHood" IDS_TEMPLATES "Templates" - IDS_APPDATA "Application Data" + IDS_APPDATA "#msgctxt#do not translate#Application Data" IDS_PRINTHOOD "PrintHood" - IDS_LOCAL_APPDATA "Local Settings\\Application Data" - IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" - IDS_COOKIES "Cookies" - IDS_HISTORY "Local Settings\\History" - IDS_PROGRAM_FILES "Program Files" - IDS_PROGRAM_FILESX86 "Program Files (x86)" + IDS_LOCAL_APPDATA "#msgctxt#do not translate#Local Settings\\Application Data" + IDS_INTERNET_CACHE "#msgctxt#do not translate#Local Settings\\Temporary Internet Files" + IDS_COOKIES "#msgctxt#do not translate#Cookies" + IDS_HISTORY "#msgctxt#do not translate 'Local Settings'#Local Settings\\History" + IDS_PROGRAM_FILES "#msgctxt#do not translate#Program Files" + IDS_PROGRAM_FILESX86 "#msgctxt#do not translate#Program Files (x86)" IDS_MYPICTURES "My Pictures" - IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" - IDS_PROGRAM_FILES_COMMONX86 "Program Files (x86)\\Common Files" + IDS_PROGRAM_FILES_COMMON "#msgctxt#do not translate 'Program Files'#Program Files\\Common Files" + IDS_PROGRAM_FILES_COMMONX86 "#msgctxt#do not translate 'Program Files (x86)'#Program Files (x86)\\Common Files" IDS_COMMON_DOCUMENTS "Documents" IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" IDS_COMMON_MUSIC "Music" IDS_COMMON_PICTURES "Pictures" IDS_COMMON_VIDEO "Videos" - IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" + IDS_CDBURN_AREA "#msgctxt#do not translate#Local Settings\\Application Data\\Microsoft\\CD Burning" IDS_CONTACTS "Contacts" IDS_LINKS "Links" IDS_PHOTO_ALBUMS "Pictures\\Slide Shows" -- 1.7.7.3 [View Less]

4 5

crypt32: Cryptic string resources
by Francois Gouget 17 Jan '12

17 Jan '12

Are these strings seem to be lacking spaces a bit. Are they real names or mere identifiers? Are they actually translatable? dlls/crypt32/crypt32.rc: IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Vote Electronique: Les gens qui votent ne décident rien. Ceux qui comptent les votes décident de tout.

3 3

Re: [PATCH 2/3] dsound: Merge IKsPropertySet into the secondary buffer object.
by Andrew Eikum 17 Jan '12

17 Jan '12

On Tue, Jan 17, 2012 at 01:53:10AM +0100, Michael Stefaniuc wrote: > @@ -901,10 +895,11 @@ HRESULT IDirectSoundBufferImpl_Create( > TRACE("Created buffer at %p\n", dsb); > > dsb->ref = 0; > + dsb->refiks = 0; > dsb->numIfaces = 0; > dsb->device = device; > dsb->IDirectSoundBuffer8_iface.lpVtbl = &dsbvt; > - dsb->iks = NULL; > + dsb->IKsPropertySet_iface.lpVtbl = &iksbvt; > Mixed tabs and spaces :(

2 1

Re: [3/4] ddraw: Set correct HEL and HAL color models
by Saulius Krasuckas 17 Jan '12

17 Jan '12

Stefan, it looks like your patch http://source.winehq.org/git/wine.git/commitdiff/9e0baa55cec232656048c972e9… has introduced 2 failures on one virtual w2k3-vmware machine: http://test.winehq.org/data/e7bbb4ef1e95396b72a58f813b4346d9abccb699/2003_w… See earlier results: http://test.winehq.org/data/tests/ddraw:d3d.html Would you mind fixing this, please:)? S.

2 2

Re: [PATCH 4/5] jscript: Added labelled statements tests
by Marvin 17 Jan '12

17 Jan '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=16489 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No … [View More]

2 1

Re: po: Remove English strings from the Slovenian translation.
by Francois Gouget 17 Jan '12

17 Jan '12

On Tue, 17 Jan 2012, Andrej Znidarsic wrote: [...] > As I am not a very technical person, downloading/commiting with git is very > cubersome/time consuming for me. I would highly appriciate if you would be > willing to download the .po files after string freeze for 1.4, zip them, > send them to me. Then i can review them/translate what is missing, send you > back the files and you can commit them. How does that sound? Usually we prefer when authors send their patches themselves … [View More]

2 1

Re: [PATCH 2/2] dsound: Use correct buffer wraparound logic
by Andrew Eikum 17 Jan '12

17 Jan '12

Actually, don't commit this one. On Mon, Jan 16, 2012 at 02:02:49PM -0600, Andrew Eikum wrote: > --- > dlls/dsound/mixer.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c > index 23af6ce..b35a888 100644 > --- a/dlls/dsound/mixer.c > +++ b/dlls/dsound/mixer.c > @@ -539,8 +539,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, DWORD writepos, DWO > > /* increase mix … [View More]

1 0

Re: [PATCH 3/5] ddraw/tests: Add a IDirect3DDevice2 GetCaps test (try 2)
by Saulius Krasuckas 16 Jan '12

16 Jan '12

* On Tue, 6 Dec 2011, Stefan Dösinger wrote: > > try 2: Add infrastructure to rerun every test with new d3d objects. > --- > dlls/ddraw/tests/d3d.c | 211 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 211 insertions(+), 0 deletions(-) Hi Stefan, this is http://source.winehq.org/git/wine.git/commitdiff/7ae81ba378c1633e574f130461… The patch introduced one failure on 64-bit XP running on virtual machine with VMware SVGA II" driver v11.6.0.35: http://… [View More]

2 2

winecfg: Add tab for most Direct3D registry settings.
by Stephen Chao 16 Jan '12

16 Jan '12

--- programs/winecfg/Makefile.in | 3 +- programs/winecfg/direct3d.c | 256 ++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/main.c | 16 +++- programs/winecfg/resource.h | 8 ++ programs/winecfg/winecfg.h | 1 + programs/winecfg/winecfg.rc | 12 ++ 6 files changed, 294 insertions(+), 2 deletions(-) create mode 100644 programs/winecfg/direct3d.c diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 0190854..1db9fec 100644 --- a/… [View More]programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -13,7 +13,8 @@ C_SRCS = \ main.c \ theme.c \ winecfg.c \ - x11drvdlg.c + x11drvdlg.c \ + direct3d.c RC_SRCS = winecfg.rc PO_SRCS = winecfg.rc diff --git a/programs/winecfg/direct3d.c b/programs/winecfg/direct3d.c new file mode 100644 index 0000000..833999e --- /dev/null +++ b/programs/winecfg/direct3d.c @@ -0,0 +1,256 @@ +#include "winecfg.h" +#include "resource.h" +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(winecfg); + +struct d3doption { + char key[64]; + char option1[64]; + char option2[64]; + char option3[64]; + char option4[64]; + char option5[64]; + char tip[2048]; +} *d3doptions; + +static const int numd3dkeys = 9; + +static void init_d3doptions(void) +{ + d3doptions = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct d3doption) * numd3dkeys); + + /* "auto" will be added for all options */ + /* registry options and defaults found in dlls/wined3d/wined3d_main.c */ + /* TODO: VideoPciDeviceID and VideoPciVendorID, see note in on_selection_change() */ + + strcpy(d3doptions[0].key, "VertexShaderMode"); + strcpy(d3doptions[0].option1, "none"); + strcpy(d3doptions[0].tip, "auto = hardware."); + + strcpy(d3doptions[1].key, "PixelShaderMode"); + strcpy(d3doptions[1].option1, "enabled"); + strcpy(d3doptions[1].option2, "disabled"); + strcpy(d3doptions[1].tip, "auto = enabled = hardware."); + + strcpy(d3doptions[2].key, "UseGLSL"); + strcpy(d3doptions[2].option1, "disabled"); + strcpy(d3doptions[2].tip, "auto = enabled. Needed for most modern games. May have performance increase when disabled but might not run/render properly."); + + strcpy(d3doptions[3].key, "OffscreenRenderingMode"); + strcpy(d3doptions[3].option1, "backbuffer"); + strcpy(d3doptions[3].option2, "fbo"); + strcpy(d3doptions[3].tip, "auto = fbo."); + + strcpy(d3doptions[4].key, "RenderTargetLockMode"); + strcpy(d3doptions[4].option1, "readdraw"); + strcpy(d3doptions[4].option2, "readtex"); + strcpy(d3doptions[4].tip, "auto = readtex. readdraw uses glReadPixels for reading, glDrawPixels for writing. readtex reads with glReadPixels, writes by drawing a textured quad."); + + strcpy(d3doptions[5].key, "VideoMemorySize"); + strcpy(d3doptions[5].option1, "0"); + strcpy(d3doptions[5].option2, "512"); + strcpy(d3doptions[5].option3, "1024"); + strcpy(d3doptions[5].tip, "auto = 0 = autodetect. Sets the amount of reported video memory (in megabytes). The default is a simple auto-detection based on the card type guessed from OpenGL capabilities."); + + strcpy(d3doptions[6].key, "Multisampling"); + strcpy(d3doptions[6].option1, "disabled"); + strcpy(d3doptions[6].tip, "auto = enabled."); + + strcpy(d3doptions[7].key, "StrictDrawOrdering"); + strcpy(d3doptions[7].option1, "enabled"); + strcpy(d3doptions[7].tip, "auto = disabled. This option ensures any pending drawing operations are submitted to the driver, but at a significant performance cost."); + + strcpy(d3doptions[8].key, "AlwaysOffscreen"); + strcpy(d3doptions[8].option1, "enabled"); + strcpy(d3doptions[8].tip, "auto = disabled. Use offscreen rendering for all render targets. The main effect this has is avoiding the depth buffer copy between offscreen and onscreen targets, which introduces fallbacks in some drivers and exposes bugs in others. There may be a performance hit depending on the specific driver."); +} + + +static void on_setoption(HWND dialog, WPARAM wParam) +{ + LVITEM item; + int selection; + char buffer[256]; + int index = -1; + + if(HIWORD(wParam) == CBN_SELENDOK) + { + selection = SendDlgItemMessage(dialog, IDC_D3DCOMBOVAL, CB_GETCURSEL, 0, 0); + SendDlgItemMessage(dialog, IDC_D3DCOMBOVAL, CB_GETLBTEXT, selection, (LPARAM) buffer); + } + else if(HIWORD(wParam) == CBN_EDITCHANGE) + { + SendDlgItemMessage(dialog, IDC_D3DCOMBOVAL, WM_GETTEXT, sizeof(buffer), (LPARAM) buffer); + } + + index = (int)SendDlgItemMessage (dialog, IDC_D3DCOMBOVAL, CB_GETITEMDATA, 0, 0); + WINE_TRACE("d3d index %d, setoption %s\n", index, buffer); + + set_reg_key(config_key, keypath("Direct3D\\"), d3doptions[index].key, buffer); + SendMessage(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0); + + item.mask = LVIF_TEXT; + item.pszText = buffer; + item.cchTextMax = lstrlen(item.pszText); + item.iItem = index; + item.iSubItem = 1; + + SendDlgItemMessage(dialog, IDC_D3DLIST, LVM_SETITEM, 0, (LPARAM) &item); +} + +static void on_selection_change(HWND dialog, HWND listview, LPNMLISTVIEW nmlistview) +{ + LVITEM item; + struct d3doption *option; + + item.iItem = nmlistview->iItem; + item.iSubItem = 1; + item.mask = LVIF_PARAM | LVIF_TEXT; + + + if (item.iItem == -1) return; + + SendMessage(listview, LVM_GETITEM, 0, (LPARAM) &item); + + WINE_TRACE("item.iItem=%d\n", nmlistview->iItem); + + option = (struct d3doption*)nmlistview->lParam; + + SetWindowText(GetDlgItem(dialog, IDC_D3DKEY), option->key); + + SendDlgItemMessage (dialog, IDC_D3DCOMBOVAL, CB_RESETCONTENT, 0, 0); + + if (option->option5[0]) SendDlgItemMessage (dialog, IDC_D3DCOMBOVAL, CB_INSERTSTRING, 0, (LPARAM)option->option5); + if (option->option4[0]) SendDlgItemMessage (dialog, IDC_D3DCOMBOVAL, CB_INSERTSTRING, 0, (LPARAM)option->option4); + if (option->option3[0]) SendDlgItemMessage (dialog, IDC_D3DCOMBOVAL, CB_INSERTSTRING, 0, (LPARAM)option->option3); + if (option->option2[0]) SendDlgItemMessage (dialog, IDC_D3DCOMBOVAL, CB_INSERTSTRING, 0, (LPARAM)option->option2); + if (option->option1[0]) SendDlgItemMessage (dialog, IDC_D3DCOMBOVAL, CB_INSERTSTRING, 0, (LPARAM)option->option1); + + /* Will have to take out "auto" for VideoPciDeviceID and VideoPciVendorID, 0xffff = autodetect */ + SendDlgItemMessage (dialog, IDC_D3DCOMBOVAL, CB_INSERTSTRING, 0, (LPARAM)"auto"); + + SendDlgItemMessage (dialog, IDC_D3DCOMBOVAL, CB_SELECTSTRING, -1, (LPARAM)item.pszText); + + /* attach d3d key index to the 0th combobox value */ + SendDlgItemMessage (dialog, IDC_D3DCOMBOVAL, CB_SETITEMDATA, 0, (LPARAM)item.iItem); + + SetWindowText(GetDlgItem(dialog, IDC_D3DTIP), option->tip); +} + +void load_d3d_registry(HWND dialog) +{ + LVITEM item, item2; + char *fromreg; + char szauto[] = "auto"; + int i; + + SendDlgItemMessage(dialog, IDC_D3DLIST, LVM_DELETEALLITEMS, 0, 0); + + for (i=0; i < numd3dkeys; i++) + { + item.mask = LVIF_TEXT | LVIF_PARAM; + item.pszText = d3doptions[i].key; + item.cchTextMax = lstrlen(item.pszText); + item.lParam = (LPARAM) &d3doptions[i]; + item.iItem = i; + item.iSubItem = 0; + + SendDlgItemMessage(dialog, IDC_D3DLIST, LVM_INSERTITEM, 0, (LPARAM) &item); + + fromreg = get_reg_key(config_key, keypath("Direct3D\\"), d3doptions[i].key, NULL); + if (fromreg == NULL) + { + /* set registry keys in case they didn't exist -- "auto" specifically */ + set_reg_key(config_key, keypath("Direct3D\\"), d3doptions[i].key, szauto); + SendMessage(GetParent(dialog), PSM_CHANGED, (WPARAM) dialog, 0); + item2.pszText = szauto; + } + else + { + item2.pszText = fromreg; + } + + item2.mask = LVIF_TEXT; + item2.cchTextMax = lstrlen(item.pszText); + item2.iItem = i; + item2.iSubItem = 1; + + SendDlgItemMessage(dialog, IDC_D3DLIST, LVM_SETITEM, 0, (LPARAM) &item2); + + HeapFree(GetProcessHeap(), 0, fromreg); + } +} + +static void init_d3dsheet(HWND dialog) +{ + char key[] = "Key"; + char val[] = "Value"; + + LVCOLUMN listColumn; + RECT viewRect; + int width; + + init_d3doptions(); + + GetClientRect(GetDlgItem(dialog, IDC_D3DLIST), &viewRect); + width = (viewRect.right - viewRect.left); + + listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + listColumn.pszText = key; + listColumn.cchTextMax = lstrlen (listColumn.pszText); + listColumn.cx = 140; + + SendDlgItemMessage (dialog, IDC_D3DLIST, LVM_INSERTCOLUMN, 0, (LPARAM) &listColumn); + + listColumn.cx = width - 140; + listColumn.pszText = val; + listColumn.cchTextMax = lstrlen (listColumn.pszText); + + SendDlgItemMessage (dialog, IDC_D3DLIST, LVM_INSERTCOLUMN, 1, (LPARAM) &listColumn); +} + + +INT_PTR CALLBACK +Direct3DDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ +switch (uMsg) + { + case WM_INITDIALOG: + init_d3dsheet(hDlg); + break; + + case WM_SHOWWINDOW: + set_window_title(hDlg); + break; + + case WM_NOTIFY: + switch (((LPNMHDR)lParam)->code) + { + case LVN_ITEMCHANGED: + on_selection_change(hDlg, GetDlgItem(hDlg, IDC_D3DLIST), (LPNMLISTVIEW)lParam); + break; + case PSN_SETACTIVE: + load_d3d_registry(hDlg); + break; + case PSN_KILLACTIVE: + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, FALSE); + break; + case PSN_APPLY: + apply(); + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); + break; + } + case WM_COMMAND: + switch (HIWORD(wParam)) + { + case CBN_EDITCHANGE: + case CBN_SELENDOK: + on_setoption(hDlg, wParam); + break; + } + + break; + } + return 0; +} diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 7376309..ccd59b0 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -60,7 +60,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam) return 0; } -#define NUM_PROPERTY_PAGES 7 +#define NUM_PROPERTY_PAGES 8 static INT_PTR doPropertySheet (HINSTANCE hInstance, HWND hOwner) @@ -84,6 +84,20 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) pg++; /* + * Fill out the (Direct3D) PROPSHEETPAGE data structure + * for the property sheet + */ + psp[pg].dwSize = sizeof (PROPSHEETPAGEW); + psp[pg].dwFlags = PSP_USETITLE; + psp[pg].hInstance = hInstance; + psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_DIRECT3DCFG); + psp[pg].u2.pszIcon = NULL; + psp[pg].pfnDlgProc = Direct3DDlgProc; + psp[pg].pszTitle = load_string (IDS_TAB_DIRECT3D); + psp[pg].lParam = 0; + pg++; + + /* * Fill out the (Libraries) PROPSHEETPAGE data structure * for the property sheet */ diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 6d9c450..826b840 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -45,6 +45,7 @@ #define IDS_SHELL_FOLDER 16 #define IDS_LINKS_TO 17 #define IDS_WINECFG_TITLE_APP 18 /* App specific title */ +#define IDS_TAB_DIRECT3D 19 #define IDI_WINECFG 100 #define IDD_MAINDLG 101 #define IDI_LOGO 102 @@ -54,6 +55,7 @@ #define IDD_GRAPHCFG 110 #define IDD_DLLCFG 111 #define IDD_DRIVECFG 112 +#define IDD_DIRECT3DCFG 113 #define IDD_DESKTOP_INTEGRATION 115 #define IDB_WINE_LOGO 200 #define IDC_TABABOUT 1001 @@ -197,6 +199,12 @@ #define IDC_SYSPARAM_COLOR 1416 #define IDC_SYSPARAM_FONT 1417 +/* direct3d tab */ +#define IDC_D3DLIST 1501 +#define IDC_D3DKEY 1502 +#define IDC_D3DCOMBOVAL 1503 +#define IDC_D3DTIP 1504 + #define IDC_SYSPARAMS_BUTTON 8400 #define IDC_SYSPARAMS_BUTTON_TEXT 8401 #define IDC_SYSPARAMS_DESKTOP 8402 diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 1959409..6775707 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -88,6 +88,7 @@ INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM l INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AboutDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK Direct3DDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); /* Drive management */ BOOL load_drives(void); diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 4ded308..34baad7 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -38,6 +38,7 @@ BEGIN IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "About" + IDS_TAB_DIRECT3D "Direct3D" IDS_WINECFG_TITLE "Wine configuration" IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "Theme files (*.msstyles; *.theme)" @@ -153,6 +154,17 @@ BEGIN COMBOBOX IDC_WINVER,100,194,145,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END +IDD_DIRECT3DCFG DIALOG 0, 0, 260, 220 +STYLE WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Direct3D Settings", IDC_STATIC, 8, 4, 244, 210 + CONTROL "", IDC_D3DLIST, "SysListView32", WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_SINGLESEL | LVS_REPORT, 15, 51, 148, 116 + COMBOBOX IDC_D3DCOMBOVAL, 167, 64, 79, 16, WS_TABSTOP | CBS_DROPDOWN | CBS_HASSTRINGS + EDITTEXT IDC_D3DKEY, 167, 52, 79, 12, NOT WS_BORDER | NOT WS_TABSTOP | ES_READONLY + EDITTEXT IDC_D3DTIP, 15, 174, 232, 36, WS_VSCROLL | NOT WS_TABSTOP | ES_MULTILINE | ES_READONLY +END + IDD_GRAPHCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" -- 1.7.8.3 [View Less]

5 7

← Newer
1
...
8
9
10
11
12
13
14
...
20
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

2003

2002

2001

wine-devel January 2012