August 2008 - Wine-devel - list.winehq.org

Re: appwiz.cpl [try 4]: Add Russian translation
by Nikolay Sivov 29 Aug '08

29 Aug '08

Vladimir Pankratov wrote: > + CONTROL "Контактное лицо:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 53, 60, 8 Are you sure about this? This field usually contains e-mail address of support system or something like that, but not a personal contact information. Btw, how is it named in Russian Windows XP?

1 0

Re: Spore patch to fix UI and Part descriptions
by Rico Schüller 29 Aug '08

29 Aug '08

Andrew Fenn schrieb: > I made a new patch this time including a test. > > I put in some extra checking in SetScissorRect making sure that if > rect was null or it was an invalid rectangle that it was returned as > invalid as it should be. > > I'm not able to do a test on windows so if anyone does one please let > me know if there are any problems. Also please tell me if you spot any > problems with this patch. > > Thanks, > Andrew > > ------------------------------------------------------------------------ > > + RECT rect = {0, 0, 0, 0}; > + hr = IDirect3DDevice9_SetScissorRect(device, &rect); > + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %08x\n", hr); Sorry that I led you in the wrong direction but these tests didn't pass on windows! Also please read the comment to the bug, where I attached my patch. My suggestion which I made there isn't true! The real background is that wine sets the default scissor rect to {0,0,0,0} but on windows it is set to another size, I have written a patch for that, but it looks like there is something incomplete (see http://www.winehq.org/pipermail/wine-patches/2008-August/059891.html ). When the game is starting it retrieves the initial value with GetScissorRect which is in wine the null-rect. And so nothing is rendered to the screen. Cheers Rico

2 3

Re: wined3d/d3d9: Set the initial scissorrect to the dimesions of the backbuffer from the first swapchain of the device
by Andrew Fenn 29 Aug '08

29 Aug '08

This works nicely for me. Spore displays correctly now with this patch and latest git. I also tried your test case on XP and it passed. On Sun, Aug 24, 2008 at 1:09 AM, Rico Schüller <kgbricola(a)web.de> wrote: > Hi, > > this is the second try for this patch. I've renamed it because the previous > description was wrong. > > This patch adds a test for the initial scissorrect values and fixes the > wrong behaviour in wine. > > This solves partly bug 13988. > > > Cheers > Rico > > From 8f72f697284122cd3d691dc8927b127a888f6bde Mon Sep 17 00:00:00 2001 > From: =?utf-8?q?Rico=20Sch=C3=BCller?= <kgbricola(a)web.de> > Date: Sat, 23 Aug 2008 19:59:39 +0200 > Subject: [PATCH] wined3d/d3d9: Set the initial scissorrect to the dimesions > of the backbuffer from the first swapchain of the device > > --- > dlls/d3d9/tests/device.c | 104 > +++++++++++++++++++++++++++++++++++++++++++++ > dlls/wined3d/stateblock.c | 21 +++++++++ > 2 files changed, 125 insertions(+), 0 deletions(-) > > diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c > index 3164b81..a430248 100644 > --- a/dlls/d3d9/tests/device.c > +++ b/dlls/d3d9/tests/device.c > @@ -2016,6 +2016,109 @@ static void test_display_formats() > if(d3d9) IDirect3D9_Release(d3d9); > } > > +static void test_scissor_size(void) > +{ > + IDirect3D9 *d3d9_ptr = 0; > + int i; > + static const struct { > + int winx; int winy; int backx; int backy; int backswap1x; int > backswap1y; BOOL window; > + } scts[] = { /* scissor tests */ > + {800, 600, 640, 480, 1024, 768, TRUE}, > + {800, 600, 640, 480, 1024, 768, FALSE}, > + {640, 480, 800, 600, 1024, 768, TRUE}, > + {640, 480, 800, 600, 1024, 768, FALSE}, > + > + {1024, 768, 640, 480, 800, 600, TRUE}, > + {1024, 768, 640, 480, 800, 600, FALSE}, > + {640, 480, 1024, 768, 800, 600, TRUE}, > + {640, 480, 1024, 768, 800, 600, FALSE}, > + > + {1024, 768, 800, 600, 640, 480, TRUE}, > + {1024, 768, 800, 600, 640, 480, FALSE}, > + {800, 600, 1024, 768, 640, 480, TRUE}, > + {800, 600, 1024, 768, 640, 480, FALSE}, > + }; > + > + d3d9_ptr = pDirect3DCreate9(D3D_SDK_VERSION); > + ok(d3d9_ptr != NULL, "Failed to create IDirect3D9 object\n"); > + if (!d3d9_ptr){ > + skip("Failed to create IDirect3D9 object\n"); > + return; > + } > + > + for(i=0; i<sizeof(scts)/sizeof(scts[0]); i++) { > + IDirect3DDevice9 *device_ptr = 0; > + D3DPRESENT_PARAMETERS present_parameters; > + HRESULT hr; > + WNDCLASS wc = {0}; > + HWND hwnd = 0; > + IDirect3DSwapChain9 *swapchain1 = 0; > + RECT scissorrect; > + > + wc.lpfnWndProc = DefWindowProc; > + wc.lpszClassName = "d3d9_test_wc"; > + RegisterClass(&wc); > + > + hwnd = CreateWindow("d3d9_test_wc", "d3d9_test", > + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, > scts[i].winx, scts[i].winy, 0, 0, 0, 0); > + > + ZeroMemory(&present_parameters, sizeof(present_parameters)); > + present_parameters.Windowed = scts[i].window; > + present_parameters.hDeviceWindow = hwnd; > + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; > + present_parameters.BackBufferWidth = scts[i].backx; > + present_parameters.BackBufferHeight = scts[i].backy; > + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; > + present_parameters.EnableAutoDepthStencil = TRUE; > + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; > + > + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, > D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, > D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); > + if(FAILED(hr)) { > + present_parameters.AutoDepthStencilFormat = D3DFMT_D16; > + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, > D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, > D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); > + if(FAILED(hr)) { > + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, > D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, > D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); > + } > + } > + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, > "IDirect3D_CreateDevice returned: %08x\n", hr); > + > + if (!device_ptr) > + { > + DestroyWindow(hwnd); > + skip("Creating the device failed\n"); > + goto err_out; > + } > + > + /* add a swapchain only in window mode */ > + if(scts[i].window) > + { > + present_parameters.BackBufferWidth = scts[i].backswap1x; > + present_parameters.BackBufferHeight = scts[i].backswap1y; > + hr = IDirect3DDevice9_CreateAdditionalSwapChain(device_ptr, > &present_parameters, &swapchain1); > + ok(hr == D3D_OK, "IDirect3DDevice9_CreateAdditionalSwapChain > failed in test %i with: %08x\n", i, hr); > + } > + > + /* Check for the default scissor rect size */ > + hr = IDirect3DDevice9_GetScissorRect(device_ptr, &scissorrect); > + ok(hr == D3D_OK, "IDirect3DDevice9_GetScissorRect failed with: > %08x\n", hr); > + ok(scissorrect.right == scts[i].backx && scissorrect.bottom == > scts[i].backy && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect > missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, > scissorrect.bottom, scts[i].backx, scts[i].backy); > + > + if(swapchain1) IDirect3DSwapChain9_Release(swapchain1); > + if(device_ptr) { > + ULONG ref; > + > + ref = IDirect3DDevice9_Release(device_ptr); > + DestroyWindow(hwnd); > + ok(ref == 0, "The device was not properly freed: refcount > %u\n", ref); > + } > + } > + > +err_out: > + if(d3d9_ptr) IDirect3D9_Release(d3d9_ptr); > + return; > +} > + > + > START_TEST(device) > { > HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); > @@ -2045,5 +2148,6 @@ START_TEST(device) > test_vertex_buffer_alignment(); > test_lights(); > test_set_stream_source(); > + test_scissor_size(); > } > } > diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c > index e8ff6c1..e953470 100644 > --- a/dlls/wined3d/stateblock.c > +++ b/dlls/wined3d/stateblock.c > @@ -1037,6 +1037,11 @@ static HRESULT WINAPI > IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat > DWORD d; > } tmpfloat; > unsigned int i; > + IWineD3DSwapChain *swapchain; > + IWineD3DSurface *backbuffer; > + WINED3DSURFACE_DESC desc = {0}; > + UINT width, height; > + RECT scissorrect; > > /* Note this may have a large overhead but it should only be executed > once, in order to initialize the complete state of the device and > @@ -1239,6 +1244,22 @@ static HRESULT WINAPI > IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat > This->textures[i] = NULL; > } > > + /* Set the default scissor rect values */ > + desc.Width = &width; > + desc.Height = &height; > + > + IWineD3DDevice_GetSwapChain(device, 0, &swapchain); > + IWineD3DSwapChain_GetBackBuffer(swapchain, 0, > WINED3DBACKBUFFER_TYPE_MONO, &backbuffer); > + IWineD3DSurface_GetDesc(backbuffer, &desc); > + IWineD3DSurface_Release(backbuffer); > + IWineD3DSwapChain_Release(swapchain); > + > + scissorrect.left = 0; > + scissorrect.right = width; > + scissorrect.top = 0; > + scissorrect.bottom = height; > + IWineD3DDevice_SetScissorRect(device, &scissorrect); > + > TRACE("-----------------------> Device defaults now set up...\n"); > return WINED3D_OK; > } > -- > 1.5.5.1 > > > > >

1 0

Re: Vertex Shader Modes > 4 error fix
by Henri Verbeet 29 Aug '08

29 Aug '08

2008/8/29 Chris Ahrendt <celticht32(a)aol.com>: > This is a patch to correct a vertex shader error that is caused by > an error in dlls/wined3d/drawprim.c > > In the function drawStridedSlow > > currently it only handles 4 modes with this fix it handles the 16 defined > nodes in the win API.. > It's not that easy.

2 1

Re: mpr: Improve stubs for WNetGetUniversalName.
by James Hawkins 28 Aug '08

28 Aug '08

On Wed, Aug 27, 2008 at 5:32 PM, Sergey Khodych <khodych(a)gmail.com> wrote: > > From 1dec9750bed16eaeff97cf88374954d5ebde383c Mon Sep 17 00:00:00 2001 > From: Sergey Khodych <khodych(a)gmail.com> > Date: Thu, 28 Aug 2008 01:00:19 +0300 > Subject: mpr: Improve stubs for WNetGetUniversalName. > There are several things wrong with this patch: * It's way too large. Please split it up. * No tests. You need to write tests to back up these changes. * You're changing the style of the file. The original file does not have spaces before or after parentheses. http://wiki.winehq.org/SubmittingPatches -- James Hawkins

2 2

Re: resend: kernel32: modify DeleteFile to fail on directories
by Vincent Povirk 28 Aug '08

28 Aug '08

I think you should avoid the GetFileAttributes call. It adds extra steps (including potentially an extra case-insensitive lookup), and the file attributes could change between that call and NtDeleteFile. It seems like it should be possible to do this without forcing ntdll to search for the file multiple times. Vincent Povirk On Thu, Aug 28, 2008 at 8:57 AM, Jeff Zaroyko <jeffzaroyko(a)gmail.com> wrote: > combining everything in one patch as Paul Vriens suggested, probably > makes more sense. > > -Jeff > > > >

1 0

improvement to patchwatcher
by Vijay Kiran Kamuju 28 Aug '08

28 Aug '08

Hi, Is it possible to add column to the patchwatcher, whether the patch has been rejected/accepted/pending into git. Also please skip the mail entries if they do have "Re:" in the subject and do not have any patch. Mark the corresponding patch to rejected/needs more work. Thanks, VJ --------------------------------------------------------------------------------------------------------------- Fred Allen - "California is a fine place to live - if you happen to be an orange."

9 18

Patch workflow recommendations (was: Re: shlwapi ...)
by Markus Hitter 28 Aug '08

28 Aug '08

Am 26.08.2008 um 16:46 schrieb Dan Kegel: > I updated http://wiki.winehq.org/SubmittingPatches with that info > (and lots more, too) The git sample commands there differ from the ones given in <http:// wiki.winehq.org/GitWine#head- f7a29e7ed999b5924748a60c5a1cd4a019032d26> by the --keep-subject flag. Which one would be the better one? Citing the web page: > If your patch isn't committed in a day or two, improve it (perhaps > by adding more tests) and resend. Or continue on with more changes, > and send a longer patch series next time. Judging by my recent experience, how about: > If your patch isn't committed in a day ot two, first have a look at > the patchwatcher status page, wether your patch were approved. If > it was, you might want to ask on the wine-devel mailing list on how > it could be improved. Especially with your first patches, it might > take a resend or two to get it accustomed to the Wine development > process. I'd avoid recommending longer patch series. MarKus - - - - - - - - - - - - - - - - - - - Dipl. Ing. Markus Hitter http://www.jump-ing.de/

2 1

Re: kernel32/winerror [try 3]: Add Russian translation
by Vitaliy Margolen 28 Aug '08

28 Aug '08

Vladimir Pankratov wrote: > Hello. > > Added Russian translation for winerrors. > > Added dlls/kernel32/nls/winerror_rus.mc file. > Changed files: > dlls/kernel32/kernel.rc > dlls/kernel32/Makefile.in > The character encoding is wrong. The patch using cp866 while it should be cp1251. Please correct this problem and don't resend your patch until you fix it. Vitaliy.

1 0

Re: [3/3] d3dxof: Add basic tests.
by Paul Vriens 28 Aug '08

28 Aug '08

Hi Christian, Could you have a look at the test results on http://test.winehq.org for the d3dxof tests? They all (if run) show: d3dxof.c:84: Test failed: IDirectXFileImpl_RegisterTemplates: 88760362 Whereas on Wine the tests succeed ! -- Cheers, Paul.

2 1