June 2006 - Wine-Commits - list.winehq.org

Andrew Talbot : dbghelp: Write-strings warning fix.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 8527f91043f6293c0c2731a36efe57196e6dcf86 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8527f91043f6293c0c2731a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Jun 1 20:02:44 2006 +0100 dbghelp: Write-strings warning fix. --- dlls/dbghelp/source.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index e96307a..fcfad56 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -155,7 +155,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess struct line_info* dli; void* ptr; SRCCODEINFO sci; - char* file; + const char* file; if (!cb) return FALSE; pcs = process_find_by_handle(hProcess); @@ -186,7 +186,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess { if (dli->is_source_file) { - file = (char*)source_get(pair.effective, dli->u.source_file); + file = source_get(pair.effective, dli->u.source_file); if (regexec(&re, file, 0, NULL, 0) != 0) file = ""; strcpy(sci.FileName, file); }

1 0

Andrew Talbot : kernel/tests: Write-strings warnings fix.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 0ba64e58e51d907c90f514b486d9fcb140cba4b2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ba64e58e51d907c90f514b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jun 2 19:01:23 2006 +0100 kernel/tests: Write-strings warnings fix. --- dlls/kernel/tests/process.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/tests/process.c b/dlls/kernel/tests/process.c index 8dc09d5..4007483 100644 --- a/dlls/kernel/tests/process.c +++ b/dlls/kernel/tests/process.c @@ -429,6 +429,9 @@ static void test_Startup(void) char buffer[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup,si; + static CHAR title[] = "I'm the title string", + desktop[] = "I'm the desktop string", + empty[] = ""; /* let's start simplistic */ memset(&startup, 0, sizeof(startup)); @@ -465,8 +468,8 @@ static void test_Startup(void) startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - startup.lpTitle = "I'm the title string"; - startup.lpDesktop = "I'm the desktop string"; + startup.lpTitle = title; + startup.lpDesktop = desktop; startup.dwXCountChars = 0x12121212; startup.dwYCountChars = 0x23232323; startup.dwX = 0x34343434; @@ -503,7 +506,7 @@ static void test_Startup(void) startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - startup.lpTitle = "I'm the title string"; + startup.lpTitle = title; startup.lpDesktop = NULL; startup.dwXCountChars = 0x12121212; startup.dwYCountChars = 0x23232323; @@ -541,8 +544,8 @@ static void test_Startup(void) startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - startup.lpTitle = "I'm the title string"; - startup.lpDesktop = ""; + startup.lpTitle = title; + startup.lpDesktop = empty; startup.dwXCountChars = 0x12121212; startup.dwYCountChars = 0x23232323; startup.dwX = 0x34343434; @@ -580,7 +583,7 @@ static void test_Startup(void) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; startup.lpTitle = NULL; - startup.lpDesktop = "I'm the desktop string"; + startup.lpDesktop = desktop; startup.dwXCountChars = 0x12121212; startup.dwYCountChars = 0x23232323; startup.dwX = 0x34343434; @@ -617,8 +620,8 @@ static void test_Startup(void) startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - startup.lpTitle = ""; - startup.lpDesktop = "I'm the desktop string"; + startup.lpTitle = empty; + startup.lpDesktop = desktop; startup.dwXCountChars = 0x12121212; startup.dwYCountChars = 0x23232323; startup.dwX = 0x34343434; @@ -655,8 +658,8 @@ static void test_Startup(void) startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - startup.lpTitle = ""; - startup.lpDesktop = ""; + startup.lpTitle = empty; + startup.lpDesktop = empty; startup.dwXCountChars = 0x12121212; startup.dwYCountChars = 0x23232323; startup.dwX = 0x34343434;

1 0

Ivan Gyurdiev : wined3d: TEXREG2GB is valid on pshaders 1.1.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: ac46320f57329cbb63f9f3589ec958eb10e81598 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac46320f57329cbb63f9f35… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed Jun 7 00:43:51 2006 -0400 wined3d: TEXREG2GB is valid on pshaders 1.1. --- dlls/wined3d/pixelshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 05e8c68..f404115 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -719,7 +719,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI {D3DSIO_TEXBEM, "texbem", "undefined", 2, pshader_texbem, pshader_hw_texbem, NULL, 0, D3DPS_VERSION(1,3)}, {D3DSIO_TEXBEML, "texbeml", GLNAME_REQUIRE_GLSL, 2, pshader_texbeml, NULL, NULL, D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)}, {D3DSIO_TEXREG2AR,"texreg2ar","undefined", 2, pshader_texreg2ar, pshader_hw_texreg2ar, NULL, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)}, - {D3DSIO_TEXREG2GB,"texreg2gb","undefined", 2, pshader_texreg2gb, pshader_hw_texreg2gb, NULL, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)}, + {D3DSIO_TEXREG2GB,"texreg2gb","undefined", 2, pshader_texreg2gb, pshader_hw_texreg2gb, NULL, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)}, {D3DSIO_TEXREG2RGB, "texreg2rgb", GLNAME_REQUIRE_GLSL, 2, pshader_texreg2rgb, NULL, NULL, D3DPS_VERSION(1,2), D3DPS_VERSION(1,3)}, {D3DSIO_TEXM3x2PAD, "texm3x2pad", "undefined", 2, pshader_texm3x2pad, pshader_hw_texm3x2pad, NULL, D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)}, {D3DSIO_TEXM3x2TEX, "texm3x2tex", "undefined", 2, pshader_texm3x2tex, pshader_hw_texm3x2tex, NULL, D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)},

1 0

Ivan Gyurdiev : wined3d: Fix NULL dereference in generator function.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 83a9666f9c8a80ef55b1807174d0d660f9991277 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83a9666f9c8a80ef55b1807… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Jun 6 23:40:16 2006 -0400 wined3d: Fix NULL dereference in generator function. --- dlls/wined3d/baseshader.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ee54a5e..1968a11 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -623,6 +623,9 @@ void generate_base_shader( shader_reg_maps reg_maps; /* Initialize current parsing state */ + SHADER_OPCODE_ARG hw_arg; + hw_arg.shader = iface; + hw_arg.buffer = buffer; This->baseShader.parse_state.current_row = 0; /* First pass: figure out which temporary and texture registers are used */ @@ -662,22 +665,19 @@ void generate_base_shader( /* Read opcode */ opcode_token = *pToken++; curOpcode = shader_get_opcode(iface, opcode_token); - hw_fct = (wined3d_settings.shader_mode == - SHADER_GLSL ? curOpcode->hw_glsl_fct : curOpcode->hw_fct); + hw_fct = (curOpcode == NULL)? NULL: + (wined3d_settings.shader_mode == SHADER_GLSL)? + curOpcode->hw_glsl_fct : curOpcode->hw_fct; /* Unknown opcode and its parameters */ - if (NULL == curOpcode) { - FIXME("Unrecognized opcode: token=%08lX\n", opcode_token); - pToken += shader_skip_unrecognized(iface, pToken); + if (NULL == curOpcode) { + FIXME("Unrecognized opcode: token=%08lX\n", opcode_token); + pToken += shader_skip_unrecognized(iface, pToken); /* If a generator function is set for current shader target, use it */ } else if (hw_fct != NULL) { - SHADER_OPCODE_ARG hw_arg; - - hw_arg.shader = iface; hw_arg.opcode = curOpcode; - hw_arg.buffer = buffer; if (curOpcode->num_params > 0) {

1 0

Ivan Gyurdiev : d3d9: Mipmaps level test.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 374de452abfa0cbcea77a2e89a32d3a72a03826e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=374de452abfa0cbcea77a2e… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Jun 6 18:18:02 2006 -0400 d3d9: Mipmaps level test. --- dlls/d3d9/tests/device.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 716c102..5859d1a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -46,6 +46,63 @@ #define CHECK_RELEASE(obj,d,rc) \ ok(tmp1 == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, tmp1); \ } +static void check_mipmap_levels( + IDirect3DDevice9* device, + int width, int height, int count) +{ + + IDirect3DBaseTexture9* texture = NULL; + HRESULT hr = IDirect3DDevice9_CreateTexture( device, width, height, 0, 0, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, (IDirect3DTexture9**) &texture, NULL ); + + if (SUCCEEDED(hr)) { + DWORD levels = IDirect3DBaseTexture9_GetLevelCount(texture); + ok(levels == count, "Invalid level count. Expected %d got %lu\n", count, levels); + } else + trace("CreateTexture failed: %s\n", DXGetErrorString9(hr)); + + if (texture) IUnknown_Release( texture ); +} + +void test_mipmap_levels(void) +{ + + HRESULT hr; + HWND hwnd = NULL; + + IDirect3D9 *pD3d = NULL; + IDirect3DDevice9 *pDevice = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + + pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); + ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); + hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!pD3d || !hwnd) goto cleanup; + + IDirect3D9_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D9_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + ok(SUCCEEDED(hr), "Failed to create IDirect3D9Device (%s)\n", DXGetErrorString9(hr)); + if (FAILED(hr)) goto cleanup; + + check_mipmap_levels(pDevice, 32, 32, 6); + check_mipmap_levels(pDevice, 256, 1, 9); + check_mipmap_levels(pDevice, 1, 256, 9); + check_mipmap_levels(pDevice, 1, 1, 1); + + cleanup: + if (pD3d) IUnknown_Release( pD3d ); + if (pDevice) IUnknown_Release( pDevice ); + DestroyWindow( hwnd ); +} + void test_swapchain(void) { HRESULT hr; @@ -345,5 +402,6 @@ START_TEST(device) { test_swapchain(); test_refcount(); + test_mipmap_levels(); } }

1 0

Ivan Gyurdiev : wined3d: Fix missing light recording.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 4d66615bbb94ebb05802acd3e521ca543b487585 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d66615bbb94ebb05802acd… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Jun 6 23:37:05 2006 -0400 wined3d: Fix missing light recording. Write a light with the default parameters in disabled state if capturing a missing light. --- dlls/wined3d/device.c | 48 +++++++++++++++------------------------- dlls/wined3d/stateblock.c | 31 +++++++++++++------------- dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 36 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 27c9dc9..13d497c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -32,6 +32,22 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION ((IWineD3DImpl *)(This->wineD3D))->gl_info +/* Define the default light parameters as specified by MSDN */ +const WINED3DLIGHT WINED3D_default_light = { + + D3DLIGHT_DIRECTIONAL, /* Type */ + { 1.0, 1.0, 1.0, 0.0 }, /* Diffuse r,g,b,a */ + { 0.0, 0.0, 0.0, 0.0 }, /* Specular r,g,b,a */ + { 0.0, 0.0, 0.0, 0.0 }, /* Ambient r,g,b,a, */ + { 0.0, 0.0, 0.0 }, /* Position x,y,z */ + { 0.0, 0.0, 1.0 }, /* Direction x,y,z */ + 0.0, /* Range */ + 0.0, /* Falloff */ + 0.0, 0.0, 0.0, /* Attenuation 0,1,2 */ + 0.0, /* Theta */ + 0.0 /* Phi */ +}; + /* x11drv GDI escapes */ #define X11DRV_ESCAPE 6789 enum x11drv_escape_codes @@ -2515,37 +2531,9 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetLig /* Special case - enabling an undefined light creates one with a strict set of parms! */ if (lightInfo == NULL) { - D3DLIGHT9 lightParms; - /* Warning - untested code :-) Prob safe to change fixme to a trace but - wait until someone confirms it seems to work! */ + TRACE("Light enabled requested but light not defined, so defining one!\n"); - lightParms.Type = D3DLIGHT_DIRECTIONAL; - lightParms.Diffuse.r = 1.0; - lightParms.Diffuse.g = 1.0; - lightParms.Diffuse.b = 1.0; - lightParms.Diffuse.a = 0.0; - lightParms.Specular.r = 0.0; - lightParms.Specular.g = 0.0; - lightParms.Specular.b = 0.0; - lightParms.Specular.a = 0.0; - lightParms.Ambient.r = 0.0; - lightParms.Ambient.g = 0.0; - lightParms.Ambient.b = 0.0; - lightParms.Ambient.a = 0.0; - lightParms.Position.x = 0.0; - lightParms.Position.y = 0.0; - lightParms.Position.z = 0.0; - lightParms.Direction.x = 0.0; - lightParms.Direction.y = 0.0; - lightParms.Direction.z = 1.0; - lightParms.Range = 0.0; - lightParms.Falloff = 0.0; - lightParms.Attenuation0 = 0.0; - lightParms.Attenuation1 = 0.0; - lightParms.Attenuation2 = 0.0; - lightParms.Theta = 0.0; - lightParms.Phi = 0.0; - IWineD3DDeviceImpl_SetLight(iface, Index, &lightParms); + IWineD3DDeviceImpl_SetLight(iface, Index, &WINED3D_default_light); /* Search for it again! Should be fairly quick as near head of list */ lightInfo = This->stateBlock->lights; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c694f44..752773b 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -213,24 +213,23 @@ HRESULT WINAPI IWineD3DStateBlockImpl_Ca realLight = targetStateBlock->lights; while (realLight != NULL && realLight->OriginalIndex != src->OriginalIndex) realLight = realLight->next; - if (realLight == NULL) { - FIXME("A captured light no longer exists...?\n"); - } else { - - /* If 'changed' then its a SetLight command. Rather than comparing to see - if the OriginalParms have changed and then copy them (twice through - memory) just do the copy */ - if (src->changed) { - TRACE("Updating lights for light %ld\n", src->OriginalIndex); - memcpy(&src->OriginalParms, &realLight->OriginalParms, sizeof(src->OriginalParms)); - } + /* If 'changed' then its a SetLight command. Rather than comparing to see + if the OriginalParms have changed and then copy them (twice through + memory) just do the copy */ + if (src->changed) { - /* If 'enabledchanged' then its a LightEnable command */ - if (src->enabledChanged) { - TRACE("Updating lightEnabled for light %ld\n", src->OriginalIndex); - src->lightEnabled = realLight->lightEnabled; - } + /* If the light exists, copy its parameters, otherwise copy the default parameters */ + const WINED3DLIGHT* params = realLight? &realLight->OriginalParms: &WINED3D_default_light; + TRACE("Updating lights for light %ld\n", src->OriginalIndex); + memcpy(&src->OriginalParms, params, sizeof(*params)); + } + + /* If 'enabledchanged' then its a LightEnable command */ + if (src->enabledChanged) { + /* If the light exists, check if it's enabled, otherwise default is disabled state */ + TRACE("Updating lightEnabled for light %ld\n", src->OriginalIndex); + src->lightEnabled = realLight? realLight->lightEnabled: FALSE; } src = src->next; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d9c7406..3a42228 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -393,6 +393,9 @@ struct PLIGHTINFOEL { PLIGHTINFOEL *prev; }; +/* The default light parameters */ +extern const WINED3DLIGHT WINED3D_default_light; + /***************************************************************************** * IWineD3D implementation structure */

1 0

Ivan Gyurdiev : d3d9: Test missing light recording.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 5bb0eebc952edbda6bc41d840c19d129dbe289db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5bb0eebc952edbda6bc41d8… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Tue Jun 6 23:35:38 2006 -0400 d3d9: Test missing light recording. When a light does not exist, and the app attempts to capture it in the stateblock, a disabled light with the default light parameters is written instead. --- dlls/d3d9/tests/stateblock.c | 92 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 06cc74f..8744c5d 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <d3d9.h> #include "wine/test.h" @@ -53,7 +54,8 @@ static IDirect3DDevice9 *init_d3d9(void) present_parameters.hDeviceWindow = create_window(); present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_NULLREF, NULL, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); ok(hres == D3D_OK, "IDirect3D_CreateDevice returned: 0x%lx\n", hres); return device_ptr; @@ -89,6 +91,93 @@ static void test_begin_end_state_block(I "Expected hret 0x%lx, state_block_ptr 0xdeadbeef.\n", hret, state_block_ptr, D3DERR_INVALIDCALL); } +static void test_missing_light_recording(IDirect3DDevice9 *device_ptr) +{ + + D3DLIGHT9 garbage_light = { 1, + { 2.0, 2.0, 2.0, 2.0 }, { 3.0, 3.0, 3.0, 3.0 }, { 4.0, 4.0, 4.0, 4.0 }, + { 5.0, 5.0, 5.0 }, { 6.0, 6.0, 6.0 }, + 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0 }; + + D3DLIGHT9 expected_light = { D3DLIGHT_DIRECTIONAL, + { 1.0, 1.0, 1.0, 0.0 }, { 0.0, 0.0, 0.0, 0.0 }, { 0.0, 0.0, 0.0, 0.0 }, + { 0.0, 0.0, 0.0 }, { 0.0, 0.0, 1.0 }, + 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }; + D3DLIGHT9 result_light; + BOOL result_light_enable; + + HRESULT hret = 0; + IDirect3DStateBlock9 *state_block_ptr = 0; + + /* Before we make any changes, GetLightEnable should fail, and GetLight should fail */ + hret = IDirect3DDevice9_GetLightEnable(device_ptr, 0, &result_light_enable); + ok(hret == D3DERR_INVALIDCALL, "GetLightEnable returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", + hret, D3DERR_INVALIDCALL); + if (hret != D3DERR_INVALIDCALL) goto cleanup; + + hret = IDirect3DDevice9_GetLight(device_ptr, 0, &result_light); + ok(hret == D3DERR_INVALIDCALL, "GetLight returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", + hret, D3DERR_INVALIDCALL); + if (hret != D3DERR_INVALIDCALL) goto cleanup; + + /* Set states to record with garbage data (light, light_enable) */ + hret = IDirect3DDevice9_BeginStateBlock(device_ptr); + ok(hret == D3D_OK, "BeginStateBlock returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", hret, D3D_OK); + if (hret != D3D_OK) goto cleanup; + + hret = IDirect3DDevice9_SetLight(device_ptr, 0, &garbage_light); + ok(hret == D3D_OK, "SetLight returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", hret, D3D_OK); + if (hret != D3D_OK) goto cleanup; + + hret = IDirect3DDevice9_LightEnable(device_ptr, 0, TRUE); + ok(hret == D3D_OK, "SetLightEnable returned: hret 0x%lx, Expected hret 0x%lx. Aborting.\n", hret, D3D_OK); + if (hret != D3D_OK) goto cleanup; + + state_block_ptr = (IDirect3DStateBlock9 *)0xdeadbeef; + hret = IDirect3DDevice9_EndStateBlock(device_ptr, &state_block_ptr); + ok(hret == D3D_OK, "EndStateBlock returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", hret, D3D_OK); + if (hret != D3D_OK) goto cleanup; + + /* Now capture light data */ + hret = IDirect3DStateBlock9_Capture(state_block_ptr); + ok(hret == D3D_OK, "Capture returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", hret, D3D_OK); + if (hret != D3D_OK) goto cleanup; + + /* Now apply the resultant stateblock */ + hret = IDirect3DStateBlock9_Apply(state_block_ptr); + ok(hret == D3D_OK, "Apply returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", hret, D3D_OK); + if (hret != D3D_OK) goto cleanup; + + /* Now try to fetch the light set by the stateblock. + * Light enable should have been set to 0, and a default light should have been + * created as a side effect of that */ + hret = IDirect3DDevice9_GetLightEnable(device_ptr, 0, &result_light_enable); + ok(hret == D3D_OK, "GetLightEnable returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", hret, D3D_OK); + if (hret != D3D_OK) goto cleanup; + ok(result_light_enable == 0, "Light enabled status was %u, instead of 0", result_light_enable); + + hret = IDirect3DDevice9_GetLight(device_ptr, 0, &result_light); + ok(hret == D3D_OK, "GetLight returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", hret, D3D_OK); + if (hret != D3D_OK) goto cleanup; + + ok (!memcmp(&expected_light, &result_light, sizeof(D3DLIGHT9)), + "Light returned = { %u, { %f, %f, %f, %f }, { %f, %f, %f, %f}, { %f, %f, %f, %f }, " + "{ %f, %f, %f }, { %f, %f, %f }, %f, %f, %f, %f, %f, %f, %f }\n", + + result_light.Type, + result_light.Diffuse.r, result_light.Diffuse.g, result_light.Diffuse.b, result_light.Diffuse.a, + result_light.Specular.r, result_light.Specular.g, result_light.Specular.b, result_light.Specular.a, + result_light.Ambient.r, result_light.Ambient.g, result_light.Ambient.b, result_light.Ambient.a, + result_light.Position.x, result_light.Position.y, result_light.Position.z, + result_light.Direction.x, result_light.Direction.y, result_light.Direction.z, + result_light.Range, result_light.Falloff, + result_light.Attenuation0, result_light.Attenuation1, result_light.Attenuation2, + result_light.Theta, result_light.Phi); + + cleanup: + if (state_block_ptr) IUnknown_Release( state_block_ptr ); +} + START_TEST(stateblock) { IDirect3DDevice9 *device_ptr; @@ -104,4 +193,5 @@ START_TEST(stateblock) if (!device_ptr) return; test_begin_end_state_block(device_ptr); + test_missing_light_recording(device_ptr); }

1 0

Vitaly Lipatov : msi: Add Russian resource file.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 452169243b87ccb840d1a63540de43908e8857d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=452169243b87ccb840d1a63… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed Jun 7 14:28:33 2006 +0400 msi: Add Russian resource file. --- dlls/msi/msi.rc | 1 + dlls/msi/msi_Ru.rc | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 dlls/msi/msi_Ru.rc diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index f03233d..9199acc 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -40,6 +40,7 @@ #include "msi_Ko.rc" #include "msi_Nl.rc" #include "msi_No.rc" #include "msi_Pt.rc" +#include "msi_Ru.rc" #include "msi_Tr.rc" /* BINRES instadvert.bmp */ diff --git a/dlls/msi/msi_Ru.rc b/dlls/msi/msi_Ru.rc new file mode 100644 index 0000000..23e55ab --- /dev/null +++ b/dlls/msi/msi_Ru.rc @@ -0,0 +1,33 @@ +/* + * Russian resources for MSI + * + * Copyright 2006 Vitaly Lipatov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + 5 "�� %s �� " + 9 "�� %s" + 10 "�� " + 11 "�� , �� %s" + 12 "�� " + 13 "�� " + 14 "�� :" + 15 "�� , �� %s" +}

1 0

Robert Reif : netapi32: Add stub for NetServerEnumEx.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: 65dd8741ff932b0528a56967abd47c9bc07fcd23 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65dd8741ff932b0528a5696… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Jun 7 07:42:24 2006 -0400 netapi32: Add stub for NetServerEnumEx. --- dlls/netapi32/netapi32.c | 23 +++++++++++++++++++++++ dlls/netapi32/netapi32.spec | 2 +- include/lmserver.h | 1 + 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 81e4c06..046ae09 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -49,6 +49,9 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, return TRUE; } +/************************************************************ + * NetServerEnum (NETAPI32.@) + */ NET_API_STATUS WINAPI NetServerEnum( LPCWSTR servername, DWORD level, @@ -68,6 +71,26 @@ NET_API_STATUS WINAPI NetServerEnum( return ERROR_NO_BROWSER_SERVERS_FOUND; } +/************************************************************ + * NetServerEnumEx (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetServerEnumEx( + LPCWSTR ServerName, + DWORD Level, + LPBYTE *Bufptr, + DWORD PrefMaxlen, + LPDWORD EntriesRead, + LPDWORD totalentries, + DWORD servertype, + LPCWSTR domain, + LPCWSTR FirstNameToReturn) +{ + FIXME("Stub (%s %ld %p %ld %p %p %ld %s %p)\n", debugstr_w(ServerName), + Level, Bufptr, PrefMaxlen, EntriesRead, totalentries, servertype, + debugstr_w(domain), debugstr_w(FirstNameToReturn)); + + return ERROR_NO_BROWSER_SERVERS_FOUND; +} /************************************************************ * NetServerGetInfo (NETAPI32.@) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index c92b59a..392cef7 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -172,7 +172,7 @@ @ stub NetServerComputerNameDel @ stub NetServerDiskEnum @ stdcall NetServerEnum(wstr long ptr long ptr ptr long wstr ptr) -@ stub NetServerEnumEx +@ stdcall NetServerEnumEx(wstr long ptr long ptr ptr long wstr wstr) @ stdcall NetServerGetInfo(wstr long ptr) @ stub NetServerSetInfo @ stub NetServerTransportAdd diff --git a/include/lmserver.h b/include/lmserver.h index 465c738..1d738fc 100644 --- a/include/lmserver.h +++ b/include/lmserver.h @@ -39,6 +39,7 @@ typedef struct _SERVER_INFO_101 { } SERVER_INFO_101, *PSERVER_INFO_101, *LPSERVER_INFO_101; NET_API_STATUS WINAPI NetServerEnum(LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,DWORD,LPCWSTR,LPDWORD); +NET_API_STATUS WINAPI NetServerEnumEx(LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,DWORD,LPCWSTR,LPCWSTR); NET_API_STATUS WINAPI NetServerGetInfo(LMSTR,DWORD,LPBYTE*); BOOL WINAPI SetServiceBits(SERVICE_STATUS_HANDLE,DWORD,BOOL,BOOL);

1 0

Mike McCormack : server: open_console's from field should be a handle.
by Alexandre Julliard June 7, 2006

June 7, 2006

Module: wine Branch: refs/heads/master Commit: fac494c8226dd777c9c4b107d7ec9a100f0a43d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fac494c8226dd777c9c4b10… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jun 7 18:33:46 2006 +0900 server: open_console's from field should be a handle. --- dlls/kernel/console.c | 6 +++--- include/wine/server_protocol.h | 4 ++-- programs/wineconsole/wineconsole.c | 2 +- server/console.c | 25 +++++++++++-------------- server/protocol.def | 2 +- server/trace.c | 2 +- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/kernel/console.c b/dlls/kernel/console.c index 384bbfd..fc16195 100644 --- a/dlls/kernel/console.c +++ b/dlls/kernel/console.c @@ -210,13 +210,13 @@ BOOL WINAPI Beep( DWORD dwFreq, DWORD dw */ HANDLE WINAPI OpenConsoleW(LPCWSTR name, DWORD access, BOOL inherit, DWORD creation) { - BOOL output; + HANDLE output; HANDLE ret; if (strcmpiW(coninW, name) == 0) - output = FALSE; + output = (HANDLE) FALSE; else if (strcmpiW(conoutW, name) == 0) - output = TRUE; + output = (HANDLE) TRUE; else { SetLastError(ERROR_INVALID_NAME); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 7481eb1..c39f83c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1082,7 +1082,7 @@ struct get_console_renderer_events_reply struct open_console_request { struct request_header __header; - int from; + obj_handle_t from; unsigned int access; unsigned int attributes; @@ -4382,6 +4382,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 235 +#define SERVER_PROTOCOL_VERSION 236 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index bf3d6cf..edf0fa8 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -274,7 +274,7 @@ int WINECON_GrabChanges(struct inner_dat case CONSOLE_RENDERER_ACTIVE_SB_EVENT: SERVER_START_REQ( open_console ) { - req->from = (int)data->hConIn; + req->from = data->hConIn; req->access = GENERIC_READ | GENERIC_WRITE; req->attributes = 0; req->share = FILE_SHARE_READ | FILE_SHARE_WRITE; diff --git a/server/console.c b/server/console.c index a4d8f87..b080293 100644 --- a/server/console.c +++ b/server/console.c @@ -1311,26 +1311,23 @@ DECL_HANDLER(open_console) struct object *obj = NULL; reply->handle = 0; - switch (req->from) + if (req->from == (obj_handle_t)0) { - case 0: if (current->process->console && current->process->console->renderer) obj = grab_object( (struct object*)current->process->console ); - break; - case 1: + } + else if (req->from == (obj_handle_t)1) + { if (current->process->console && current->process->console->renderer && current->process->console->active) obj = grab_object( (struct object*)current->process->console->active ); - break; - default: - if ((obj = get_handle_obj( current->process, (obj_handle_t)req->from, - CONSOLE_READ|CONSOLE_WRITE, &console_input_ops ))) - { - struct console_input* console = (struct console_input*)obj; - obj = (console->active) ? grab_object( console->active ) : NULL; - release_object( console ); - } - break; + } + else if ((obj = get_handle_obj( current->process, req->from, + CONSOLE_READ|CONSOLE_WRITE, &console_input_ops ))) + { + struct console_input *console = (struct console_input *)obj; + obj = (console->active) ? grab_object( console->active ) : NULL; + release_object( console ); } /* FIXME: req->share is not used (as in screen buffer creation) */ diff --git a/server/protocol.def b/server/protocol.def index c313df1..fac00d3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -822,7 +822,7 @@ struct console_renderer_event /* Open a handle to the process console */ @REQ(open_console) - int from; /* 0 (resp 1) input (resp output) of current process console */ + obj_handle_t from; /* 0 (resp 1) input (resp output) of current process console */ /* otherwise console_in handle to get active screen buffer? */ unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ diff --git a/server/trace.c b/server/trace.c index 98f622c..5d2c525 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1245,7 +1245,7 @@ static void dump_get_console_renderer_ev static void dump_open_console_request( const struct open_console_request *req ) { - fprintf( stderr, " from=%d,", req->from ); + fprintf( stderr, " from=%p,", req->from ); fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " share=%d", req->share );

1 0