December 2007 - Wine-Commits

James Hawkins : msi: The BS_GROUPBOX style should only be used if the HasBorder attribute is set .
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: f4eea10bed0d2145e9fd5403f140156579356702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4eea10bed0d2145e9fd5403f… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 20 02:44:24 2007 -0600 msi: The BS_GROUPBOX style should only be used if the HasBorder attribute is set. --- dlls/msi/dialog.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index ccb6acc..4994216 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1750,13 +1750,20 @@ static UINT msi_dialog_radiogroup_control( msi_dialog *dialog, MSIRECORD *rec ) radio_button_group_descr group; MSIPACKAGE *package = dialog->package; WNDPROC oldproc; + DWORD attr, style = WS_GROUP; prop = MSI_RecordGetString( rec, 9 ); TRACE("%p %p %s\n", dialog, rec, debugstr_w( prop )); + attr = MSI_RecordGetInteger( rec, 8 ); + if (attr & msidbControlAttributesHasBorder) + style |= BS_GROUPBOX; + else + style |= BS_OWNERDRAW; + /* Create parent group box to hold radio buttons */ - control = msi_dialog_add_control( dialog, rec, szButton, BS_GROUPBOX|WS_GROUP ); + control = msi_dialog_add_control( dialog, rec, szButton, style ); if( !control ) return ERROR_FUNCTION_FAILED;

1 0

Rob Shearman : ole32: Fix RPC_GetLocalClassObject to wait for 30 seconds, even if messages arrive while we are waiting.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: 93df1675f1cb00bc0a15bea6c50ba7c44b0706d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93df1675f1cb00bc0a15bea6c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 20 09:51:57 2007 +0000 ole32: Fix RPC_GetLocalClassObject to wait for 30 seconds, even if messages arrive while we are waiting. --- dlls/ole32/rpc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 6760eb8..9fbff88 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1726,6 +1726,7 @@ HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) hPipe = CreateFileW(pipefn, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); if (hPipe == INVALID_HANDLE_VALUE) { DWORD index; + DWORD start_ticks; if (tries == 1) { if ( (hres = create_local_service(rclsid)) && (hres = create_server(rclsid)) ) @@ -1733,7 +1734,11 @@ HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) } else { WARN("Connecting to %s, no response yet, retrying: le is %u\n", debugstr_w(pipefn), GetLastError()); } - CoWaitForMultipleHandles(0, 1000, 0, NULL, &index); + /* wait for one second, even if messages arrive */ + start_ticks = GetTickCount(); + do { + CoWaitForMultipleHandles(0, 1000, 0, NULL, &index); + } while (GetTickCount() - start_ticks < 1000); continue; } bufferlen = 0;

1 0

Rob Shearman : rpcrt4: Fix NdrConformantStringUnmarshall to always increment the buffer during unmarshalling .
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: 9a888e6465b79b5c3daec2723987aec3120888a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a888e6465b79b5c3daec2723… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 20 09:51:47 2007 +0000 rpcrt4: Fix NdrConformantStringUnmarshall to always increment the buffer during unmarshalling. safe_copy_from_buffer has the side-effect of incrementing the buffer and this still needs to be done when we point the memory into the buffer. (Thanks to Maarten Lankhorst for finding the mistake and suggesting a fix.) --- dlls/rpcrt4/ndr_marshall.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 0167bcf..2322c78 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -890,7 +890,9 @@ unsigned char *WINAPI NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg *ppMemory = NdrAllocate(pStubMsg, memsize); } - if (*ppMemory != pStubMsg->Buffer) + if (*ppMemory == pStubMsg->Buffer) + safe_buffer_increment(pStubMsg, bufsize); + else safe_copy_from_buffer(pStubMsg, *ppMemory, bufsize); if (*pFormat == RPC_FC_C_CSTRING) {

1 0

Stefan Dösinger : wined3d: Add a test for 16 bit floats.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: aaa0e5090a4fcc2a224a3fa2c95ba0265b173436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa0e5090a4fcc2a224a3fa2c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 19 16:28:14 2007 +0100 wined3d: Add a test for 16 bit floats. --- dlls/d3d9/tests/visual.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/drawprim.c | 1 + 2 files changed, 144 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index dd38d55..95f15f0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5677,6 +5677,148 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) if(dcl_color) IDirect3DVertexDeclaration9_Release(dcl_color); } +struct vertex_float16color { + float x, y, z; + DWORD c1, c2; +}; + +static void test_vshader_float16(IDirect3DDevice9 *device) +{ + HRESULT hr; + DWORD color; + void *data; + static const D3DVERTEXELEMENT9 decl_elements[] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_FLOAT16_4,D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, + D3DDECL_END() + }; + IDirect3DVertexDeclaration9 *vdecl = NULL; + IDirect3DVertexBuffer9 *buffer = NULL; + IDirect3DVertexShader9 *shader; + DWORD shader_code[] = { + 0xfffe0101, 0x0000001f, 0x80000000, 0x900f0000, 0x0000001f, 0x8000000a, + 0x900f0001, 0x00000001, 0xc00f0000, 0x90e40000, 0x00000001, 0xd00f0000, + 0x90e40001, 0x0000ffff + }; + struct vertex_float16color quad[] = { + { -1.0, -1.0, 0.1, 0x3c000000, 0x00000000 }, /* green */ + { -1.0, 0.0, 0.1, 0x3c000000, 0x00000000 }, + { 0.0, -1.0, 0.1, 0x3c000000, 0x00000000 }, + { 0.0, 0.0, 0.1, 0x3c000000, 0x00000000 }, + + { 0.0, -1.0, 0.1, 0x00003c00, 0x00000000 }, /* red */ + { 0.0, 0.0, 0.1, 0x00003c00, 0x00000000 }, + { 1.0, -1.0, 0.1, 0x00003c00, 0x00000000 }, + { 1.0, 0.0, 0.1, 0x00003c00, 0x00000000 }, + + { 0.0, 0.0, 0.1, 0x00000000, 0x00003c00 }, /* blue */ + { 0.0, 1.0, 0.1, 0x00000000, 0x00003c00 }, + { 1.0, 0.0, 0.1, 0x00000000, 0x00003c00 }, + { 1.0, 1.0, 0.1, 0x00000000, 0x00003c00 }, + + { -1.0, 0.0, 0.1, 0x00000000, 0x3c000000 }, /* alpha */ + { -1.0, 1.0, 0.1, 0x00000000, 0x3c000000 }, + { 0.0, 0.0, 0.1, 0x00000000, 0x3c000000 }, + { 0.0, 1.0, 0.1, 0x00000000, 0x3c000000 }, + }; + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff102030, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vdecl); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexDeclaration failed hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexShader failed hr=%s\n", DXGetErrorString9(hr)); + IDirect3DDevice9_SetVertexShader(device, shader); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetVertexShader failed hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed hr=%s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_SetVertexDeclaration(device, vdecl); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad + 0, sizeof(quad[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad + 4, sizeof(quad[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad + 8, sizeof(quad[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad + 12, sizeof(quad[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed, hr=%s\n", DXGetErrorString9(hr)); + } + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 480, 360); + ok(color == 0x00ff0000, + "Input 0x00003c00, 0x00000000 returned color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x00000000, + "Input 0x00000000, 0x3c000000 returned color %08x, expected 0x00000000\n", color); + color = getPixelColor(device, 160, 360); + ok(color == 0x0000ff00, + "Input 0x3c000000, 0x00000000 returned color %08x, expected 0x0000ff00\n", color); + color = getPixelColor(device, 480, 120); + ok(color == 0x000000ff, + "Input 0x00000000, 0x00003c00 returned color %08x, expected 0x000000ff\n", color); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff102030, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), 0, 0, + D3DPOOL_MANAGED, &buffer, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexBuffer failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, sizeof(quad), (void **) &data, 0); + ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed, hr=%s\n", DXGetErrorString9(hr)); + memcpy(data, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Unlock failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(quad[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed, hr=%s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed (%08x)\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitive failed, hr = %#08x\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 4, 2); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitive failed, hr = %#08x\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 8, 2); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitive failed, hr = %#08x\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 12, 2); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitive failed, hr = %#08x\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed, hr=%s\n", DXGetErrorString9(hr)); + } + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + color = getPixelColor(device, 480, 360); + ok(color == 0x00ff0000, + "Input 0x00003c00, 0x00000000 returned color %08x, expected 0x00ff0000\n", color); + color = getPixelColor(device, 160, 120); + ok(color == 0x00000000, + "Input 0x00000000, 0x3c000000 returned color %08x, expected 0x00000000\n", color); + color = getPixelColor(device, 160, 360); + ok(color == 0x0000ff00, + "Input 0x3c000000, 0x00000000 returned color %08x, expected 0x0000ff00\n", color); + color = getPixelColor(device, 480, 120); + ok(color == 0x000000ff, + "Input 0x00000000, 0x00003c00 returned color %08x, expected 0x000000ff\n", color); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed, hr=%s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed, hr=%s\n", DXGetErrorString9(hr)); + IDirect3DDevice9_SetVertexShader(device, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetVertexShader failed hr=%s\n", DXGetErrorString9(hr)); + + IDirect3DVertexDeclaration9_Release(vdecl); + IDirect3DVertexShader9_Release(shader); + IDirect3DVertexBuffer9_Release(buffer); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -5771,6 +5913,7 @@ START_TEST(visual) test_mova(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(3, 0)) { test_vshader_input(device_ptr); + test_vshader_float16(device_ptr); } else { skip("No vs_3_0 support\n"); } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index aa7dd62..fdba368 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -733,6 +733,7 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, WineDirect3DVertexStridedDa send_attribute(This, sd->u.input[i].dwType, i, ptr); } + SkipnStrides++; } glEnd();

1 0

Stefan Dösinger : wined3d: Move the GL info structure into the adapter.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: b83dc6bbf635f96f8afba19fa9713d15d833d942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83dc6bbf635f96f8afba19fa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 19 02:51:53 2007 +0100 wined3d: Move the GL info structure into the adapter. --- dlls/wined3d/device.c | 6 +++- dlls/wined3d/directx.c | 2 +- dlls/wined3d/utils.c | 32 ++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 42 +++++---------------------------------- include/wine/wined3d_gl.h | 11 ++++++++++ 5 files changed, 54 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d5efe8b..5cf9cef 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1711,7 +1711,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice* return hr; } -static size_t ConvertFvfToDeclaration(DWORD fvf, WINED3DVERTEXELEMENT** ppVertexElements) { +static size_t ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the GL info, which has the type table */ + DWORD fvf, WINED3DVERTEXELEMENT** ppVertexElements) { unsigned int idx, idx2; unsigned int offset; @@ -1839,10 +1840,11 @@ static size_t ConvertFvfToDeclaration(DWORD fvf, WINED3DVERTEXELEMENT** ppVertex static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF(IWineD3DDevice* iface, IWineD3DVertexDeclaration** ppVertexDeclaration, IUnknown *Parent, DWORD Fvf) { WINED3DVERTEXELEMENT* elements = NULL; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; size_t size; DWORD hr; - size = ConvertFvfToDeclaration(Fvf, &elements); + size = ConvertFvfToDeclaration(This, Fvf, &elements); if (size == 0) return WINED3DERR_OUTOFVIDEOMEMORY; hr = IWineD3DDevice_CreateVertexDeclaration(iface, ppVertexDeclaration, Parent, elements, size); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 70a21a0..9e6bf33 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3160,7 +3160,7 @@ BOOL InitAdapters(void) { select_shader_mode(&Adapters[0].gl_info, WINED3DDEVTYPE_HAL, &ps_selected_mode, &vs_selected_mode); select_shader_max_constants(ps_selected_mode, vs_selected_mode, &Adapters[0].gl_info); fillGLAttribFuncs(&Adapters[0].gl_info); - + init_type_lookup(&Adapters[0].gl_info); } numAdapters = 1; TRACE("%d adapters successfully initialized\n", numAdapters); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a24f213..0f4a8cb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -326,6 +326,38 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) return TRUE; } + +/* NOTE: Make sure these are in the correct numerical order. (see /include/wined3d_types.h) */ +static WINED3DGLTYPE const glTypeLookupTemplate[WINED3DDECLTYPE_UNUSED] = { + {WINED3DDECLTYPE_FLOAT1, 1, GL_FLOAT , GL_FALSE ,sizeof(float)}, + {WINED3DDECLTYPE_FLOAT2, 2, GL_FLOAT , GL_FALSE ,sizeof(float)}, + {WINED3DDECLTYPE_FLOAT3, 3, GL_FLOAT , GL_FALSE ,sizeof(float)}, + {WINED3DDECLTYPE_FLOAT4, 4, GL_FLOAT , GL_FALSE ,sizeof(float)}, + {WINED3DDECLTYPE_D3DCOLOR, 4, GL_UNSIGNED_BYTE , GL_TRUE ,sizeof(BYTE)}, + {WINED3DDECLTYPE_UBYTE4, 4, GL_UNSIGNED_BYTE , GL_FALSE ,sizeof(BYTE)}, + {WINED3DDECLTYPE_SHORT2, 2, GL_SHORT , GL_FALSE ,sizeof(short int)}, + {WINED3DDECLTYPE_SHORT4, 4, GL_SHORT , GL_FALSE ,sizeof(short int)}, + {WINED3DDECLTYPE_UBYTE4N, 4, GL_UNSIGNED_BYTE , GL_TRUE ,sizeof(BYTE)}, + {WINED3DDECLTYPE_SHORT2N, 2, GL_SHORT , GL_TRUE ,sizeof(short int)}, + {WINED3DDECLTYPE_SHORT4N, 4, GL_SHORT , GL_TRUE ,sizeof(short int)}, + {WINED3DDECLTYPE_USHORT2N, 2, GL_UNSIGNED_SHORT , GL_TRUE ,sizeof(short int)}, + {WINED3DDECLTYPE_USHORT4N, 4, GL_UNSIGNED_SHORT , GL_TRUE ,sizeof(short int)}, + {WINED3DDECLTYPE_UDEC3, 3, GL_UNSIGNED_SHORT , GL_FALSE ,sizeof(short int)}, + {WINED3DDECLTYPE_DEC3N, 3, GL_SHORT , GL_TRUE ,sizeof(short int)}, + {WINED3DDECLTYPE_FLOAT16_2, 2, GL_HALF_FLOAT_NV , GL_FALSE ,sizeof(GLhalfNV)}, + {WINED3DDECLTYPE_FLOAT16_4, 4, GL_HALF_FLOAT_NV , GL_FALSE ,sizeof(GLhalfNV)}}; + +void init_type_lookup(WineD3D_GL_Info *gl_info) { + memcpy(gl_info->glTypeLookup, glTypeLookupTemplate, sizeof(glTypeLookupTemplate)); + if(!GL_SUPPORT(NV_HALF_FLOAT)) { + /* Do not change the size of the type, it is CPU side. Whe have to change the GPU-side information though. + * It is the job of the vertex buffer code to make sure that the vbos have the right format + */ + gl_info->glTypeLookup[WINED3DDECLTYPE_FLOAT16_2].glType = GL_FLOAT; + gl_info->glTypeLookup[WINED3DDECLTYPE_FLOAT16_4].glType = GL_FLOAT; + } +} + #undef GLINFO_LOCATION #define GLINFO_LOCATION This->adapter->gl_info diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 524ace6..8df8db6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -114,42 +114,12 @@ extern DWORD *stateLookup[MAX_LOOKUPS]; extern DWORD minMipLookup[WINED3DTEXF_ANISOTROPIC + 1][WINED3DTEXF_LINEAR + 1]; -typedef struct _WINED3DGLTYPE { - int d3dType; - GLint size; - GLenum glType; - GLboolean normalized; - int typesize; -} WINED3DGLTYPE; - -/* NOTE: Make sure these are in the correct numerical order. (see /include/wined3d_types.h) */ -static WINED3DGLTYPE const glTypeLookup[WINED3DDECLTYPE_UNUSED] = { - {WINED3DDECLTYPE_FLOAT1, 1, GL_FLOAT , GL_FALSE ,sizeof(float)}, - {WINED3DDECLTYPE_FLOAT2, 2, GL_FLOAT , GL_FALSE ,sizeof(float)}, - {WINED3DDECLTYPE_FLOAT3, 3, GL_FLOAT , GL_FALSE ,sizeof(float)}, - {WINED3DDECLTYPE_FLOAT4, 4, GL_FLOAT , GL_FALSE ,sizeof(float)}, - {WINED3DDECLTYPE_D3DCOLOR, 4, GL_UNSIGNED_BYTE , GL_TRUE ,sizeof(BYTE)}, - {WINED3DDECLTYPE_UBYTE4, 4, GL_UNSIGNED_BYTE , GL_FALSE ,sizeof(BYTE)}, - {WINED3DDECLTYPE_SHORT2, 2, GL_SHORT , GL_FALSE ,sizeof(short int)}, - {WINED3DDECLTYPE_SHORT4, 4, GL_SHORT , GL_FALSE ,sizeof(short int)}, - {WINED3DDECLTYPE_UBYTE4N, 4, GL_UNSIGNED_BYTE , GL_TRUE ,sizeof(BYTE)}, - {WINED3DDECLTYPE_SHORT2N, 2, GL_SHORT , GL_TRUE ,sizeof(short int)}, - {WINED3DDECLTYPE_SHORT4N, 4, GL_SHORT , GL_TRUE ,sizeof(short int)}, - {WINED3DDECLTYPE_USHORT2N, 2, GL_UNSIGNED_SHORT , GL_TRUE ,sizeof(short int)}, - {WINED3DDECLTYPE_USHORT4N, 4, GL_UNSIGNED_SHORT , GL_TRUE ,sizeof(short int)}, - {WINED3DDECLTYPE_UDEC3, 3, GL_UNSIGNED_SHORT , GL_FALSE ,sizeof(short int)}, - {WINED3DDECLTYPE_DEC3N, 3, GL_SHORT , GL_TRUE ,sizeof(short int)}, - /* We should do an extension check for NV_HALF_FLOAT. However, without NV_HALF_FLOAT - * we won't be able to load the data at all, so at least for the moment it wouldn't - * gain us much. */ - {WINED3DDECLTYPE_FLOAT16_2, 2, GL_HALF_FLOAT_NV , GL_FALSE ,sizeof(GLhalfNV)}, - {WINED3DDECLTYPE_FLOAT16_4, 4, GL_HALF_FLOAT_NV , GL_FALSE ,sizeof(GLhalfNV)}}; - -#define WINED3D_ATR_TYPE(type) glTypeLookup[type].d3dType -#define WINED3D_ATR_SIZE(type) glTypeLookup[type].size -#define WINED3D_ATR_GLTYPE(type) glTypeLookup[type].glType -#define WINED3D_ATR_NORMALIZED(type) glTypeLookup[type].normalized -#define WINED3D_ATR_TYPESIZE(type) glTypeLookup[type].typesize +void init_type_lookup(WineD3D_GL_Info *gl_info); +#define WINED3D_ATR_TYPE(type) GLINFO_LOCATION.glTypeLookup[type].d3dType +#define WINED3D_ATR_SIZE(type) GLINFO_LOCATION.glTypeLookup[type].size +#define WINED3D_ATR_GLTYPE(type) GLINFO_LOCATION.glTypeLookup[type].glType +#define WINED3D_ATR_NORMALIZED(type) GLINFO_LOCATION.glTypeLookup[type].normalized +#define WINED3D_ATR_TYPESIZE(type) GLINFO_LOCATION.glTypeLookup[type].typesize /** * Settings diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index c364f09..84d8076 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -3634,6 +3634,14 @@ typedef struct { WINED3DFORMAT conversion_group; } GlPixelFormatDesc; +typedef struct _WINED3DGLTYPE { + int d3dType; + GLint size; + GLenum glType; + GLboolean normalized; + int typesize; +} WINED3DGLTYPE; + #define USE_GL_FUNC(type, pfn, ext, replace) type pfn; typedef struct _WineD3D_GL_Info { @@ -3695,6 +3703,9 @@ typedef struct _WineD3D_GL_Info { WGL_EXT_FUNCS_GEN; GlPixelFormatDesc *gl_formats; + + /* Vertex data types */ + WINED3DGLTYPE glTypeLookup[WINED3DDECLTYPE_UNUSED]; } WineD3D_GL_Info; #undef USE_GL_FUNC

1 0

Stefan Dösinger : wined3d: Fix vertex buffers based on type, not semantic.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: 6ac59b96ed8a85181c0bc93d31ac2aee21aa2205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac59b96ed8a85181c0bc93d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 19 17:13:57 2007 +0100 wined3d: Fix vertex buffers based on type, not semantic. --- dlls/wined3d/vertexbuffer.c | 346 +++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 234 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ac59b96ed8a85181c0bc…

1 0

Stefan Dösinger : wined3d: Fixed function vertex attribute types are flexible.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: 2d904495003f65a9fefb96eacf828617f3bb9c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d904495003f65a9fefb96eac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 19 17:10:02 2007 +0100 wined3d: Fixed function vertex attribute types are flexible. --- dlls/d3d9/tests/visual.c | 241 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 140 +++++++++++++++++++++++- dlls/wined3d/drawprim.c | 85 ++++++--------- dlls/wined3d/state.c | 7 +- dlls/wined3d/wined3d_private.h | 7 + 5 files changed, 425 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d904495003f65a9fefb9…

1 0

Stefan Dösinger : wined3d: Store if half float conversion is needed in the decl.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: a3c2fb9e641158dc404ea1dbc32fd8b7cbb06ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c2fb9e641158dc404ea1dbc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 20 01:34:22 2007 +0100 wined3d: Store if half float conversion is needed in the decl. --- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/state.c | 2 +- dlls/wined3d/vertexdeclaration.c | 6 +++++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f044a92..59a952f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -201,7 +201,7 @@ void primitiveDeclarationConvertToStridedData( if((UINT_PTR)data < -This->stateBlock->loadBaseVertexIndex * stride) { FIXME("System memory vertex data load offset is negative!\n"); } - } else if(vertexDeclaration->half_float_used && !GL_SUPPORT(NV_HALF_FLOAT)) { + } else if(vertexDeclaration->half_float_conv_needed) { WARN("Half float vertex data used, but GL_NV_half_float is not supported. Not using vbos\n"); streamVBO = 0; data = ((IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[element->Stream])->resource.allocatedMemory; @@ -1127,7 +1127,7 @@ void drawPrimitive(IWineD3DDevice *iface, /* Instancing emulation with mixing immediate mode and arrays */ drawStridedInstanced(iface, &This->strided_streams, calculatedNumberOfindices, glPrimType, idxData, idxSize, minIndex, StartIdx, StartVertexIndex); - } else if(GL_SUPPORT(NV_HALF_FLOAT) || (!((IWineD3DVertexDeclarationImpl *) This->stateBlock->vertexDecl)->half_float_used)) { + } else if(!((IWineD3DVertexDeclarationImpl *) This->stateBlock->vertexDecl)->half_float_conv_needed) { drawStridedFast(iface, calculatedNumberOfindices, glPrimType, idxData, idxSize, minIndex, StartIdx, StartVertexIndex); } else { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 29dd4e6..d26b91d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2884,7 +2884,7 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, WineDi /* Default to no instancing */ stateblock->wineD3DDevice->instancedDraw = FALSE; - if(((IWineD3DVertexDeclarationImpl *)stateblock->vertexDecl)->half_float_used && !GL_SUPPORT(NV_HALF_FLOAT)) { + if(((IWineD3DVertexDeclarationImpl *)stateblock->vertexDecl)->half_float_conv_needed) { /* This will be handled using drawStridedSlow */ return; } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 929fd45..4e1e1b6 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); +#define GLINFO_LOCATION This->wineD3DDevice->adapter->gl_info + static void dump_wined3dvertexelement(const WINED3DVERTEXELEMENT *element) { TRACE(" Stream: %d\n", element->Stream); TRACE(" Offset: %d\n", element->Offset); @@ -185,7 +187,9 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte This->num_swizzled_attribs++; } else if(This->pDeclarationWine[i].Type == WINED3DDECLTYPE_FLOAT16_2 || This->pDeclarationWine[i].Type == WINED3DDECLTYPE_FLOAT16_4) { - This->half_float_used = TRUE; + if(!GL_SUPPORT(NV_HALF_FLOAT)) { + This->half_float_conv_needed = TRUE; + } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d3f3a59..ad8047c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1268,7 +1268,7 @@ typedef struct IWineD3DVertexDeclarationImpl { DWORD streams[MAX_STREAMS]; UINT num_streams; BOOL position_transformed; - BOOL half_float_used; + BOOL half_float_conv_needed; /* Ordered array of declaration types that need swizzling in a vshader */ attrib_declaration swizzled_attribs[MAX_ATTRIBS];

1 0

Stefan Dösinger : wined3d: Always dump the fbo state on errors.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: 30c1abb1eb80b47227e89223f0176023c1ba7fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c1abb1eb80b47227e89223f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 18 14:02:20 2007 +0100 wined3d: Always dump the fbo state on errors. --- dlls/wined3d/device.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1793ed4..d5efe8b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6192,26 +6192,23 @@ static void check_fbo_status(IWineD3DDevice *iface) { if (status == GL_FRAMEBUFFER_COMPLETE_EXT) { TRACE("FBO complete\n"); } else { + IWineD3DSurfaceImpl *attachment; + int i; FIXME("FBO status %s (%#x)\n", debug_fbostatus(status), status); /* Dump the FBO attachments */ - if (status == GL_FRAMEBUFFER_UNSUPPORTED_EXT) { - IWineD3DSurfaceImpl *attachment; - int i; - - for (i = 0; i < GL_LIMITS(buffers); ++i) { - attachment = (IWineD3DSurfaceImpl *)This->fbo_color_attachments[i]; - if (attachment) { - FIXME("\tColor attachment %d: (%p) %s %ux%u\n", i, attachment, debug_d3dformat(attachment->resource.format), - attachment->pow2Width, attachment->pow2Height); - } - } - attachment = (IWineD3DSurfaceImpl *)This->fbo_depth_attachment; + for (i = 0; i < GL_LIMITS(buffers); ++i) { + attachment = (IWineD3DSurfaceImpl *)This->fbo_color_attachments[i]; if (attachment) { - FIXME("\tDepth attachment: (%p) %s %ux%u\n", attachment, debug_d3dformat(attachment->resource.format), + FIXME("\tColor attachment %d: (%p) %s %ux%u\n", i, attachment, debug_d3dformat(attachment->resource.format), attachment->pow2Width, attachment->pow2Height); } } + attachment = (IWineD3DSurfaceImpl *)This->fbo_depth_attachment; + if (attachment) { + FIXME("\tDepth attachment: (%p) %s %ux%u\n", attachment, debug_d3dformat(attachment->resource.format), + attachment->pow2Width, attachment->pow2Height); + } } }

1 0

Dmitry Timoshkov : gdi32: Add a test for minimal acceptable DEVMODEA size, make it pass under Wine.
by Alexandre Julliard Dec. 20, 2007

Dec. 20, 2007

Module: wine Branch: master Commit: c3fe9ec2f74ed135df1fb08faf13730050734b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3fe9ec2f74ed135df1fb08fa… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 20 14:49:59 2007 +0800 gdi32: Add a test for minimal acceptable DEVMODEA size, make it pass under Wine. --- dlls/gdi32/driver.c | 5 +++++ dlls/gdi32/tests/dc.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a2aa033..31810b0 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -414,6 +414,11 @@ DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA) WORD dmW_size, dmA_size; dmA_size = dmA->dmSize; + + /* this is the minimal dmSize that XP accepts */ + if (dmA_size < FIELD_OFFSET(DEVMODEA, dmFields)) + return NULL; + if (dmA_size > sizeof(DEVMODEA)) dmA_size = sizeof(DEVMODEA); diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 60b6ad7..01cb064 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -222,6 +222,19 @@ static void test_GdiConvertToDevmodeW(void) "expected %04x, got %04x\n", FIELD_OFFSET(DEVMODEW, dmPanningHeight) + sizeof(dmW->dmPanningHeight), dmW->dmSize); HeapFree(GetProcessHeap(), 0, dmW); + + SetLastError(0xdeadbeef); + dmA.dmSize = 0; + dmW = pGdiConvertToDevmodeW(&dmA); + ok(!dmW, "GdiConvertToDevmodeW should fail\n"); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + + /* this is the minimal dmSize that XP accepts */ + dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmFields); + dmW = pGdiConvertToDevmodeW(&dmA); + ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields), + "expected %04x, got %04x\n", FIELD_OFFSET(DEVMODEW, dmFields), dmW->dmSize); + HeapFree(GetProcessHeap(), 0, dmW); } START_TEST(dc)

1 0