November 2008 - Wine-commits

Stefan Dösinger : d3d9: Test the effect of lighting on the result alpha.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 561ebb355fa549ec0d8982260c51cbb1a40cf73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=561ebb355fa549ec0d8982260… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 31 22:21:18 2008 +0100 d3d9: Test the effect of lighting on the result alpha. --- dlls/d3d9/tests/visual.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a622d56..dd59ef4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -222,6 +222,8 @@ static void lighting_test(IDirect3DDevice9 *device) DWORD fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE; DWORD nfvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_NORMAL; DWORD color; + D3DMATERIAL9 material, old_material; + DWORD cop, carg; float mat[16] = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, @@ -337,8 +339,77 @@ static void lighting_test(IDirect3DDevice9 *device) color = getPixelColor(device, 480, 120); /* upper left quad - lit with normals */ ok(color == 0x00000000, "Lit quad with normals has color %08x\n", color); + hr = IDirect3DDevice9_GetMaterial(device, &old_material); + ok(hr == D3D_OK, "IDirect3DDevice9_GetMaterial returned %08x\n", hr); + memset(&material, 0, sizeof(material)); + material.Diffuse.r = 0.0; + material.Diffuse.g = 0.0; + material.Diffuse.b = 0.0; + material.Diffuse.a = 1.0; + material.Ambient.r = 0.0; + material.Ambient.g = 0.0; + material.Ambient.b = 0.0; + material.Ambient.a = 0.0; + material.Specular.r = 0.0; + material.Specular.g = 0.0; + material.Specular.b = 0.0; + material.Specular.a = 0.0; + material.Emissive.r = 0.0; + material.Emissive.g = 0.0; + material.Emissive.b = 0.0; + material.Emissive.a = 0.0; + material.Power = 0.0; + IDirect3DDevice9_SetMaterial(device, &material); + ok(hr == D3D_OK, "IDirect3DDevice9_SetMaterial returned %08x\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_MATERIAL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARMATERIALSOURCE, D3DMCS_MATERIAL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + + hr = IDirect3DDevice9_GetTextureStageState(device, 0, D3DTSS_COLOROP, &cop); + ok(hr == D3D_OK, "IDirect3DDevice9_GetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice9_GetTextureStageState(device, 0, D3DTSS_COLORARG1, &carg); + ok(hr == D3D_OK, "IDirect3DDevice9_GetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE | D3DTA_ALPHAREPLICATE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %08x\n", hr); + if(SUCCEEDED(hr)) { + struct vertex lighting_test[] = { + {-1.0, -1.0, 0.1, 0x8000ff00}, + { 1.0, -1.0, 0.1, 0x80000000}, + {-1.0, 1.0, 0.1, 0x8000ff00}, + { 1.0, 1.0, 0.1, 0x80000000} + }; + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed, hr=%08x\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, lighting_test, sizeof(lighting_test[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%08x\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); + } + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 320, 240); + ok(color == 0x00ffffff, "Lit vertex alpha test returned color %08x, expected 0x00ffffff\n", color); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, cop); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_DIFFUSEMATERIALSOURCE, D3DMCS_COLOR1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARMATERIALSOURCE, D3DMCS_COLOR2); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, carg); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState returned %08x\n", hr); + hr = IDirect3DDevice9_SetMaterial(device, &old_material); + ok(hr == D3D_OK, "IDirect3DDevice9_SetMaterial returned %08x\n", hr); } static void clear_test(IDirect3DDevice9 *device)

1 0

Aric Stewart : ntdll: Fix parsing of proc file. Also correct memory deallocation on the Mac.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 1865c47ff8b39b475271866bed832c78e6ba4e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1865c47ff8b39b475271866be… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 31 15:17:17 2008 -0500 ntdll: Fix parsing of proc file. Also correct memory deallocation on the Mac. --- dlls/ntdll/nt.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a8365dc..5b0c0bf 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -938,7 +938,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( sppi[i].liKernelTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_SYSTEM]; sppi[i].liUserTime.QuadPart = pinfo[i].cpu_ticks[CPU_STATE_USER]; } - vm_deallocate (mach_task_self (), (vm_address_t) pinfo, info_count); + vm_deallocate (mach_task_self (), (vm_address_t) pinfo, info_count * sizeof(natural_t)); } } #else @@ -950,10 +950,14 @@ NTSTATUS WINAPI NtQuerySystemInformation( unsigned long idle; int count; char name[10]; + char line[255]; /* first line is combined usage */ - count = fscanf(cpuinfo,"%s %u %u %u %lu",name, &usr, &nice, + if (fgets(line,255,cpuinfo)) + count = sscanf(line,"%s %u %u %u %lu",name, &usr, &nice, &sys, &idle); + else + count = 0; /* we set this up in the for older non-smp enabled kernels */ if (count == 5 && strcmp(name,"cpu")==0) { @@ -968,8 +972,11 @@ NTSTATUS WINAPI NtQuerySystemInformation( do { - count = fscanf(cpuinfo,"%s %u %u %u %lu",name, &usr, + if (fgets(line,255,cpuinfo)) + count = sscanf(line,"%s %u %u %u %lu",name, &usr, &nice, &sys, &idle); + else + count = 0; if (count == 5 && strncmp(name,"cpu",3)==0) { out_cpus --;

1 0

Alexandre Julliard : ntdll: Initialize the large address space before attaching dlls.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 4ee2d9d8eb7414ac20457e84bf91ccf52e102288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee2d9d8eb7414ac20457e84b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 3 13:23:27 2008 +0100 ntdll: Initialize the large address space before attaching dlls. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5d47b19..84dd18f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2419,12 +2419,12 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; if ((status = alloc_process_tls()) != STATUS_SUCCESS) goto error; if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error; + if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); status = wine_call_on_stack( attach_process_dlls, wm, NtCurrentTeb()->Tib.StackBase ); if (status != STATUS_SUCCESS) goto error; virtual_clear_thread_stack(); - if (nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) VIRTUAL_UseLargeAddressSpace(); return; error:

1 0

Alexandre Julliard : ntdll: Return more correct information for SystemBasicInformation and GetSystemInfo .
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 3d6313c9ce6bb1ebe10f61223ba42ddf99075370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6313c9ce6bb1ebe10f61223… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 3 13:23:48 2008 +0100 ntdll: Return more correct information for SystemBasicInformation and GetSystemInfo. --- dlls/kernel32/cpu.c | 15 ++++++++------- dlls/ntdll/nt.c | 12 +----------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/virtual.c | 19 +++++++++++++++++++ 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index a49df99..6f50009 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -367,6 +367,7 @@ VOID WINAPI GetSystemInfo( { static int cache = 0; static SYSTEM_INFO cachedsi; + SYSTEM_BASIC_INFORMATION sbi; TRACE("si=0x%p\n", si); if (cache) { @@ -375,19 +376,19 @@ VOID WINAPI GetSystemInfo( } memset(PF,0,sizeof(PF)); + NtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), NULL ); + cachedsi.dwPageSize = sbi.uPageSize; + cachedsi.lpMinimumApplicationAddress = sbi.pLowestUserAddress; + cachedsi.lpMaximumApplicationAddress = sbi.pMmHighestUserAddress; + cachedsi.dwNumberOfProcessors = sbi.uKeActiveProcessors; + cachedsi.dwAllocationGranularity = sbi.uAllocationGranularity; + /* choose sensible defaults ... * FIXME: perhaps overridable with precompiler flags? */ cachedsi.u.s.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_INTEL; - cachedsi.dwPageSize = getpagesize(); - - /* FIXME: the two entries below should be computed somehow... */ - cachedsi.lpMinimumApplicationAddress = (void *)0x00010000; - cachedsi.lpMaximumApplicationAddress = (void *)0x7FFEFFFF; cachedsi.dwActiveProcessorMask = 0; - cachedsi.dwNumberOfProcessors = 1; cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM; - cachedsi.dwAllocationGranularity = 0x10000; cachedsi.wProcessorLevel = 5; /* 586 */ cachedsi.wProcessorRevision = 0; diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5b0c0bf..37e3ee9 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -708,17 +708,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( { SYSTEM_BASIC_INFORMATION sbi; - sbi.dwUnknown1 = 0; - sbi.uKeMaximumIncrement = 0; - sbi.uPageSize = 1024; /* FIXME */ - sbi.uMmNumberOfPhysicalPages = 12345; /* FIXME */ - sbi.uMmLowestPhysicalPage = 0; /* FIXME */ - sbi.uMmHighestPhysicalPage = 12345; /* FIXME */ - sbi.uAllocationGranularity = 65536; /* FIXME */ - sbi.pLowestUserAddress = 0; /* FIXME */ - sbi.pMmHighestUserAddress = (void*)~0; /* FIXME */ - sbi.uKeActiveProcessors = 1; /* FIXME */ - sbi.bKeNumberProcessors = 1; /* FIXME */ + virtual_get_system_info( &sbi ); len = sizeof(sbi); if ( Length == len) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index a8fcf63..beffd77 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -135,6 +135,7 @@ extern NTSTATUS DIR_get_unix_cwd( char **cwd ); extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] ); /* virtual memory */ +extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ); extern NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T stack_size ); extern void virtual_clear_thread_stack(void); extern BOOL virtual_handle_stack_fault( void *addr ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 50b794c..1a27bd1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1234,6 +1234,25 @@ void virtual_init_threading(void) /*********************************************************************** + * virtual_get_system_info + */ +void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) +{ + info->dwUnknown1 = 0; + info->uKeMaximumIncrement = 0; /* FIXME */ + info->uPageSize = page_size; + info->uMmLowestPhysicalPage = 1; + info->uMmHighestPhysicalPage = 0x7fffffff / page_size; + info->uMmNumberOfPhysicalPages = info->uMmHighestPhysicalPage - info->uMmLowestPhysicalPage; + info->uAllocationGranularity = get_mask(0) + 1; + info->pLowestUserAddress = (void *)0x10000; + info->pMmHighestUserAddress = (char *)user_space_limit - 1; + info->uKeActiveProcessors = NtCurrentTeb()->Peb->NumberOfProcessors; + info->bKeNumberProcessors = info->uKeActiveProcessors; +} + + +/*********************************************************************** * virtual_alloc_thread_stack */ NTSTATUS virtual_alloc_thread_stack( void *base, SIZE_T size )

1 0

Stefan Dösinger : wined3d: Restore the fragment replacement prog after depth_blt.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 8b38533f691154b889f92ab8722332c3cce47ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b38533f691154b889f92ab87… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 1 20:11:41 2008 +0100 wined3d: Restore the fragment replacement prog after depth_blt. The current code properly enabled/disabled GL_ARB_fragment_program after a depth blit, but it did not restore the bound fragment program properly. This leads to problems if a depth blit was done between two draws without any change of the fragment processing settings. --- dlls/wined3d/arb_program_shader.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 77654d9..3edeabf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1887,21 +1887,20 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, priv->current_fprogram_id)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, pixelShader->prgId);"); - /* Enable OpenGL fragment programs */ - glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); + if(!priv->use_arbfp_fixed_func) { + /* Enable OpenGL fragment programs */ + glEnable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); + } TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); - } else { + } else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && !priv->use_arbfp_fixed_func) { + /* Disable only if we're not using arbfp fixed function fragment processing. If this is used, + * keep GL_FRAGMENT_PROGRAM_ARB enabled, and the fixed function pipeline will bind the fixed function + * replacement shader + */ + glDisable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); priv->current_fprogram_id = 0; - - if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && !priv->use_arbfp_fixed_func) { - /* Disable only if we're not using arbfp fixed function fragment processing. If this is used, - * keep GL_FRAGMENT_PROGRAM_ARB enabled, and the fixed function pipeline will bind the fixed function - * replacement shader - */ - glDisable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); - } } } @@ -1946,7 +1945,7 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) { checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);"); TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id); - } else if(!priv->use_arbfp_fixed_func) { + } else { glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } @@ -3087,6 +3086,7 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, */ GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)"); + priv->current_fprogram_id = desc->shader; if(device->shader_backend == &arb_program_shader_backend && context->last_was_pshader) { /* Reload fixed function constants since they collide with the pixel shader constants */

1 0

Stefan Dösinger : d3d: Do not restore the display mode in ddraw.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 93af8d363118b076600547622f5be57c08a300ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=93af8d363118b076600547622… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Nov 1 22:35:23 2008 +0100 d3d: Do not restore the display mode in ddraw. --- dlls/d3d8/device.c | 2 ++ dlls/d3d8/directx.c | 1 + dlls/d3d9/device.c | 1 + dlls/d3d9/directx.c | 1 + dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/swapchain_gdi.c | 2 +- include/wine/wined3d_types.h | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 04f56b8..e8df4f0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -305,6 +305,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(LPDIRECT3DD localParameters.Flags = pPresentationParameters->Flags; localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->FullScreen_PresentationInterval; + localParameters.AutoRestoreDisplayMode = TRUE; EnterCriticalSection(&d3d8_cs); hrc = IWineD3DDevice_CreateSwapChain(This->WineD3DDevice, &localParameters, &object->wineD3DSwapChain, (IUnknown*)object, D3D8CB_CreateRenderTarget, D3D8CB_CreateDepthStencilSurface, SURFACE_OPENGL); @@ -358,6 +359,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRE localParameters.Flags = pPresentationParameters->Flags; localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->FullScreen_PresentationInterval; + localParameters.AutoRestoreDisplayMode = TRUE; EnterCriticalSection(&d3d8_cs); hr = IWineD3DDevice_Reset(This->WineD3DDevice, &localParameters); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index afcb0fe..3efbab0 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -444,6 +444,7 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte localParameters.Flags = pPresentationParameters->Flags; localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->FullScreen_PresentationInterval; + localParameters.AutoRestoreDisplayMode = TRUE; if(BehaviourFlags & D3DCREATE_MULTITHREADED) { IWineD3DDevice_SetMultithreaded(object->WineD3DDevice); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8aab230..426c8ab 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -376,6 +376,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9EX iface, D3 localParameters.Flags = pPresentationParameters->Flags; localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->PresentationInterval; + localParameters.AutoRestoreDisplayMode = TRUE; EnterCriticalSection(&d3d9_cs); hr = IWineD3DDevice_Reset(This->WineD3DDevice, &localParameters); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index b605f44..b44c632 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -515,6 +515,7 @@ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9EX iface, UINT Adap localParameters.Flags = pPresentationParameters->Flags; localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->PresentationInterval; + localParameters.AutoRestoreDisplayMode = TRUE; if(BehaviourFlags & D3DCREATE_MULTITHREADED) { IWineD3DDevice_SetMultithreaded(object->WineD3DDevice); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 74e1cf6..6f4393a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -72,7 +72,7 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params */ - if(This->presentParms.Windowed == FALSE) { + if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { mode.Width = This->orig_width; mode.Height = This->orig_height; mode.RefreshRate = 0; diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index f0ec4f2..f634e50 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -59,7 +59,7 @@ static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution * before starting up Direct3D, thus orig_width and orig_height will be equal to the modes in the presentation params */ - if(This->presentParms.Windowed == FALSE) { + if(This->presentParms.Windowed == FALSE && This->presentParms.AutoRestoreDisplayMode) { mode.Width = This->orig_width; mode.Height = This->orig_height; mode.RefreshRate = 0; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 4ccbcab..28e5525 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -886,6 +886,7 @@ typedef struct _WINED3DPRESENT_PARAMETERS { DWORD Flags; UINT FullScreen_RefreshRateInHz; UINT PresentationInterval; + BOOL AutoRestoreDisplayMode; } WINED3DPRESENT_PARAMETERS; #define WINED3DPRESENTFLAG_LOCKABLE_BACKBUFFER 0x00000001

1 0

Michael Stefaniuc : riched20: Do not cast NULL.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 9f92f6bc1021bc52d178712008f6b8b2e4ea5d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f92f6bc1021bc52d17871200… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 2 00:22:07 2008 +0100 riched20: Do not cast NULL. --- dlls/riched20/reader.c | 4 +- dlls/riched20/tests/editor.c | 56 ++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f92f6bc1021bc52d1787…

1 0

Vitaliy Margolen : dxdiagn: Add windows path.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 45a2807f87d20289d09551a91c6a96d4b2b40a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a2807f87d20289d09551a91… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 2 21:26:33 2008 -0700 dxdiagn: Add windows path. --- dlls/dxdiagn/provider.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index b15ee96..2bf44e6 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -270,14 +270,14 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) static const WCHAR ullUsedPageFile[] = {'u','l','l','U','s','e','d','P','a','g','e','F','i','l','e',0}; static const WCHAR ullAvailPageFile[] = {'u','l','l','A','v','a','i','l','P','a','g','e','F','i','l','e',0}; /*static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};*/ - /*szWindowsDir*/ - /*szWindowsDir*/ + static const WCHAR szWindowsDir[] = {'s','z','W','i','n','d','o','w','s','D','i','r',0}; static const WCHAR dwOSMajorVersion[] = {'d','w','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; static const WCHAR dwOSMinorVersion[] = {'d','w','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0}; static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; MEMORYSTATUSEX msex; OSVERSIONINFOW info; + WCHAR buffer[MAX_PATH]; add_prop_ui4(pSubCont, dwDirectXVersionMajor, 9); add_prop_ui4(pSubCont, dwDirectXVersionMinor, 0); @@ -299,6 +299,9 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) add_prop_ui4(pSubCont, dwOSBuildNumber, info.dwBuildNumber); add_prop_ui4(pSubCont, dwOSPlatformID, info.dwPlatformId); + GetWindowsDirectoryW(buffer, MAX_PATH); + add_prop_str(pSubCont, szWindowsDir, buffer); + return S_OK; }

1 0

Francois Gouget : cryptui: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: a6d5f7df7f4d6ad14647a2462e831c59b4cd406f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d5f7df7f4d6ad14647a2462… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 2 23:56:29 2008 +0100 cryptui: Fix compilation on systems that don't support nameless unions. --- dlls/cryptui/main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index afb8491..692196c 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -220,7 +222,7 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT switch (pImportSrc->dwSubjectChoice) { case CRYPTUI_WIZ_IMPORT_SUBJECT_FILE: - if (!(cert = make_cert_from_file(pImportSrc->pwszFileName))) + if (!(cert = make_cert_from_file(pImportSrc->u.pwszFileName))) { WARN("unable to create certificate context\n"); return FALSE; @@ -229,7 +231,7 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT freeCert = TRUE; break; case CRYPTUI_WIZ_IMPORT_SUBJECT_CERT_CONTEXT: - cert = pImportSrc->pCertContext; + cert = pImportSrc->u.pCertContext; if (!cert) { SetLastError(E_INVALIDARG);

1 0

Francois Gouget : d3dx8/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 03 Nov '08

03 Nov '08

Module: wine Branch: master Commit: 628b5aeb9e4515c0757886b161812bef0f33ad23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=628b5aeb9e4515c0757886b16… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 2 23:56:48 2008 +0100 d3dx8/tests: Fix compilation on systems that don't support nameless unions. --- dlls/d3dx8/tests/math.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index f38ff26..3dc0899 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -33,7 +33,7 @@ static inline BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2) { for (j = 0; j < 4; ++j) { - if (fabs(U(m1)->m[i][j] - U(m2)->m[i][j]) > admitted_error) + if (fabs(U(*m1).m[i][j] - U(*m2).m[i][j]) > admitted_error) return FALSE; } } @@ -47,14 +47,14 @@ do { \ const D3DXMATRIX *__m2 = (gotmat); \ ok(compare_matrix(__m1, __m2), "Expected matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n)\n\n" \ "Got matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f)\n", \ - U(__m1)->m[0][0], U(__m1)->m[0][1], U(__m1)->m[0][2], U(__m1)->m[0][3], \ - U(__m1)->m[1][0], U(__m1)->m[1][1], U(__m1)->m[1][2], U(__m1)->m[1][3], \ - U(__m1)->m[2][0], U(__m1)->m[2][1], U(__m1)->m[2][2], U(__m1)->m[2][3], \ - U(__m1)->m[3][0], U(__m1)->m[3][1], U(__m1)->m[3][2], U(__m1)->m[3][3], \ - U(__m2)->m[0][0], U(__m2)->m[0][1], U(__m2)->m[0][2], U(__m2)->m[0][3], \ - U(__m2)->m[1][0], U(__m2)->m[1][1], U(__m2)->m[1][2], U(__m2)->m[1][3], \ - U(__m2)->m[2][0], U(__m2)->m[2][1], U(__m2)->m[2][2], U(__m2)->m[2][3], \ - U(__m2)->m[3][0], U(__m2)->m[3][1], U(__m2)->m[3][2], U(__m2)->m[3][3]); \ + U(*__m1).m[0][0], U(*__m1).m[0][1], U(*__m1).m[0][2], U(*__m1).m[0][3], \ + U(*__m1).m[1][0], U(*__m1).m[1][1], U(*__m1).m[1][2], U(*__m1).m[1][3], \ + U(*__m1).m[2][0], U(*__m1).m[2][1], U(*__m1).m[2][2], U(*__m1).m[2][3], \ + U(*__m1).m[3][0], U(*__m1).m[3][1], U(*__m1).m[3][2], U(*__m1).m[3][3], \ + U(*__m2).m[0][0], U(*__m2).m[0][1], U(*__m2).m[0][2], U(*__m2).m[0][3], \ + U(*__m2).m[1][0], U(*__m2).m[1][1], U(*__m2).m[1][2], U(*__m2).m[1][3], \ + U(*__m2).m[2][0], U(*__m2).m[2][1], U(*__m2).m[2][2], U(*__m2).m[2][3], \ + U(*__m2).m[3][0], U(*__m2).m[3][1], U(*__m2).m[3][2], U(*__m2).m[3][3]); \ } while(0) #define expect_plane(expectedplane,gotplane) ok((fabs(expectedplane.a-gotplane.a)<admitted_error)&&(fabs(expectedplane.b-gotplane.b)<admitted_error)&&(fabs(expectedplane.c-gotplane.c)<admitted_error)&&(fabs(expectedplane.d-gotplane.d)<admitted_error),"Expected Plane= (%f, %f, %f, %f)\n , Got Plane= (%f, %f, %f, %f)\n", expectedplane.a, expectedplane.b, expectedplane.c, expectedplane.d, gotplane.a, gotplane.b, gotplane.c, gotplane.d);

1 0