January 2009 - Wine-commits

Dylan Smith : richedit: Added tests for WM_GETDLGCODE message.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: c636b59bcf9af2c4ad8070940f16a31ad2054260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c636b59bcf9af2c4ad8070940… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jan 8 00:44:05 2009 -0500 richedit: Added tests for WM_GETDLGCODE message. --- dlls/riched20/tests/editor.c | 172 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 172 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9e2f5e4..d9c5d78 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6010,6 +6010,177 @@ static void test_format_rect(void) DestroyWindow(hwnd); } +static void test_WM_GETDLGCODE(void) +{ + HWND hwnd; + UINT res, expected; + MSG msg; + + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL|DLGC_WANTMESSAGE; + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + ES_MULTILINE|ES_WANTRETURN|WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, 0); + expected = expected | DLGC_WANTMESSAGE; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + msg.message = WM_KEYDOWN; + msg.wParam = VK_RETURN; + msg.lParam = MapVirtualKey(VK_RETURN, MAPVK_VK_TO_VSC) | 0x0001; + msg.pt.x = 0; + msg.pt.y = 0; + msg.time = GetTickCount(); + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + ES_MULTILINE|ES_WANTRETURN|WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = expected | DLGC_WANTMESSAGE; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + ES_MULTILINE|WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL|DLGC_WANTMESSAGE; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + ES_WANTRETURN|WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + msg.wParam = VK_TAB; + msg.lParam = MapVirtualKey(VK_TAB, MAPVK_VK_TO_VSC) | 0x0001; + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + ES_MULTILINE|WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL|DLGC_WANTMESSAGE; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + hold_key(VK_CONTROL); + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + ES_MULTILINE|WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL|DLGC_WANTMESSAGE; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + release_key(VK_CONTROL); + + msg.wParam = 'a'; + msg.lParam = MapVirtualKey('a', MAPVK_VK_TO_VSC) | 0x0001; + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + ES_MULTILINE|WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL|DLGC_WANTMESSAGE; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + msg.message = WM_CHAR; + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + ES_MULTILINE|WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL|DLGC_WANTMESSAGE; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + WS_POPUP, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + msg.hwnd = hwnd; + res = SendMessage(hwnd, WM_GETDLGCODE, VK_RETURN, (LPARAM)&msg); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL; + todo_wine ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); +} + START_TEST( editor ) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -6063,6 +6234,7 @@ START_TEST( editor ) test_word_wrap(); test_auto_yscroll(); test_format_rect(); + test_WM_GETDLGCODE(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Henri Verbeet : wined3d: Simplify handling of swizzled attributes.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 6791e6b752413a4d0e08e84fa565873b922cb1de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6791e6b752413a4d0e08e84fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 8 10:19:17 2009 +0100 wined3d: Simplify handling of swizzled attributes. This should also be a little bit faster. --- dlls/wined3d/arb_program_shader.c | 3 +- dlls/wined3d/drawprim.c | 3 + dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/vertexdeclaration.c | 36 +------- dlls/wined3d/vertexshader.c | 166 +----------------------------------- dlls/wined3d/wined3d_private.h | 17 +---- include/wine/wined3d.idl | 2 + 7 files changed, 18 insertions(+), 212 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6791e6b752413a4d0e08e…

1 0

Henri Verbeet : wined3d: Move position_transformed out of u. s in struct WineDirect3DVertexStridedData.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: cc447eac55a5c54535d9a5196b27592ac73808aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc447eac55a5c54535d9a5196… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 8 10:19:16 2009 +0100 wined3d: Move position_transformed out of u.s in struct WineDirect3DVertexStridedData. --- dlls/ddraw/device.c | 8 ++++---- dlls/wined3d/drawprim.c | 12 ++++++------ dlls/wined3d/pixelshader.c | 5 +++-- dlls/wined3d/state.c | 8 +++----- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 3 ++- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ab6623a..d35a297 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4003,9 +4003,9 @@ IDirect3DDeviceImpl_7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, if (VertexType & D3DFVF_XYZRHW) { WineD3DStrided.u.s.position.dwType = WINED3DDECLTYPE_FLOAT4; - WineD3DStrided.u.s.position_transformed = TRUE; + WineD3DStrided.position_transformed = TRUE; } else - WineD3DStrided.u.s.position_transformed = FALSE; + WineD3DStrided.position_transformed = FALSE; } if(VertexType & D3DFVF_NORMAL) @@ -4181,9 +4181,9 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, if (VertexType & D3DFVF_XYZRHW) { WineD3DStrided.u.s.position.dwType = WINED3DDECLTYPE_FLOAT4; - WineD3DStrided.u.s.position_transformed = TRUE; + WineD3DStrided.position_transformed = TRUE; } else - WineD3DStrided.u.s.position_transformed = FALSE; + WineD3DStrided.position_transformed = FALSE; } if(VertexType & D3DFVF_NORMAL) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index fbeb3e8..7d87ca1 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -152,7 +152,7 @@ void primitiveDeclarationConvertToStridedData( const DWORD *streams = vertexDeclaration->streams; /* Check for transformed vertices, disable vertex shader if present */ - strided->u.s.position_transformed = vertexDeclaration->position_transformed; + strided->position_transformed = vertexDeclaration->position_transformed; if(vertexDeclaration->position_transformed) { useVertexShaderFunction = FALSE; } @@ -861,8 +861,9 @@ void drawPrimitive(IWineD3DDevice *iface, int PrimitiveType, long NumPrimitives, if (!use_vs(This->stateBlock)) { - if(!This->strided_streams.u.s.position_transformed && This->activeContext->num_untracked_materials && - This->stateBlock->renderState[WINED3DRS_LIGHTING]) { + if (!This->strided_streams.position_transformed && This->activeContext->num_untracked_materials + && This->stateBlock->renderState[WINED3DRS_LIGHTING]) + { static BOOL warned; if (!warned) { FIXME("Using software emulation because not all material properties could be tracked\n"); @@ -1027,9 +1028,8 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, vtxStride * info->StartVertexOffsetWidth; /* Not entirely sure about what happens with transformed vertices */ - if(strided.u.s.position_transformed) { - FIXME("Transformed position in rectpatch generation\n"); - } + if (strided.position_transformed) FIXME("Transformed position in rectpatch generation\n"); + if(vtxStride % sizeof(GLfloat)) { /* glMap2f reads vertex sizes in GLfloats, the d3d stride is in bytes. * I don't see how the stride could not be a multiple of 4, but make sure diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 1a337ca..9f96c59 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -477,7 +477,8 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp } if (shader->baseShader.reg_maps.shader_version >= WINED3DPS_VERSION(3,0)) { - if(((IWineD3DDeviceImpl *) shader->baseShader.device)->strided_streams.u.s.position_transformed) { + if (((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.position_transformed) + { args->vp_mode = pretransformed; } else if (use_vs(stateblock)) @@ -492,7 +493,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp if(stateblock->renderState[WINED3DRS_FOGENABLE]) { switch(stateblock->renderState[WINED3DRS_FOGTABLEMODE]) { case WINED3DFOG_NONE: - if (((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.u.s.position_transformed + if (((IWineD3DDeviceImpl *)shader->baseShader.device)->strided_streams.position_transformed || use_vs(stateblock)) { args->fog = FOG_LINEAR; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index de4e332..7258ed3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -95,7 +95,7 @@ static void state_lighting(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine transformed = ((stateblock->wineD3DDevice->strided_streams.u.s.position.lpData != NULL || stateblock->wineD3DDevice->strided_streams.u.s.position.VBO != 0) && - stateblock->wineD3DDevice->strided_streams.u.s.position_transformed) ? TRUE : FALSE; + stateblock->wineD3DDevice->strided_streams.position_transformed) ? TRUE : FALSE; if (stateblock->renderState[WINED3DRS_LIGHTING] && !transformed) { glEnable(GL_LIGHTING); @@ -4321,9 +4321,7 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo useVertexShaderFunction, dataLocations, &fixup); } - if (dataLocations->u.s.position_transformed) { - useVertexShaderFunction = FALSE; - } + if (dataLocations->position_transformed) useVertexShaderFunction = FALSE; if(useVertexShaderFunction) { if(((IWineD3DVertexDeclarationImpl *) stateblock->vertexDecl)->half_float_conv_needed && !fixup) { @@ -4403,7 +4401,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W updateFog = TRUE; } - transformed = device->strided_streams.u.s.position_transformed; + transformed = device->strided_streams.position_transformed; if(transformed != context->last_was_rhw && !useVertexShaderFunction) { updateFog = TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 516cd9f..cab2b20 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2454,7 +2454,7 @@ const StaticPixelFormatDesc *getFormatDescEntry(WINED3DFORMAT fmt, static inline BOOL use_vs(IWineD3DStateBlockImpl *stateblock) { return (stateblock->vertexShader - && !stateblock->wineD3DDevice->strided_streams.u.s.position_transformed + && !stateblock->wineD3DDevice->strided_streams.position_transformed && stateblock->wineD3DDevice->vs_selected_mode != SHADER_NONE); } diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 324f5a2..0ee7b1f 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1879,10 +1879,11 @@ typedef struct WineDirect3DVertexStridedData WineDirect3DStridedData sample; /* Add fields here */ - BOOL position_transformed; } s; WineDirect3DStridedData input[16]; /* Indexed by constants in D3DVSDE_REGISTER */ } u; + + BOOL position_transformed; } WineDirect3DVertexStridedData; typedef struct _WINED3DVSHADERCAPS2_0

1 0

Henri Verbeet : wined3d: Cleanup drawStridedFast().
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 1a1f5ec69da7de8af24797241b87c972b32964c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1f5ec69da7de8af24797241… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 8 10:19:16 2009 +0100 wined3d: Cleanup drawStridedFast(). Remove some uncessary code and use more descriptive parameter names. Note that max_vertex_idx isn't the same as "minIndex + calculatedNumberOfindices - 1" but rather "minIndex + numberOfVertices - 1". calculatedNumberOfindices just specifies the number of vertices that's drawn, while numberOfVertices specifies the range of vertices that's drawn. --- dlls/wined3d/drawprim.c | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f7443f2..fbeb3e8 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -253,33 +253,35 @@ void primitiveDeclarationConvertToStridedData( } } -static void drawStridedFast(IWineD3DDevice *iface, UINT numberOfVertices, GLenum glPrimitiveType, - const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx) +static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type, + UINT min_vertex_idx, UINT max_vertex_idx, UINT count, short idx_size, + const void *idx_data, UINT start_idx) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - if (idxSize != 0 /* This crashes sometimes!*/) { - TRACE("(%p) : glElements(%x, %d, %d, ...)\n", This, glPrimitiveType, numberOfVertices, minIndex); - idxData = idxData == (void *)-1 ? NULL : idxData; + if (idx_size) + { + TRACE("(%p) : glElements(%x, %d, %d, ...)\n", This, primitive_type, count, min_vertex_idx); + #if 1 - glDrawElements(glPrimitiveType, numberOfVertices, idxSize == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, - (const char *)idxData+(idxSize * startIdx)); + glDrawElements(primitive_type, count, + idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, + (const char *)idx_data + (idx_size * start_idx)); checkGLcall("glDrawElements"); -#else /* using drawRangeElements may be faster */ - - glDrawRangeElements(glPrimitiveType, minIndex, minIndex + numberOfVertices - 1, numberOfVertices, - idxSize == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, - (const char *)idxData+(idxSize * startIdx)); +#else + glDrawRangeElements(primitive_type, min_vertex_idx, max_vertex_idx, count, + idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, + (const char *)idx_data + (idx_size * start_idx)); checkGLcall("glDrawRangeElements"); #endif + } + else + { + TRACE("(%p) : glDrawArrays(%#x, %d, %d)\n", This, primitive_type, start_idx, count); - } else { - TRACE("(%p) : glDrawArrays(%#x, %d, %d)\n", This, glPrimitiveType, startIdx, numberOfVertices); - glDrawArrays(glPrimitiveType, startIdx, numberOfVertices); + glDrawArrays(primitive_type, start_idx, count); checkGLcall("glDrawArrays"); } - - return; } /* @@ -913,8 +915,8 @@ void drawPrimitive(IWineD3DDevice *iface, int PrimitiveType, long NumPrimitives, drawStridedInstanced(iface, &This->strided_streams, calculatedNumberOfindices, glPrimType, idxData, idxSize, minIndex, StartIdx); } else { - drawStridedFast(iface, calculatedNumberOfindices, glPrimType, - idxData, idxSize, minIndex, StartIdx); + drawStridedFast(iface, glPrimType, minIndex, minIndex + numberOfVertices - 1, + calculatedNumberOfindices, idxSize, idxData, StartIdx); } }

1 0

Alexandre Julliard : user32/tests: Fix some integer to pointer conversion warnings.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: d852ac0b1fc7ff7c81a30e0bea91228e528a0cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d852ac0b1fc7ff7c81a30e0be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:18:01 2009 +0100 user32/tests: Fix some integer to pointer conversion warnings. --- dlls/user32/tests/dialog.c | 14 +++++++------- dlls/user32/tests/msg.c | 2 +- dlls/user32/tests/win.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index f92566c..3f07bd3 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -54,7 +54,7 @@ static BOOL g_bInitialFocusInitDlgResult; static int g_terminated; typedef struct { - unsigned int id; + INT_PTR id; int parent; DWORD style; DWORD exstyle; @@ -160,7 +160,7 @@ static BOOL CreateWindows (HINSTANCE hinst) { if (p->id >= sizeof(hwnd)/sizeof(hwnd[0])) { - trace ("Control %d is out of range\n", p->id); + trace ("Control %ld is out of range\n", p->id); return FALSE; } else @@ -168,21 +168,21 @@ static BOOL CreateWindows (HINSTANCE hinst) } if (p->id <= 0) { - trace ("Control %d is out of range\n", p->id); + trace ("Control %ld is out of range\n", p->id); return FALSE; } if (hwnd[p->id] != 0) { - trace ("Control %d is used more than once\n", p->id); + trace ("Control %ld is used more than once\n", p->id); return FALSE; } /* Create the control */ - sprintf (ctrlname, "ctrl%4.4d", p->id); + sprintf (ctrlname, "ctrl%4.4ld", p->id); hwnd[p->id] = CreateWindowEx (p->exstyle, TEXT(p->parent ? "static" : "GetNextDlgItemWindowClass"), TEXT(ctrlname), p->style, 10, 10, 10, 10, hwnd[p->parent], p->parent ? (HMENU) (2000 + p->id) : 0, hinst, 0); if (!hwnd[p->id]) { - trace ("Failed to create control %d\n", p->id); + trace ("Failed to create control %ld\n", p->id); return FALSE; } @@ -196,7 +196,7 @@ static BOOL CreateWindows (HINSTANCE hinst) exstyle = GetWindowLong (hwnd[p->id], GWL_EXSTYLE); if (style != p->style || exstyle != p->exstyle) { - trace ("Style mismatch at %d: %8.8x %8.8x cf %8.8x %8.8x\n", p->id, style, exstyle, p->style, p->exstyle); + trace ("Style mismatch at %ld: %8.8x %8.8x cf %8.8x %8.8x\n", p->id, style, exstyle, p->style, p->exstyle); } } p++; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9ad9fde..b77a102 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8263,7 +8263,7 @@ static void test_DestroyWindow(void) { BOOL ret; HWND parent, child1, child2, child3, child4, test; - UINT child_id = WND_CHILD_ID + 1; + UINT_PTR child_id = WND_CHILD_ID + 1; parent = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4bb495c..99b58c0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1972,7 +1972,7 @@ static void test_SetMenu(HWND parent) static void test_window_tree(HWND parent, const DWORD *style, const int *order, int total) { HWND child[5], hwnd; - int i; + INT_PTR i; assert(total <= 5); @@ -1993,7 +1993,7 @@ static void test_window_tree(HWND parent, const DWORD *style, const int *order, else child[i] = CreateWindowExA(0, "static", "", style[i], 0,0,10,10, parent, (HMENU)i, 0, NULL); - trace("child[%d] = %p\n", i, child[i]); + trace("child[%ld] = %p\n", i, child[i]); ok(child[i] != 0, "CreateWindowEx failed to create child window\n"); } @@ -2004,8 +2004,8 @@ static void test_window_tree(HWND parent, const DWORD *style, const int *order, for (i = 0; i < total; i++) { - trace("hwnd[%d] = %p\n", i, hwnd); - ok(child[order[i]] == hwnd, "Z order of child #%d is wrong\n", i); + trace("hwnd[%ld] = %p\n", i, hwnd); + ok(child[order[i]] == hwnd, "Z order of child #%ld is wrong\n", i); hwnd = GetWindow(hwnd, GW_HWNDNEXT); }

1 0

Alexandre Julliard : version: Avoid pointer casts in a trace.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: b33995eda8b67a7bf937ed940ec1aa2fd26c5d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33995eda8b67a7bf937ed940… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:13:15 2009 +0100 version: Avoid pointer casts in a trace. --- dlls/version/resource.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index fdfd3ba..ef5ded2 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -401,9 +401,8 @@ DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType, OFSTRUCT ofs; DWORD reslen; - TRACE("(%s,type=0x%x,id=0x%x,off=%p)\n", - debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId, - lpszResId ); + TRACE("(%s,type=%p,id=%p,off=%p)\n", + debugstr_a(lpszFileName), lpszResType, lpszResId, lpszResId ); lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ ); if ( lzfd < 0 ) return 0;

1 0

Alexandre Julliard : wininet: Avoid pointer casts in traces.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 4984d1907280f3d55bc3e9f9b69d029afd458ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4984d1907280f3d55bc3e9f9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:13:22 2009 +0100 wininet: Avoid pointer casts in traces. --- dlls/wininet/internet.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 94ff541..03e9e74 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1824,8 +1824,8 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackA( INTERNET_STATUS_CALLBACK retVal; LPWININETHANDLEHEADER lpwh; - TRACE("0x%08x\n", (ULONG)hInternet); - + TRACE("%p\n", hInternet); + if (!(lpwh = WININET_GetObject(hInternet))) return INTERNET_INVALID_STATUS_CALLBACK; @@ -1852,7 +1852,7 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW( INTERNET_STATUS_CALLBACK retVal; LPWININETHANDLEHEADER lpwh; - TRACE("0x%08x\n", (ULONG)hInternet); + TRACE("%p\n", hInternet); if (!(lpwh = WININET_GetObject(hInternet))) return INTERNET_INVALID_STATUS_CALLBACK;

1 0

Alexandre Julliard : quartz: Avoid a pointer cast in a trace.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 0014046adcdf0454b3b19a3de3a32f7ac69fa940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0014046adcdf0454b3b19a3de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:17:49 2009 +0100 quartz: Avoid a pointer cast in a trace. --- dlls/quartz/videorenderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ac948d5..4d38164 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1989,7 +1989,7 @@ static HRESULT WINAPI Videowindow_get_Owner(IVideoWindow *iface, OAHWND *Owner) { ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); - TRACE("(%p/%p)->(%08x)\n", This, iface, (DWORD) Owner); + TRACE("(%p/%p)->(%p)\n", This, iface, Owner); *(HWND*)Owner = GetParent(This->hWnd);

1 0

Alexandre Julliard : kernel32/tests: Fix some integer to pointer conversion warnings.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 02a1c0d7ee4da6c6178388de7cddde79cf012d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a1c0d7ee4da6c6178388de7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:17:53 2009 +0100 kernel32/tests: Fix some integer to pointer conversion warnings. --- dlls/kernel32/tests/process.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 0568b52..22d5cbf 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -241,7 +241,7 @@ static void doChild(const char* file, const char* option) siA.dwX, siA.dwY, siA.dwXSize, siA.dwYSize, siA.dwXCountChars, siA.dwYCountChars, siA.dwFillAttribute, siA.dwFlags, siA.wShowWindow, - (DWORD)siA.hStdInput, (DWORD)siA.hStdOutput, (DWORD)siA.hStdError); + (DWORD_PTR)siA.hStdInput, (DWORD_PTR)siA.hStdOutput, (DWORD_PTR)siA.hStdError); /* since GetStartupInfoW is only implemented in win2k, * zero out before calling so we can notice the difference @@ -258,7 +258,7 @@ static void doChild(const char* file, const char* option) siW.dwX, siW.dwY, siW.dwXSize, siW.dwYSize, siW.dwXCountChars, siW.dwYCountChars, siW.dwFillAttribute, siW.dwFlags, siW.wShowWindow, - (DWORD)siW.hStdInput, (DWORD)siW.hStdOutput, (DWORD)siW.hStdError); + (DWORD_PTR)siW.hStdInput, (DWORD_PTR)siW.hStdOutput, (DWORD_PTR)siW.hStdError); /* Arguments */ childPrintf(hFile, "[Arguments]\nargcA=%d\n", myARGC); @@ -492,7 +492,7 @@ static void ok_child_stringWA( int line, const char *sect, const char *key, #define okChildInt(sect, key, expect) \ do { \ UINT result = GetPrivateProfileIntA((sect), (key), !(expect), resfile); \ - ok(result == expect, "%s:%s expected %d, but got %d\n", (sect), (key), (int)(expect), result); \ + ok(result == expect, "%s:%s expected %u, but got %u\n", (sect), (key), (UINT)(expect), result); \ } while (0) static void test_Startup(void) @@ -1292,9 +1292,9 @@ static void test_Console(void) okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); /* check child correctly inherited the console */ - okChildInt("StartupInfoA", "hStdInput", (DWORD)startup.hStdInput); - okChildInt("StartupInfoA", "hStdOutput", (DWORD)startup.hStdOutput); - okChildInt("StartupInfoA", "hStdError", (DWORD)startup.hStdError); + okChildInt("StartupInfoA", "hStdInput", (DWORD_PTR)startup.hStdInput); + okChildInt("StartupInfoA", "hStdOutput", (DWORD_PTR)startup.hStdOutput); + okChildInt("StartupInfoA", "hStdError", (DWORD_PTR)startup.hStdError); okChildInt("Console", "SizeX", (DWORD)sbi.dwSize.X); okChildInt("Console", "SizeY", (DWORD)sbi.dwSize.Y); okChildInt("Console", "CursorX", (DWORD)sbi.dwCursorPosition.X);

1 0

Alexandre Julliard : shell32: Avoid a pointer cast in a trace.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: bb283bf534d15da8f2786431acb972dede6913f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb283bf534d15da8f2786431a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 13:13:01 2009 +0100 shell32: Avoid a pointer cast in a trace. --- dlls/shell32/shelllink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index b4a686e..3329fc8 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2529,7 +2529,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) if ( lpici->lpVerb != MAKEINTRESOURCEA(This->iIdOpen) ) { - ERR("Unknown id %d != %d\n", (INT)lpici->lpVerb, This->iIdOpen ); + ERR("Unknown id %p != %d\n", lpici->lpVerb, This->iIdOpen ); return E_INVALIDARG; }

1 0