Re: ntdll: return some sane values for the FileFsVolumeInformation class members in NtQueryVolumeInformationFile.
On 11/23/2010 01:05 PM, Louis Lenders wrote:
This patch makes previously tests pass and fixes
http://bugs.winehq.org/show_bug.cgi?id=21466. (A search through the registry
on windows showed that at least the VolumeLabel and SerialNumber are not
stored in the registry, so we just return some sane values)
+static const WCHAR volumelabelW[] =
{'w','i','n','e','_','d','i','s','k',0};
+
+info->VolumeSerialNumber = 0x15112000;
You should take that info from the volume (as it's done now in
GetVolumeInformation) instead of hard-coded invalid values. I'm guessing
some of that kernel32 functionality will need to be moved to ntdll.
Vitaliy.
Re: services: Allow one more combined service type
On 11/23/2010 11:17 PM, André Hentschel wrote: Am 23.11.2010 22:31, schrieb Paul Vriens: Hi André, On 11/23/2010 08:45 PM, André Hentschel wrote: I have a service with type 3, this patch allows him to run. It runs perfectly and does not produce FIXMEs or ERRORs, so it's fine. --- Do you have some more information? It's not possible (at least on XP) to create a service that has 'SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER'. After that i tested a bit the service installer of the app (WinIoEx, can be found somewhere at sourceforge) and it seems the ServiceType in the Registry is sometimes set to 1(as the app wants it to) and sometimes to 3(wtf?). Can you confirm this? The regkey is HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\WINIOEX\Type i'm running a wow64 setup Couldn't reproduce (wow64 as well) but: looking at the source of that app I see that 'Type' is manually set to 3 (bug in the app I'd say) and after that the CreateService should set it to 1. Not sure where things go wrong but this patch is definitely not correct. -- Cheers, Paul.
Re: [1/2] opengl32/tests: Add tests for special case of SetPixelFormat
On Sun, Nov 21, 2010 at 8:23 PM, Roderick Colenbrander
wrote:
> On Sat, Nov 20, 2010 at 3:17 AM, Stefan Dösinger
> wrote:
>> Am Donnerstag 18 November 2010, 16:41:53 schrieb Matijn Woudt:
>>> There's only 1 difference, the first one really shows a window with
>>> all the triangle's, like it should. Second one doesn't show anything.
>>> So all the functions don't fail, they just don't seem to do anything.
>> I think we should set up the swapchain to use a dummy window, GL bitmap or
>> WGL
>> pbuffer and turn on render to fbo.
>>
>
> That's what I would suggest as well, but remove GL bitmap from the set
> of options. It means software GDI on windows and on Wine it means
> indirect rendering which can be bad. The pbuffer would be quite
> reliable but it is not around everywhere, if a dummy window works fine
> lets try that first.
>
> Roderick
>
I have created a patch that uses a dummy window. Please let me know if
this is what you had in mind. It works for the game I created the
original patch for.
Matijn
From 9fa163c4f47355fc3f4940e1c966aa93ba0c64e3 Mon Sep 17 00:00:00 2001
From: Matijn Woudt
Date: Tue, 23 Nov 2010 23:51:06 +0100
Subject: d3d9: Create dummy window if focus window is the desktop window
---
dlls/d3d9/Makefile.in|2 +-
dlls/d3d9/d3d9_private.h |2 ++
dlls/d3d9/device.c | 12
3 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in
index 9d5a4d8..ed949d3 100644
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@@ -1,6 +1,6 @@
MODULE= d3d9.dll
IMPORTLIB = d3d9
-IMPORTS = dxguid uuid wined3d
+IMPORTS = dxguid uuid wined3d user32
C_SRCS = \
buffer.c \
diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index 02f9c20..7d8d45e 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -178,6 +178,8 @@ typedef struct IDirect3DDevice9Impl
unsigned int numConvertedDecls, declArraySize;
BOOL notreset;
+
+HWND dummy_window;
} IDirect3DDevice9Impl;
HRESULT device_init(IDirect3DDevice9Impl *device, IWineD3D *wined3d, UINT
adapter, D3DDEVTYPE device_type,
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 349bde4..ddf431d 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -275,6 +275,7 @@ static ULONG WINAPI DECLSPEC_HOTPATCH
IDirect3DDevice9Impl_Release(LPDIRECT3DDEV
IWineD3DDevice_ReleaseFocusWindow(This->WineD3DDevice);
IWineD3DDevice_Release(This->WineD3DDevice);
wined3d_mutex_unlock();
+ if(This->dummy_window) DestroyWindow(This->dummy_window);
HeapFree(GetProcessHeap(), 0, This);
}
@@ -3255,6 +3256,17 @@ HRESULT device_init(IDirect3DDevice9Impl *device,
IWineD3D *wined3d, UINT adapte
device->device_parent_vtbl = &d3d9_wined3d_device_parent_vtbl;
device->ref = 1;
+if(focus_window == GetDesktopWindow()) {
+WNDCLASSA wc = {0};
+wc.lpfnWndProc = DefWindowProcA;
+wc.lpszClassName = "wine_d3d9_dummy_window";
+RegisterClassA(&wc);
+
+focus_window = CreateWindowA("wine_d3d9_dummy_window",
"wine_d3d9_dummy_window", WS_POPUP, 0, 0, 640, 480, 0, 0, 0, 0);
+parameters->hDeviceWindow = focus_window;
+device->dummy_window = focus_window;
+}
+
if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu();
wined3d_mutex_lock();
--
1.7.0.4
Re: services: Allow one more combined service type
Am 23.11.2010 22:31, schrieb Paul Vriens: > Hi André, > > On 11/23/2010 08:45 PM, André Hentschel wrote: >> I have a service with type 3, this patch allows him to run. >> It runs perfectly and does not produce FIXMEs or ERRORs, so it's fine. >> --- > > Do you have some more information? > > It's not possible (at least on XP) to create a service that has > 'SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER'. > After that i tested a bit the service installer of the app (WinIoEx, can be found somewhere at sourceforge) and it seems the ServiceType in the Registry is sometimes set to 1(as the app wants it to) and sometimes to 3(wtf?). Can you confirm this? The regkey is HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\WINIOEX\Type i'm running a wow64 setup -- Best Regards, André Hentschel
Re: services: Allow one more combined service type
Hi André, On 11/23/2010 08:45 PM, André Hentschel wrote: I have a service with type 3, this patch allows him to run. It runs perfectly and does not produce FIXMEs or ERRORs, so it's fine. --- Do you have some more information? It's not possible (at least on XP) to create a service that has 'SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER'. -- Cheers, Paul.
Re: wined3d: don't set cube and volume POW2 caps if np2 textures are supported
Am Dienstag 23 November 2010, 17:22:50 schrieb Henri Verbeet: > On 23 November 2010 17:10, Stefan Dösinger wrote: > > Am Dienstag 23 November 2010, 16:52:09 schrieb Henri Verbeet: > >> Looks like a flaw in the d3dx9_36 test, it isn't taking the POW2 cap > >> into account. I would have expected that to fail the other way around > >> though, cards that can't do npot textures should be pretty rare. > > > > If the test was broken I'd expect it to fail on Windows, but it doesn't: > > > > http://test.winehq.org/data/892502479c3acf64257e19ec4aac113024642f4d/xp_W > > yldBOT1- wxp-32b-ie6/d3dx9_36:surface.html > > That's because that's a different test. You are right, I must have jumped a line up when I navigated through the test data. I should have noticed that when I pasted the link. signature.asc Description: This is a digitally signed message part.
Re: crypt32/tests: Add tests for decoding enveloped messages.
Thank you, I looked at test results and sent some patches. > Could you have a look? If you need me to test something on my boxes > (pv-winme and pv-nt4srvr) let me know (not all testbot machines fail here).
Trying to figure out the website redirects
Why does http://www.winehq.org/todo redirect to http://wiki.winehq.org/KnownIssues ? The only list of redirects I see in the source is in include/htaccess.sample, however it lists /todo as redirecting to http://wiki.winehq.org/TodoList (which itself isn't a redirect) Are there redirects on the server that aren't in the git source? -Scott Ritchie
COM implementation clean up
Hi all, As many of you probably know, we currently have no standard way for implementing COM objects in Wine. We use different techniques all over the place. Some of them are better, other are worse or even ugly. Together with Alexandre, we've chosen the technique that we believe is the best known ATM. I've described it on the wiki page: http://wiki.winehq.org/COMGuideline There is a janitorial task to change all our existing code to follow the guideline. Michael is going to use his scripting magics to do the work. The plan is that all the new code should follow the guideline, so if you are touching COM stuff in Wine, please get familiar with it. Any comments are welcomed. Cheers, Jacek
Re: wined3d: don't set cube and volume POW2 caps if np2 textures are supported
On 23 November 2010 17:10, Stefan Dösinger wrote: > Am Dienstag 23 November 2010, 16:52:09 schrieb Henri Verbeet: >> Looks like a flaw in the d3dx9_36 test, it isn't taking the POW2 cap >> into account. I would have expected that to fail the other way around >> though, cards that can't do npot textures should be pretty rare. > If the test was broken I'd expect it to fail on Windows, but it doesn't: > > http://test.winehq.org/data/892502479c3acf64257e19ec4aac113024642f4d/xp_WyldBOT1- > wxp-32b-ie6/d3dx9_36:surface.html > That's because that's a different test.
Re: wined3d: don't set cube and volume POW2 caps if np2 textures are supported
2010/11/23 Stefan Dösinger : > Am Dienstag 23 November 2010, 16:52:09 schrieb Henri Verbeet: >> Looks like a flaw in the d3dx9_36 test, it isn't taking the POW2 cap >> into account. I would have expected that to fail the other way around >> though, cards that can't do npot textures should be pretty rare. > If the test was broken I'd expect it to fail on Windows, but it doesn't: > > http://test.winehq.org/data/892502479c3acf64257e19ec4aac113024642f4d/xp_WyldBOT1- > wxp-32b-ie6/d3dx9_36:surface.html > > According to > http://test.winehq.org/data/892502479c3acf64257e19ec4aac113024642f4d/xp_WyldBOT1- > wxp-32b-ie6/d3d9:visual.html > > from the same machine this card has a Geforce 8600 and is properly set up. I'd > be pretty surprised if this card doesn't support NP2 cubemaps. I don't have > such a card, but my geforce9600 supports NP2 cubemaps(which is how I became > aware of the caps difference) > > The test failing for AJ on his machine actually fails on that same Windows machine you looked at: http://test.winehq.org/data/892502479c3acf64257e19ec4aac113024642f4d/xp_WyldBOT1-wxp-32b-ie6/d3dx9_36:texture.html So, yes, it seems like the test is broken. I added it recently, didn't notice the failures before. I'll take a look.
Re: wined3d: don't set cube and volume POW2 caps if np2 textures are supported
Am Dienstag 23 November 2010, 16:52:09 schrieb Henri Verbeet: > Looks like a flaw in the d3dx9_36 test, it isn't taking the POW2 cap > into account. I would have expected that to fail the other way around > though, cards that can't do npot textures should be pretty rare. If the test was broken I'd expect it to fail on Windows, but it doesn't: http://test.winehq.org/data/892502479c3acf64257e19ec4aac113024642f4d/xp_WyldBOT1- wxp-32b-ie6/d3dx9_36:surface.html According to http://test.winehq.org/data/892502479c3acf64257e19ec4aac113024642f4d/xp_WyldBOT1- wxp-32b-ie6/d3d9:visual.html from the same machine this card has a Geforce 8600 and is properly set up. I'd be pretty surprised if this card doesn't support NP2 cubemaps. I don't have such a card, but my geforce9600 supports NP2 cubemaps(which is how I became aware of the caps difference) signature.asc Description: This is a digitally signed message part.
Re: wined3d: don't set cube and volume POW2 caps if np2 textures are supported
On 23 November 2010 16:23, Alexandre Julliard wrote: > It doesn't work here: > > ../../../tools/runtest -q -P wine -M d3dx9_36.dll -T ../../.. -p > d3dx9_36_test.exe.so texture.c && touch texture.ok > texture.c:236: Test failed: Returned mipmaps 9, expected 10 > texture.c:242: Test failed: Returned mipmaps 6, expected 7 > texture.c:381: Test failed: Returned mipmaps 9, expected 10 > make: *** [texture.ok] Error 3 > Looks like a flaw in the d3dx9_36 test, it isn't taking the POW2 cap into account. I would have expected that to fail the other way around though, cards that can't do npot textures should be pretty rare.
Re: wined3d: don't set cube and volume POW2 caps if np2 textures are supported
Stefan Dösinger writes: > From aa344834084ef89c654011804e6e2faccafe1e5e Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Stefan=20D=C3=B6singer?= > Date: Sun, 21 Nov 2010 18:08:41 +0100 > Subject: [PATCH] wined3d: don't set cube and volume POW2 caps if np2 textures > are supported It doesn't work here: ../../../tools/runtest -q -P wine -M d3dx9_36.dll -T ../../.. -p d3dx9_36_test.exe.so texture.c && touch texture.ok texture.c:236: Test failed: Returned mipmaps 9, expected 10 texture.c:242: Test failed: Returned mipmaps 6, expected 7 texture.c:381: Test failed: Returned mipmaps 9, expected 10 make: *** [texture.ok] Error 3 -- Alexandre Julliard julli...@winehq.org
Re: [include] add new macro WINELIB_NAME_W for support in the unicode functions of msvcr* dlls
Vijay Kiran Kamuju writes: > Changelog > --- > [include] add new macro WINELIB_NAME_W for support in the unicode functions > of msvcr* dlls > It helps functions like _RTC_error_fn and _CRT_RTC_INIT That's not really useful. -- Alexandre Julliard julli...@winehq.org
Re: [PATCH 1/2] msvcr90 - rename the stat64i32 functions
Vijay Kiran Kamuju writes: > [PATCH 1/2] msvcr90 - rename the stat64i32 functions Why do you need this? -- Alexandre Julliard julli...@winehq.org
Re: Patch for bug 25063 - _pclose should wait for the command processor to terminate and return it's exit status
Borut Razem writes: > +/* TODO: this shold be same as MSVCRT_MAX_FILES defined in file.c. > + The define should be moved to a common header file. Is msvcrt.h the right > one? */ > +#define MSVCRT_MAX_FILES 2048 There's no reason to use this here. -- Alexandre Julliard julli...@winehq.org
Re: wine git doesn't build on 10.6.5
On 23 November 2010 07:50, C.W.Betts wrote: > When I try to build wine git on Mac OS X 10.6.5, I get the following error > (on clang. I get similar errors using GCC): > clang -m32 -c -I../../../wine-git/./dlls/atl -I. > -I../../../wine-git/./include -I../../include -D__WINESRC__ -D_REENTRANT > -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement > -Wstrict-prototypes -Wtype-limits -Wwrite-strings -Wpointer-arith > -I/sw/include -m32 -I/sw/include -m32 -o registrar.o > ../../../wine-git/./dlls/atl/registrar.c > ../../../wine-git/./dlls/atl/registrar.c:747:8: error: use of undeclared > identifier 'CLSID_Registrar'; did you mean 'CLSID_ATLRegistrar'? > if(IsEqualGUID(&CLSID_Registrar, clsid)) > ^~~~ You need to run the following: rm dlls/atl/atliface.h and then re-run configure ./configure as the idl file (that generates that header) was moved and the build is looking for the .h file in the old place without the s/Registrar/ATLRegistrar/ change. HTH, - Reece
