January 2009 - Wine-devel - list.winehq.org

kernel32: fix cpu detection on NetBSD
by Austin English 19 Jan '09

19 Jan '09

I submitted OpenBSD's patch for CPU detection a while back (http://www.winehq.org/pipermail/wine-patches/2009-January/067002.html) Francois sent a 'more correct' one (http://www.winehq.org/pipermail/wine-patches/2009-January/067382.html) but that one is broken on NetBSD/OpenBSD (http://bugs.winehq.org/show_bug.cgi?id=16927) With the below changes, it works again, but I'm not sure it's correct. Comments appreciated: diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 95ac469..5bd3a38 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -547,7 +547,7 @@ VOID WINAPI GetSystemInfo( #elif defined (__NetBSD__) { int mib[2]; - int value; + int value[2]; size_t val_len; char model[256]; char *cpuclass; @@ -578,7 +579,7 @@ VOID WINAPI GetSystemInfo( mib[1] = HW_NCPU; val_len = sizeof(value); if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) - if (value > cachedsi.dwNumberOfProcessors) + if (value[0] > cachedsi.dwNumberOfProcessors) cachedsi.dwNumberOfProcessors = value[0]; mib[1] = HW_MODEL; val_len = sizeof(model)-1; -- -Austin

3 11

Re: libs/wine/Makefile.in: replace `wine` with @PACKAGE_NAME@
by Detlef Riekenberg 19 Jan '09

19 Jan '09

On Fr, 2009-01-16 at 20:51 +0300, Vitaly Lipatov wrote: > - version=`(GIT_DIR=$(TOPSRCDIR)/.git git describe HEAD > 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -n -e '$$s/$.* > $/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - > $@) || echo $$version >$@ || ($(RM) $@ && exit 1) > + version=`(GIT_DIR=$(TOPSRCDIR)/.git git describe HEAD > 2>/dev/null || echo "@PACKAGE_NAME@ @PACKAGE_VERSION@") Your patch change also the minus to a space -- By by ... Detlef

7 12

request for packagers - icon for builtin wine internet explorer
by Steven Edwards 19 Jan '09

19 Jan '09

Hi, Do you guys that package Wine mind adding Wine Internet Explorer to your Wine program group? I think it would be nice to encourage more users install gecko and test builtin IE rendering and having the shortcut would save them a bit of trouble. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

3 2

Re: urlmon/tests: Fix protocol tests when proxy is configured
by Ge van Geldorp 19 Jan '09

19 Jan '09

Hi Jacek, > From: Jacek Caban <jacek(a)codeweavers.com> > Subject: Re: urlmon/tests: Fix protocol tests when proxy is configured > > Ge van Geldorp wrote: > > There is a large amount of proxy configurations possible on > > Windows (WPAD, proxy.pac, fixed proxy values), which might behave > > differently on a second run of the protocol test compared to the > > first run. These configurations influence when/how > > IInternetProtocolSink methods are called. For example, > > with a standard, direct connection you'll get the following > > ReportProgress notifications during the https test: > > BINDSTATUS_FINDINGRESOURCE > > BINDSTATUS_CONNECTING > > BINDSTATUS_SENDINGREQUEST > > BINDSTATUS_ACCEPTRANGES > > BINDSTATUS_MIMETYPEAVAILABLE > > However, when you run the protocol test for the second time > > on a machine with a fixed proxy server configured, you'll only > > get these notifications: > > BINDSTATUS_SENDINGREQUEST > > BINDSTATUS_ACCEPTRANGES > > BINDSTATUS_MIMETYPEAVAILABLE > > > > When a proxy is used, the BINDSTATUS_FINDINGRESOURCE and > > BINDSTATUS_CONNECTING notifications report the hostname/ip > > address of the proxy server, not the end destination. > > I can't see this behavior in tests results, where do you see > them? Which IE version is it? This started when investigated the failures reported here: http://test.winehq.org/data/8b10dd2a8daed738527f92aa89104c8647e4535c/2003_gv g-w2k3r2sesp2/urlmon:protocol.html. This is a Windows 2003 R2 Standard Edition SP2 machine with IE6. The status 32 shown there is BINDSTATUS_PROXYDETECTING. It turns out that on this particular machine "Automatically detect settings" (aka WPAD) was activated. The full sequence of of ReportProtress notifications for the https test was: BINDSTATUS_FINDINGRESOURCE BINDSTATUS_CONNECTING BINDSTATUS_PROXYDETECTING BINDSTATUS_CONNECTING BINDSTATUS_SENDINGREQUEST BINDSTATUS_ACCEPTRANGES BINDSTATUS_MIMETYPEAVAILABLE I then started experimenting on that machine with various proxy settings. I found that this sequence happens on the first run with WPAD configured but no wpad.mydomain.mytld available. On a second run it seems the info that no wpad was available was cached, I got "standard" behavior. If I configured a wpad.mydomain.mytld domain the sequence would also revert back to "standard" on the first run (whether there was a wpad.dat file available from that host or not didn't seem to matter, there just needs to be a wpad.mydomain.mytld DNS entry). When a proxy was indeed configured via WPAD, the BINDSTATUS_FINDINGRESOURCE and BINDSTATUS_CONNECTING notifications reported the hostname/ip address of the proxy server. Next I experimented with "Use automatic configuration script" (aka proxy.pac). I found that in that case the "standard" notification sequence was used, but still with the proxy server hostname/ip address. Finally I set a manual proxy server. In that case, the first time I run the test I get the "standard" sequence, but on the second (and later) runs I see the very minimal sequence mentioned in my original post. So most of the behavior was seen in one-off experimentation. If you want, I can set up some machines to report some of the behaviors to test.winehq.org. > Also, you have to make sure that each SET_EXPECT is followed by > CHECK_CALLED (or CLEAR_CALLED if you want to ignore that function was > not called). Ok, thanks, I'll take care of that. Ge.

1 0

Re: d3dxof: Fix object files size limitation
by Alexandre Julliard 19 Jan '09

19 Jan '09

Christian Costa <titan.costa(a)wanadoo.fr> writes: > commit 2ddacc839326d96f6508e8e431308160979c7082 > Author: Christian Costa <titan.costa(a)wanadoo.fr> > Date: Mon Jan 19 12:04:09 2009 +0100 > > Fix object files size limitation. If you need to parse such large files using a file mapping would be better than reading it into a buffer. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [7/7] d3d9: test table fog and exp fog in the shader fog test
by Henri Verbeet 19 Jan '09

19 Jan '09

Since you're going to resend this one anyway: > From: unknown <stefan(a).(none)> Your From: line is broken. > - 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, > + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, Any reason for changing the indentation here? I could understand changing it for consistency, but that's not really the case here.

2 1

Re: [1/7] WineD3D: Don't single-allocate new gl shaders
by Henri Verbeet 19 Jan '09

19 Jan '09

2009/1/19 Stefan Dösinger <stefan(a)codeweavers.com>: > + shader->shader_array_size += max(1, old_size * 0.5); I don't know for sure if the compiler is able to get rid of the floating point multiplication, but wouldn't a right shift or divide by 2 work at least as well? > + shader->gl_shaders = HeapReAlloc(GetProcessHeap(), 0, old_array, > + (shader->shader_array_size + 1) * sizeof(*shader->gl_shaders)); This looks more complicated than it has to be. It's easier to just change "old_size <= shader->num_gl_shaders" into "old_size < shader->num_gl_shaders" and drop the +1 here. Also note that "old_array" isn't particularly useful here, you overwrite shader->gl_shaders regardless of whether the allocation fails or succeeds. The typical way to do this would be: if (shader->num_gl_shaders >= shader->shader_array_size) { UINT new_size; struct ps_compiled_shader *new_array; if (shader->gl_shaders) { new_size = shader->shader_array_size << 1; new_array = HeapReAlloc(GetProcessHeap(), 0, shader->gl_shaders, new_size * sizeof(*new_array)); } else { new_size = 1; new_array = HeapAlloc(GetProcessHeap(), 0, new_size * sizeof(*new_array)); } if (!new_array) { ERR("Out of memory\n"); return 0; } shader->shader_array_size = new_size; shader->gl_shaders = new_array; } This applies to 4/7 as well.

2 1

Re: [4/7] WineD3D: Put vertex shader duplication infrastructure in place
by Henri Verbeet 19 Jan '09

19 Jan '09

2009/1/19 Stefan Dösinger <stefan(a)codeweavers.com>: > @@ -1860,14 +1861,19 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { > This->shader_array_size = 0; When did this line get added? It's not in 1/7.

2 1

Re: urlmon/tests: Fix protocol tests when proxy is configured
by Jacek Caban 19 Jan '09

19 Jan '09

Hi, Ge van Geldorp wrote: > There is a large amount of proxy configurations possible on Windows (WPAD, > proxy.pac, fixed proxy values), which might behave differently on a second > run of the protocol test compared to the first run. These configurations > influence when/how IInternetProtocolSink methods are called. For example, > with a standard, direct connection you'll get the following ReportProgress > notifications during the https test: > BINDSTATUS_FINDINGRESOURCE > BINDSTATUS_CONNECTING > BINDSTATUS_SENDINGREQUEST > BINDSTATUS_ACCEPTRANGES > BINDSTATUS_MIMETYPEAVAILABLE > However, when you run the protocol test for the second time on a machine > with a fixed proxy server configured, you'll only get these notifications: > BINDSTATUS_SENDINGREQUEST > BINDSTATUS_ACCEPTRANGES > BINDSTATUS_MIMETYPEAVAILABLE > > When a proxy is used, the BINDSTATUS_FINDINGRESOURCE and > BINDSTATUS_CONNECTING notifications report the hostname/ip address of the > proxy server, not the end destination. > > I can't see this behavior in tests results, where do you see them? Which IE version is it? Also, you have to make sure that each SET_EXPECT is followed by CHECK_CALLED (or CLEAR_CALLED if you want to ignore that function was not called). Jacek

1 0

Re: mshtml: Implement IHTMLDocument5 createComment (try 3)
by Jacek Caban 19 Jan '09

19 Jan '09

HI Alistair, Alistair Leslie-Hughes wrote: > Hi, > Removed unused variables. > > Changelog: > mshtml: Implement IHTMLDocument5 createComment + else + { + win_skip("Could not get IHTMLDocument5, probably too old IE\n"); + } There is no need for skip here. These tests will be skipped in create_document call if IHTMLDocument5 is not available anyways. Jacek

1 0