April 2009 - Wine-Devel - list.winehq.org

Re: [4/10] WineD3D: Merge IWineD3DIndexBuffer and IWineD3DBuffer
by Henri Verbeet April 5, 2009

April 5, 2009

2009/4/4 Stefan Dösinger <stefan(a)codeweavers.com>: > + WINED3DRESOURCETYPE WineD3DRType; > TRACE("(%p)->(%d, %d, %d, %08x, %d, %d)\n", This, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat); > > + switch(RType) { > + case D3DRTYPE_VERTEXBUFFER: > + case D3DRTYPE_INDEXBUFFER: > + WineD3DRType = WINED3DRTYPE_BUFFER; > + break; > + > + default: > + WineD3DRType = RType; > + break; > + } > + This should have been in the first patch. The same goes for the other changes touching WINED3DRESOURCETYPE.

1 0

Re: [3/10] WineD3D: Merge indexbuffer and buffer implementations
by Henri Verbeet April 5, 2009

April 5, 2009

Personally I would've eliminated the implementation differences first (the main difference is when the data is copied, unmap vs. preload), and then just killed IWineD3DIndexBufferImpl once they were the same from an implementation point of view. Eg., you can ignore the conversion if you can prove it never happens for index buffers. > - desc->FVF = This->fvf; > + > + /* Temporary hack */ > + if(This->buffer_type_hint == GL_ARRAY_BUFFER_ARB) { > + desc->FVF = This->fvf; > + } This is extremely ugly. > + /* No conversion is needed on index buffers for now */ > + if (This->resource.format_desc->format != WINED3DFMT_VERTEXDATA) return FALSE; > + This is redundant, buffer_find_decl() will never be called for index buffers. Related to that, the bind_count field now has an ambiguous name, it only refers to how often the buffer is bound as vertex data, not index data, or any other type of potential binding (eg. stream output in the future). > + if(This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) { I realise wined3d is pretty much unsalvageable in terms of style consistency, but buffer.c is fairly consistent at the moment. I don't care too much about style differences, but I figured I'd mention it.

1 0

new refcount for d3d ??
by paulo lesgaz April 5, 2009

April 5, 2009

Hello, looking at the web page: http://www.nabble.com/d3d:-Bug-in-handling-of-depth-stencil-surfaces,-and-p… I read that there are problems with the ref count in d3d wine implementation. Does there exist any plan to fix it? Or can we try to implement the Jim's idea about it? David

4 6

Re: winemenubuilder: disable debug output for .desktop files
by Vincent Povirk April 4, 2009

April 4, 2009

On Fri, Apr 3, 2009 at 4:05 PM, Vincent Povirk <madewokherd+8cd9(a)gmail.com> wrote: > I'll work on a patch for the FIXME thing. Turns out this is not "fairly easy" but actually "incredibly difficult". We have a fallback case at http://source.winehq.org/source/include/wine/debug.h#L133 with a macro that returns a statement that ends in a function call, omitting the arguments and semicolon. This allows us to do FIXME_(channel)("message\n");. I can handle this in the other cases (where the macro result ends in a macro that takes arguments), but I can't see a way to create a static variable in a statement that ends in a function call that we only execute sometimes. Vincent Povirk

3 2

urlmon/misc test and the use of URLZONEREG_DEFAULT
by Paul Vriens April 4, 2009

April 4, 2009

Hi, Just build me a fresh W2K3 box with SP2 and all updates (including IE7). I get some errors when I run winetest: urlmon:misc misc.c:884: Test failed: (1400) policy=3, expected 0 misc.c:884: Test failed: (1e05) policy=10000, expected 20000 This particular test test_url_action() checks the registry values under HKLM and then checks with IInternetZoneManager_GetZoneActionPolicy() if it gets the same result. Obviously that failed in my case. It turns out that the returned value came from HKCU and not from HKLM. So the question is, does somebody now what URLZONEREG_DEFAULT defaults to? HKCR or HKLM and is this always the same or are there circumstances that make the default different. I guess I could write a test that checks both HKLM and HKCR and directly modifies the registry values in both hives to see what IInternetZoneManager_GetZoneActionPolicy() is using. Ideas, thoughts? -- Cheers, Paul.

2 4

Re: [2/2] shell32: Define PT_FOLDERW.
by Austin English April 4, 2009

April 4, 2009

On Sat, Apr 4, 2009 at 6:59 AM, Nicolas Le Cam <niko.lecam(a)gmail.com> wrote: > Define PT_FOLDERW in pidl.h to complete this series. You're changing the indent of some of the defines. If you're going to change some, change them all to make them consistent (PT_COMP has two tabs). -- -Austin

2 3

Re: 'Interactive' tests on Windows 2003
by Ge van Geldorp April 4, 2009

April 4, 2009

From: "James Hawkins" <truiken(a)gmail.com> > On Fri, Jun 13, 2008 at 8:40 AM, Francois Gouget <fgouget(a)free.fr> wrote: > > > > Someone asked to check which tests require interaction when running in > > my Windows 2003 VM. However I cannot find the corresponding email (it > > might have been on irc), so I'm sending this data to the list. > > > > So the only interaction that was needed was caused by this IE > > security dialog: > > > > Content within this application coming from the Web site listed > > below is being blocked by Internet Explorer Enhanced Security > > Configuration. > > > > > > Only three tests were impacted: > > * mshtml_test dom > > -> 1508 tests run but 0 failures happened when just closing the > > dialog. > > > > * mshtml_test script (about:security_mshtml_test.exe) > > -> 21 tests run and 13 failures if the dialog is just closed, and 0 > > failures if mshtml_test is manually added to the 'allowed' list. > > > > * urlmon_test misc > > -> 923 tests run but 0 failures if the dialog is just closed. > > > > > > When run by winetest these tests just time out though. > > > > Thanks Francois (I asked on IRC a while back). I get these dialogs in > 2k3 as well. Do you think we should add a check for > winetest_interactive before the calls that bring up the permission > dialog? If anyone else knows of a better way, let us know. Actually, the interactive test is already there: http://www.winehq.org/pipermail/wine-cvs/2009-January/051706.html http://www.winehq.org/pipermail/wine-cvs/2009-January/051707.html Ge.

1 0

Re: gdi32/enhmfdrv: Actaully save the state in SaveDC and RestoreDCin the metafile
by Dmitry Timoshkov April 4, 2009

April 4, 2009

It would be cleaner to check for GDI_NO_MORE_WORK in SaveDC/RestoreDC instead of duplicating their code. -- Dmitry.

2 1

Re: winemenubuilder: disable debug output for .desktop files
by Vincent Povirk April 3, 2009

April 3, 2009

On Fri, Apr 3, 2009 at 4:09 PM, Austin English <austinenglish(a)gmail.com> wrote: > Why couldn't you simply use a second WINEDEBUG="fixme+all,err+all" to > override the variable in the .desktop file? The command is "env WINEPREFIX="..." WINEDEBUG=-all ...". No matter what I set WINEDEBUG to when I start that, wine will see a WINEDEBUG value of -all. Vincent Povirk

2 1

Re: winemenubuilder: disable debug output for .desktop files
by Vincent Povirk April 3, 2009

April 3, 2009

I'm not sure if this is a good idea. I don't think it's safe to assume that stderr will be lost if the program was started from a .desktop file. If default debug output slows anything down noticeably, that should probably be fixed. Vincent Povirk On Fri, Apr 3, 2009 at 2:40 PM, Austin English <austinenglish(a)gmail.com> wrote: > Users aren't running in a terminal, so debug output only slows things down. > > -- > -Austin > > > >

2 3

Windows 7
by Fred . April 3, 2009

April 3, 2009

I can put Windows XP, Vista, 2003, 2008. But not Windows 7.

5 9

Re: OpenBSD configure fix for cups
by Alexandre Julliard April 3, 2009

April 3, 2009

Toni Spets <toni.spets(a)gmail.com> writes: > @@ -1221,7 +1221,7 @@ if test "x$with_cups" != "xno" > then > ac_save_CPPFLAGS="$CPPFLAGS" > ac_cups_cflags=`cups-config --cflags 2>/dev/null` > - ac_cups_libs=`cups-config --ldflags 2>/dev/null` > + ac_cups_libs=`cups-config --ldflags --libs 2>/dev/null` > CPPFLAGS="$CPPFLAGS $ac_cups_cflags" I'm afraid we can't do that, cups-config --libs returns a lot of crap that will break the build on many platforms. You should fix the OpenBSD libcups build to import the needed libraries. -- Alexandre Julliard julliard(a)winehq.org

1 0

Registry keys for serial ports
by Stefan Leichter April 3, 2009

April 3, 2009

Hello Alexandre, you said in http://www.winehq.org/pipermail/wine-devel/2008-November/070691.html that registry entries for the serial ports should be created from the information received from hal. i 'm planing to implement this code. But before i start coding i like to know where the code should be created. Should the code go into kernel32/oldconfig.c, should i start creating serenum.sys is there any other place? Bye Stefan

2 1

Wine registry question
by Damjan Jovanovic April 3, 2009

April 3, 2009

Hi I've noticed that Wine doesn't merge HKCU\Classes\Root into HKCR (http://bugs.winehq.org/show_bug.cgi?id=17019) Is this for compatibility with older Windows versions, or is it a Wine bug? Damjan Jovanovic

2 2

Re: (resubmit) user32: In COMBO_WindowPosChanging() do not change the height of the the dropped rectangle, if the new height is too small
by Alexandre Julliard April 3, 2009

April 3, 2009

Rein Klazes <wijn(a)online.nl> writes: > Fixes bug #17695 > --- > dlls/user32/combo.c | 6 ++-- > dlls/user32/tests/combo.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 49 insertions(+), 3 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M user32.dll -T ../../.. -p user32_test.exe.so combo.c && touch combo.ok combo.c:143: Tests skipped: Invalid Marlett font heights combo.c:143: Tests skipped: Invalid Marlett font heights combo.c:377: Test succeeded inside todo block: clientrect height is 24 vs 24 combo.c:377: Test succeeded inside todo block: clientrect height is 24 vs 24 make[2]: *** [combo.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: dlls/comctl32/tests/listview.c: fix ok statements to actually test something
by Joris Huizer April 2, 2009

April 2, 2009

--- On Thu, 4/2/09, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > From: Nikolay Sivov <bunglehead(a)gmail.com> > Subject: Re: dlls/comctl32/tests/listview.c: fix ok statements to actually test something > To: wine-devel(a)winehq.org, joris_huizer(a)yahoo.com > Date: Thursday, April 2, 2009, 2:04 PM > > Joris Huizer wrote: > Hi, Joris. Thanks for spotting this, but changes you've > made will fail on Windows. I've just sent a corrected > version with one test more. > Here it is if you're interested: > http://www.winehq.org/pipermail/wine-patches/2009-April/071433.html > > No problem :-) Sorry I didn't test with Windows just as I don't have it available; I wasn't sure what would be the proper action, to send a best-guess patch or personal email - any ideas on this in general? regards, Joris

2 1

Re: [1/4]winemaker: winresrc.h is the right name in actual wine(try10)
by Austin English April 2, 2009

April 2, 2009

On Thu, Apr 2, 2009 at 2:58 PM, Dawncrow <webmaster(a)dawncrow.de> wrote: > --- > tools/winemaker | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > > > > > Your patch lacks your real name. -- -Austin

2 1

Re: include: Add declaration of sockaddr_storage to winsock2.h.
by Alexandre Julliard April 2, 2009

April 2, 2009

Rob Shearman <robertshearman(a)gmail.com> writes: > @@ -437,6 +437,18 @@ typedef struct _CSADDR_INFO { > } CSADDR_INFO, *PCSADDR_INFO, *LPCSADDR_INFO; > #endif > > +#define _SS_MAXSIZE 128 > +#define _SS_ALIGNSIZE (sizeof(__int64)) > +#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(short)) > +#define _SS_PAD2SIZE (_SS_MAXSIZE - 2 * _SS_ALIGNSIZE) > + > +typedef struct WS(sockaddr_storage) { > + short ss_family; > + char __ss_pad1[_SS_PAD1SIZE]; > + __int64 __ss_align; > + char __ss_pad2[_SS_PAD2SIZE]; > +} SOCKADDR_STORAGE, *PSOCKADDR_STORAGE, *LPSOCKADDR_STORAGE; This is apparently in ws2def.h in the Vista SDK. Also the #defines need a WS prefix too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/5] resend include: bring in6_addr into line with the MS definition
by Alexandre Julliard April 2, 2009

April 2, 2009

Jeff Latimer <lats(a)yless4u.com.au> writes: > diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h > index a38ccda..9ddb3d1 100644 > --- a/include/ws2tcpip.h > +++ b/include/ws2tcpip.h > @@ -85,26 +85,41 @@ struct WS(ip_msfilter) { > struct WS(in_addr) imsf_slist[1]; > }; > > -typedef struct WS(in_addr6) > -{ > - WS(u_char) s6_addr[16]; /* IPv6 address */ > +struct WS(in6_addr) { > + union { > + WS(u_char) Byte[16]; > + WS(u_short) Word[8]; > + } u; > } IN6_ADDR, *PIN6_ADDR, *LPIN6_ADDR; > > +#define in_addr6 WS(in6_addr) > + > +#define _S6_un u > +#define _S6_u8 Byte > +#ifndef USE_WS_PREFIX > +#define s6_addr _S6_un._S6_u8 > +#else > +#define WS_s6_addr _S6_un._S6_u8 > +#endif > + > +#define s6_bytes u.Byte > +#define s6_words u.Word This doesn't seem to match the PSDK, I don't see anything like this in ws2tcpip.h. -- Alexandre Julliard julliard(a)winehq.org

3 4

Re: dlls/comctl32/tests/listview.c: fix ok statements to actually test something
by Nikolay Sivov April 2, 2009

April 2, 2009

> Joris Huizer wrote: Hi, Joris. Thanks for spotting this, but changes you've made will fail on Windows. I've just sent a corrected version with one test more. Here it is if you're interested: http://www.winehq.org/pipermail/wine-patches/2009-April/071433.html

1 0

Microsoft Office 2007 error
by Robert Lunnon April 2, 2009

April 2, 2009

I Get the following unimplemented call in Wine 1.1.16 when using the word 2007 file-selector wine: Call from 7fbb155b to unimplemented function shdocvw.dll.IEILIsEqual, aborting Hints anyone

4 3

GSoC proposal
by cocofan April 2, 2009

April 2, 2009

I'm a student interested in applying for Google summer of code and I was looking over your ideas. I'm familiar with wine as a user (for running an occasional windows app I'm forced to run) and I notice one of your ideas is getting old DOS games to run under wine. I'm a big fan of the original Lemmings DOS game but can't get it to work under wine (it doesn't respond to the pressing of keys or mouse clicks when the storyboard is up). Would it be possible to work on getting Lemmings to work. I'm not sure this is a problem with VGA though but I wouldn't mine working on some other old DOS classics (I kind of miss them). Also, how detailed you do want the timeline/milestones to be? I'm not familiar with the code yet and won't be by the deadline (which is Friday). I'm in the process of getting and compiling the code from the 'git' repository though. Dona Hertel

2 1

Documentation
by Fred . April 2, 2009

April 2, 2009

I saw on http://www.winehq.org/status/wine That there Nonexistent documentation for "Initial directory structure" and Poor documentation for "Initial INI files". So I wrote documentation for those on the wiki. http://wiki.winehq.org/Initial_directory_structure http://wiki.winehq.org/Initial_INI_files Hope I helped out, and this was useful. If so, it could be linked from the /status/wine article, and maybe move to /site/docs/winedev-guide/

2 1

Re: [3/3] user32: Implemented GetWindowRgnBox with tests
by Paul Vriens April 2, 2009

April 2, 2009

Nikolay Sivov wrote: > IE8 requested this. > > Changelog: > - Implemented GetWindowRgnBox with tests > > +static void test_winregion() > +{ > + HWND hwnd; > + RECT r; > + int ret; > + HRGN hrgn; > + > + hwnd = CreateWindowExA(0, "static", NULL, WS_VISIBLE, 10, 10, 10, 10, NULL, 0, 0, NULL); > + if (pGetWindowRgnBox) > + { > + /* NULL prect */ > + SetLastError(0xdeadbeef); > + ret = pGetWindowRgnBox(hwnd, NULL); > + ok( ret == ERROR, "Expected ERROR, got %d\n", ret); > + ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError()); > + > + hrgn = CreateRectRgn(2, 3, 10, 15); > + ok( hrgn != NULL, "Region creation failed\n"); > + if (hrgn) > + { > + SetWindowRgn(hwnd, hrgn, FALSE); > + > + SetLastError(0xdeadbeef); > + ret = pGetWindowRgnBox(hwnd, NULL); > + ok( ret == ERROR, "Expected ERROR, got %d\n", ret); > + ok( GetLastError() == 0xdeadbeef, "Expected , got %d\n", GetLastError()); > + > + r.left = r.top = r.right = r.bottom = 0; > + ret = pGetWindowRgnBox(hwnd, &r); > + ok( ret == SIMPLEREGION, "Expected SIMPLEREGION, got %d\n", ret); > + ok( r.left == 2 && r.top == 3 && r.right == 10 && r.bottom == 15, > + "Expected (2,3,10,15), got (%d,%d,%d,%d)\n", r.left, r.top, > + r.right, r.bottom); > + DeleteObject(hrgn); > + } > + } > + else > + win_skip("GetWindowRgnBox not supported\n"); > + > + DestroyWindow(hwnd); > +} > + Why not test for pGetWindowRgnBox at the beginning and return when not available (including the win_skip() of course). That will get rid of the big indented block. -- Cheers, Paul.

2 1

Re: gdi32: don't compile printdtv16 on 64-bit
by Detlef Riekenberg April 1, 2009

April 1, 2009

On Di, 2009-03-24 at 22:19 -0500, Austin English wrote: > +@ stdcall -i386 WriteSpool16(long ptr long) You disable Printing in Wine with that. -- By by ... Detlef

1 0

Re: mshtml/tests: Fix tests on Windows
by Ge van Geldorp April 1, 2009

April 1, 2009

> From: Reece Dunn <msclrhd(a)googlemail.com> > 2009/4/1 Ge van Geldorp <ge(a)gse.nl>: > > Modify load_state only in ReadyState_Changed callback. > > > > Changelog: > > ?Fix tests on Windows > > > > --- > > ?dlls/mshtml/tests/htmldoc.c | ? 28 +++++++++++++++++++++++----- > > ?1 files changed, 23 insertions(+), 5 deletions(-) > > ?mode change 100644 => 100755 dlls/mshtml/tests/htmldoc.c > > Is there a reason for the mode change? > > - Reece No, there isn't. Not sure how that happened, might be because I edited that file using Visual Studio over Samba. I'll be more careful next time. Ge.

1 0

Students, get in your GSoC proposals NOW.
by Kai Blin April 1, 2009

April 1, 2009

Hi folks, Google has asked the mentoring orgs to remind students to submit their applications now rather than later, so Google can plan ahead better. You still can edit your proposals up until the deadline. Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

1 0

Re: mshtml/tests: Fix tests on Windows
by Reece Dunn April 1, 2009

April 1, 2009

2009/4/1 Ge van Geldorp <ge(a)gse.nl>: > Modify load_state only in ReadyState_Changed callback. > > Changelog: > Fix tests on Windows > > --- > dlls/mshtml/tests/htmldoc.c | 28 +++++++++++++++++++++++----- > 1 files changed, 23 insertions(+), 5 deletions(-) > mode change 100644 => 100755 dlls/mshtml/tests/htmldoc.c Is there a reason for the mode change? - Reece

1 0

Re: advapi32/tests: Skip some tests using English names when running on non-English locales
by Paul Vriens April 1, 2009

April 1, 2009

Ge van Geldorp wrote: > Account names are localized. Similar to existing skip in line 1806. > > Changelog: > Skip some tests using English names when running on non-English locales > > --- > dlls/advapi32/tests/security.c | 45 > ++++++++++++++++++++++----------------- > 1 files changed, 25 insertions(+), 20 deletions(-) > > > > > > ------------------------------------------------------------------------ > > Hi Ge, Aric sent a patch yesterday to address this: http://www.winehq.org/pipermail/wine-patches/2009-March/071373.html Besides that I don't think there is a need for this big indented block. You could have just done : if() { skip() return; } -- Cheers, Paul.

1 0