wine users - Apr 2009 - Test: patch to add adva,ced d3d settings in winecfg

Hello everybody...

My patch to add advanced d3d settings in winecfg is almost ready.
In fact, i only have to figure out how to detect video memory size to
display it when no key is set to force it or to reset. Stefan D told
me to use DirectDraw, but i wouldn't find.

So that is the last thing (except some better naming...) to do for this patch.

Everything works well and i would like some feedback.

Thanks, kind regards.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: d3d_advanced.diff
Type: text/x-patch
Size: 15150 bytes
Desc: not available
URL:
<http://www.winehq.org/pipermail/wine-users/attachments/20090409/6da3fbdf/attachment.bin>

Warren Dumortier wrote:
> Hello everybody...
> 
> My patch to add advanced d3d settings in winecfg is almost ready.
> In fact, i only have to figure out how to detect video memory size to
> display it when no key is set to force it or to reset. Stefan D told
> me to use DirectDraw, but i wouldn't find.
> 
> So that is the last thing (except some better naming...) to do for this
patch.
> 
> Everything works well and i would like some feedback.
> 
> Thanks, kind regards.
> -------------- next part --------------
> A non-text attachment was scrubbed...
> Name: d3d_advanced.diff
> Type: text/x-patch
> Size: 15150 bytes
> Desc: not available
> URL:
<http://www.winehq.org/pipermail/wine-users/attachments/20090409/6da3fbdf/attachment.bin>
Hint : won't do any good if you replace english strings by french ones into
En.rc :)

> 
> What do you mean? French translations are in Fr.rc and i already did that.
> As you can see the groupbox is lowered, but that's because i did in
> the french .rc file, so i will have to update the english one.
Reading through
http://www.winehq.org/pipermail/wine-users/attachments/20090409/6da3fbdf/attachment.bin
shows only changes to En.rc and these include french.

diff -rupN orig/programs/winecfg/En.rc new/programs/winecfg/En.rc
--- orig/programs/winecfg/En.rc	2009-03-27 19:31:22.000000000 +0100
+++ new/programs/winecfg/En.rc	2009-04-09 11:06:24.000000000 +0200
@@ -78,16 +78,39 @@ BEGIN
     EDITTEXT    IDC_DESKTOP_WIDTH,64,68,40,12,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
     EDITTEXT    IDC_DESKTOP_HEIGHT,117,68,40,12,ES_AUTOHSCROLL | ES_NUMBER |
WS_DISABLED
 
-    GROUPBOX    " Direct3D ",IDC_STATIC,8,95,244,49
-    LTEXT       "&Vertex Shader Support:
",IDC_STATIC,15,110,80,32
...
+    GROUPBOX    " Direct3D ",IDC_STATIC,8,103,244,76
+    LTEXT       "Support du Vertex Shader: ",IDC_STATIC,15,118,90,32
+    CONTROL     "Permettre le Pixel Shader (si support? par le
mat?riel)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,15,134,230,10

I did a git pull then

patch -p1 < ../WineTests/advccfg.diff 

And I got:

patching file programs/winecfg/En.rc
patching file programs/winecfg/resource.h
patching file programs/winecfg/x11drvdlg.c
patch unexpectedly ends in middle of line
Hunk #6 succeeded at 635 with fuzz 1.

I'm downloading the patch from the forum and it looks indeed broken (I'm
not familiar with patch format). At the end of the patch I have:

-	
 	case WM_NOTIFY:
 	    switch (((LPNMHDR)lParam)->code) {
 		case PSN_KILLACTIVE: {

The wine users forum and the mailing list are somewhat integrated. I suppose you
are subscribed to the wine users mailing list. I am not, I only see messages in
the forum (which includes automatically those of the list). So the forum patch
is your patch, but it seems broken.

On Thu, Apr 9, 2009 at 4:28 AM, Warren Dumortier <nwarrenfl at gmail.com>
wrote:
> Hello everybody...
>
> My patch to add advanced d3d settings in winecfg is almost ready.
> In fact, i only have to figure out how to detect video memory size to
> display it when no key is set to force it or to reset. Stefan D told
> me to use DirectDraw, but i wouldn't find.
>
> So that is the last thing (except some better naming...) to do for this
patch.
>
> Everything works well and i would like some feedback.
>
> Thanks, kind regards.
>
>
>
>
Gives some compiler warnings here:
-limits -Wpointer-arith  -g -O2  -o x11drvdlg.o x11drvdlg.c
x11drvdlg.c: In function ?d3d_advanced_settings_save?:
x11drvdlg.c:451: warning: ISO C90 forbids mixed declarations and code
x11drvdlg.c: In function ?d3d_advanced_settings_reset?:
x11drvdlg.c:463: warning: passing argument 1 of ?SetDlgItemTextA?
makes pointer from integer without a cast
x11drvdlg.c:465: warning: passing argument 1 of ?SendMessageA? makes
pointer from integer without a cast
x11drvdlg.c:465: warning: ISO C90 forbids mixed declarations and code
x11drvdlg.c:466: warning: passing argument 1 of ?SendDlgItemMessageA?
makes pointer from integer without a cast
x11drvdlg.c:468: warning: passing argument 1 of ?SendMessageA? makes
pointer from integer without a cast
x11drvdlg.c:469: warning: passing argument 1 of ?SendDlgItemMessageA?
makes pointer from integer without a cast
x11drvdlg.c:471: warning: passing argument 1 of ?SendMessageA? makes
pointer from integer without a cast
x11drvdlg.c:472: warning: passing argument 1 of ?SendDlgItemMessageA?
makes pointer from integer without a cast


Other than that, and the comments Juan and others pointed out, looks good.

-- 
-Austin

austin987 wrote:
> 
> Try getting it from the mailing list archive;
> http://www.winehq.org/pipermail/wine-devel/2009-April/074677.html
> 

Nope, I get the same file with 353 lines. Could you email it to me (fernando at
cmartins.demon.nl), please?

Thanks,
Fernando

On Sun, Apr 12, 2009 at 12:00 PM, loltsy <wineforum-user at winehq.org>
wrote:
>
> fcmartins wrote:
>>
>> I think there are a few bugs (not necessarily caused by the patch):
>> - the Windows version is not set by default AND winecfg does not keep
it
>>
>
>
> Looks like a regression in 1.1.19 since it happens with or without any
patches.
>
>
> Code:
> 59148d0bb549ff8690f15f14571a715e3fdd43a5 is first bad commit
> commit 59148d0bb549ff8690f15f14571a715e3fdd43a5
> Author: Nikolay Sivov <bunglehead at gmail.com>
> Date: ? Tue Apr 7 12:15:21 2009 -0400
>
> ? ?comctl32/listview: Implement delayed header creation for ListView
control.
>
> :040000 040000 917d3c197548165028394f45e22b6d32632f36cd
3df9c0746fceb9202daab94828b78177e4f4c176 M ? ? ?dlls
>
>
>
>
>
>
>
>
>
File a bug at http://bugs.winehq.org

-- 
-Austin