January 2013 - Wine-Commits

Rico Schüller : d3dx9: Use all 32 bits as mask.
by Alexandre Julliard Jan. 10, 2013

Jan. 10, 2013

Module: wine Branch: master Commit: f7d877061d55eb12f1beb356a5b22b11c35e0d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d877061d55eb12f1beb356a… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 17:57:40 2013 +0100 d3dx9: Use all 32 bits as mask. --- dlls/d3dx9_36/texture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index c93d2df..a6e769b 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1216,7 +1216,7 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po for (c = 0; c < 4; c++) { float comp_value; - DWORD i, v; + DWORD i, v, mask32 = format->bits[c] == 32 ? ~0U : ((1 << format->bits[c]) - 1); switch (c) { @@ -1242,12 +1242,12 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po if (format->shift[c] > i) { - mask = ((1 << format->bits[c]) - 1) << (format->shift[c] - i); + mask = mask32 << (format->shift[c] - i); byte = (v << (format->shift[c] - i)) & mask; } else { - mask = ((1 << format->bits[c]) - 1) >> (i - format->shift[c]); + mask = mask32 >> (i - format->shift[c]); byte = (v >> (i - format->shift[c])) & mask; } pos[i / 8] |= byte;

1 0

Rico Schüller : d3dx9: Introduce a function for filling a texture.
by Alexandre Julliard Jan. 10, 2013

Jan. 10, 2013

Module: wine Branch: master Commit: 275f784009308fbaed9db38a1462914cfd201f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275f784009308fbaed9db38a1… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 17:57:16 2013 +0100 d3dx9: Introduce a function for filling a texture. --- dlls/d3dx9_36/texture.c | 159 +++++++++++++++-------------------------------- 1 files changed, 51 insertions(+), 108 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 788a572..2531ea6 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1206,18 +1206,57 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic return D3D_OK; } +static inline void fill_texture(const struct pixel_format_desc *format, BYTE *pos, const D3DXVECTOR4 *value) +{ + DWORD c; + + for (c = 0; c < format->bytes_per_pixel; c++) + pos[c] = 0; + + for (c = 0; c < 4; c++) + { + float comp_value; + DWORD i, v; + + switch (c) + { + case 0: /* Alpha */ + comp_value = value->w; + break; + case 1: /* Red */ + comp_value = value->x; + break; + case 2: /* Green */ + comp_value = value->y; + break; + case 3: /* Blue */ + comp_value = value->z; + break; + } + + v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; + + for (i = 0; i < format->bits[c] + format->shift[c]; i += 8) + { + BYTE byte, mask; + + mask = ((1 << format->bits[c]) - 1) << format->shift[c] >> i; + byte = (v << format->shift[c] >> i) & mask; + pos[i / 8] |= byte; + } + } +} + HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D function, void *funcdata) { DWORD miplevels; - DWORD m, i, x, y, c, v; + DWORD m, x, y; D3DSURFACE_DESC desc; D3DLOCKED_RECT lock_rect; D3DXVECTOR4 value; D3DXVECTOR2 coord, size; const struct pixel_format_desc *format; - BYTE *data, *pos; - BYTE byte, mask; - float comp_value; + BYTE *data; if (texture == NULL || function == NULL) return D3DERR_INVALIDCALL; @@ -1256,38 +1295,7 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f function(&value, &coord, &size, funcdata); - pos = data + y * lock_rect.Pitch + x * format->bytes_per_pixel; - - for (i = 0; i < format->bytes_per_pixel; i++) - pos[i] = 0; - - for (c = 0; c < 4; c++) - { - switch (c) - { - case 0: /* Alpha */ - comp_value = value.w; - break; - case 1: /* Red */ - comp_value = value.x; - break; - case 2: /* Green */ - comp_value = value.y; - break; - case 3: /* Blue */ - comp_value = value.z; - break; - } - - v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; - - for (i = 0; i < format->bits[c] + format->shift[c]; i += 8) - { - mask = ((1 << format->bits[c]) - 1) << format->shift[c] >> i; - byte = (v << format->shift[c] >> i) & mask; - pos[i / 8] |= byte; - } - } + fill_texture(format, data + y * lock_rect.Pitch + x * format->bytes_per_pixel, &value); } } IDirect3DTexture9_UnlockRect(texture, m); @@ -1600,15 +1608,13 @@ static float get_cube_coord(enum cube_coord coord, unsigned int x, unsigned int HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DXFILL3D function, void *funcdata) { DWORD miplevels; - DWORD m, i, x, y, c, f, v; + DWORD m, x, y, f; D3DSURFACE_DESC desc; D3DLOCKED_RECT lock_rect; D3DXVECTOR4 value; D3DXVECTOR3 coord, size; const struct pixel_format_desc *format; - BYTE *data, *pos; - BYTE byte, mask; - float comp_value; + BYTE *data; static const enum cube_coord coordmap[6][3] = { {ONE, YCOORDINV, XCOORDINV}, @@ -1657,38 +1663,7 @@ HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DX function(&value, &coord, &size, funcdata); - pos = data + y * lock_rect.Pitch + x * format->bytes_per_pixel; - - for (i = 0; i < format->bytes_per_pixel; i++) - pos[i] = 0; - - for (c = 0; c < 4; c++) - { - switch (c) - { - case 0: /* Alpha */ - comp_value = value.w; - break; - case 1: /* Red */ - comp_value = value.x; - break; - case 2: /* Green */ - comp_value = value.y; - break; - case 3: /* Blue */ - comp_value = value.z; - break; - } - - v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; - - for (i = 0; i < format->bits[c] + format->shift[c]; i += 8) - { - mask = ((1 << format->bits[c]) - 1) << format->shift[c] >> i; - byte = (v << format->shift[c] >> i) & mask; - pos[i / 8] |= byte; - } - } + fill_texture(format, data + y * lock_rect.Pitch + x * format->bytes_per_pixel, &value); } } IDirect3DCubeTexture9_UnlockRect(texture, f, m); @@ -1701,15 +1676,13 @@ HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DX HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *texture, LPD3DXFILL3D function, void *funcdata) { DWORD miplevels; - DWORD m, i, x, y, z, c, v; + DWORD m, x, y, z; D3DVOLUME_DESC desc; D3DLOCKED_BOX lock_box; D3DXVECTOR4 value; D3DXVECTOR3 coord, size; const struct pixel_format_desc *format; - BYTE *data, *pos; - BYTE byte, mask; - float comp_value; + BYTE *data; if (texture == NULL || function == NULL) return D3DERR_INVALIDCALL; @@ -1753,38 +1726,8 @@ HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *texture, LP function(&value, &coord, &size, funcdata); - pos = data + z * lock_box.SlicePitch + y * lock_box.RowPitch + x * format->bytes_per_pixel; - - for (i = 0; i < format->bytes_per_pixel; i++) - pos[i] = 0; - - for (c = 0; c < 4; c++) - { - switch (c) - { - case 0: /* Alpha */ - comp_value = value.w; - break; - case 1: /* Red */ - comp_value = value.x; - break; - case 2: /* Green */ - comp_value = value.y; - break; - case 3: /* Blue */ - comp_value = value.z; - break; - } - - v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; - - for (i = 0; i < format->bits[c] + format->shift[c]; i += 8) - { - mask = ((1 << format->bits[c]) - 1) << format->shift[c] >> i; - byte = (v << format->shift[c] >> i) & mask; - pos[i / 8] |= byte; - } - } + fill_texture(format, data + z * lock_box.SlicePitch + y * lock_box.RowPitch + + x * format->bytes_per_pixel, &value); } } }

1 0

Marcus Meissner : comctl32: Initialize SYSTEMTIME structs (Coverity).
by Alexandre Julliard Jan. 10, 2013

Jan. 10, 2013

Module: wine Branch: master Commit: 1fe4af293cc496fc1aaf337e74e997d483021d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe4af293cc496fc1aaf337e7… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Jan 9 02:42:13 2013 +0100 comctl32: Initialize SYSTEMTIME structs (Coverity). --- dlls/comctl32/tests/monthcal.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index c7fd1e5..0cd064f 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1368,10 +1368,8 @@ static void test_monthrange(void) hwnd = create_monthcal_control(0); - st_visible[0].wYear = 0; - st_visible[0].wMonth = 0; - st_visible[0].wDay = 0; - st_daystate[1] = st_daystate[0] = st_visible[1] = st_visible[0]; + memset(&st_visible, 0, sizeof(st_visible)); + memset(&st_daystate, 0, sizeof(st_daystate)); st.wYear = 2000; st.wMonth = 11;

1 0

Alexandre Julliard : configure: Try readelf before ldd to determine a library soname.
by Alexandre Julliard Jan. 10, 2013

Jan. 10, 2013

Module: wine Branch: master Commit: 0874734ecbd6d137705f5322482ba5e17416eeb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0874734ecbd6d137705f53224… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 10 17:52:11 2013 +0100 configure: Try readelf before ldd to determine a library soname. --- aclocal.m4 | 14 ++- configure | 272 ++++++++++++++++++++++++++++++++++++++++++++++++++------- configure.ac | 2 +- 3 files changed, 248 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0874734ecbd6d137705f5…

1 0

Jacek Caban : mshtml: Added support for non-integer values in get_nsstyle_pixel_val.
by Alexandre Julliard Jan. 10, 2013

Jan. 10, 2013

Module: wine Branch: master Commit: b93e29f0ee0006e4469782db740f20cdae6b5be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93e29f0ee0006e4469782db7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 10 14:20:16 2013 +0100 mshtml: Added support for non-integer values in get_nsstyle_pixel_val. --- dlls/mshtml/htmlstyle.c | 7 ++++++- dlls/mshtml/tests/style.c | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2cf252d..8d3148c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -664,9 +664,14 @@ static HRESULT get_nsstyle_pixel_val(HTMLStyle *This, styleid_t sid, LONG *p) if(value) { *p = strtolW(value, &ptr, 10); + if(*ptr == '.') { + /* Skip all digits. We have tests showing that we should not round the value. */ + while(isdigitW(*++ptr)); + } + if(*ptr && strcmpW(ptr, pxW)) { nsAString_Finish(&str_value); - FIXME("only px values are currently supported\n"); + FIXME("%s: only px values are currently supported\n", debugstr_w(value)); hres = E_NOTIMPL; } }else { diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 8ec69a6..3e2ef89 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -961,6 +961,17 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("4.99"); + hres = IHTMLStyle_put_left(style, v); + ok(hres == S_OK, "put_left failed: %08x\n", hres); + VariantClear(&v); + + l = 0xdeadbeef; + hres = IHTMLStyle_get_pixelLeft(style, &l); + ok(hres == S_OK, "get_pixelLeft failed: %08x\n", hres); + ok(l == 4, "pixelLeft = %d\n", l); + V_VT(&v) = VT_NULL; hres = IHTMLStyle_put_left(style, v); ok(hres == S_OK, "put_left failed: %08x\n", hres);

1 0

Rico Schüller : d3dx9: Shift only as much as needed.
by Alexandre Julliard Jan. 10, 2013

Jan. 10, 2013

Module: wine Branch: master Commit: 98ef0ca8e685b197ed17aab608b676700b608e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=98ef0ca8e685b197ed17aab60… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 17:57:25 2013 +0100 d3dx9: Shift only as much as needed. --- dlls/d3dx9_36/texture.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 2531ea6..c93d2df 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1240,8 +1240,16 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po { BYTE byte, mask; - mask = ((1 << format->bits[c]) - 1) << format->shift[c] >> i; - byte = (v << format->shift[c] >> i) & mask; + if (format->shift[c] > i) + { + mask = ((1 << format->bits[c]) - 1) << (format->shift[c] - i); + byte = (v << (format->shift[c] - i)) & mask; + } + else + { + mask = ((1 << format->bits[c]) - 1) >> (i - format->shift[c]); + byte = (v >> (i - format->shift[c])) & mask; + } pos[i / 8] |= byte; } }

1 0

Nikolay Sivov : comctl32/listview: Use LVM_SETITEMSTATE directly in tests.
by Alexandre Julliard Jan. 10, 2013

Jan. 10, 2013

Module: wine Branch: master Commit: 7bb36372c8ffaff8a3032c7771a512a3a0f93bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb36372c8ffaff8a3032c777… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 10 16:45:44 2013 +0400 comctl32/listview: Use LVM_SETITEMSTATE directly in tests. --- dlls/comctl32/tests/listview.c | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 161278c..583645d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2145,24 +2145,29 @@ static void test_multiselect(void) hwnd = create_listview_control(LVS_REPORT); - for (i=0;i<items;i++) { - insert_item(hwnd, 0); - } + for (i = 0; i < items; i++) + insert_item(hwnd, 0); item_count = (int)SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); + expect(items, item_count); - expect(items,item_count); + for (i = 0; i < 4; i++) { + LVITEMA item; - for (i=0;i<4;i++) { task = task_list[i]; /* deselect all items */ - ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); + item.state = 0; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); /* set initial position */ SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, (task.initPos == -1 ? item_count -1 : task.initPos)); - ListView_SetItemState(hwnd,(task.initPos == -1 ? item_count -1 : task.initPos),LVIS_SELECTED ,LVIS_SELECTED); + + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, task.initPos == -1 ? item_count-1 : task.initPos, (LPARAM)&item); selected_count = (int)SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); @@ -2204,7 +2209,9 @@ static void test_multiselect(void) expect(FALSE, r); /* select all, check notifications */ - ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); + item.state = 0; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2217,10 +2224,15 @@ static void test_multiselect(void) "select all notification", FALSE); /* deselect all items */ - ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); + item.state = 0; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); for (i=0;i<3;i++) { - ListView_SetItemState(hwnd, i, LVIS_SELECTED, LVIS_SELECTED); + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, i, (LPARAM)&item); } r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); @@ -2245,7 +2257,9 @@ static void test_multiselect(void) expect(3, r); /* select one more */ - ListView_SetItemState(hwnd, 3, LVIS_SELECTED, LVIS_SELECTED); + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + SendMessageA(hwnd, LVM_SETITEMSTATE, 3, (LPARAM)&item); for (i=0;i<3;i++) { r = ListView_GetItemState(hwnd, i, LVIS_SELECTED);

1 0

Stefan Dösinger : ddraw: Don' t discard buffers that haven't been used in draws.
by Alexandre Julliard Jan. 10, 2013

Jan. 10, 2013

Module: wine Branch: master Commit: d3520ef4653cb7bea035e08fc12428da70470185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3520ef4653cb7bea035e08fc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 10 11:52:16 2013 +0100 ddraw: Don't discard buffers that haven't been used in draws. --- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/device.c | 7 ++++ dlls/ddraw/tests/ddraw4.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/vertexbuffer.c | 6 +++- 5 files changed, 174 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index ed4cdfc..1ae1054 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -535,6 +535,8 @@ struct d3d_vertex_buffer DWORD fvf; DWORD size; BOOL dynamic; + + BOOL read_since_last_map; }; HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **buffer, struct ddraw *ddraw, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 601c96e..8201d75 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4113,6 +4113,10 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE /* Now draw the primitives */ wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType); hr = wined3d_device_draw_primitive(device->wined3d_device, StartVertex, NumVertices); + + if (SUCCEEDED(hr)) + vb->read_since_last_map = TRUE; + wined3d_mutex_unlock(); return hr; @@ -4236,6 +4240,9 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_primitive_type(This->wined3d_device, PrimitiveType); hr = wined3d_device_draw_indexed_primitive(This->wined3d_device, ib_pos / sizeof(WORD), IndexCount); + if (SUCCEEDED(hr)) + vb->read_since_last_map = TRUE; + wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a435b7a..2e9c845 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2856,6 +2856,85 @@ static void test_coop_level_surf_create(void) IDirectDraw4_Release(ddraw); } +static void test_vb_discard(void) +{ + static const struct vec4 quad[] = + { + { 0.0f, 480.0f, 0.0f, 1.0f}, + { 0.0f, 0.0f, 0.0f, 1.0f}, + {640.0f, 480.0f, 0.0f, 1.0f}, + {640.0f, 0.0f, 0.0f, 1.0f}, + }; + + IDirect3DDevice3 *device; + IDirect3D3 *d3d; + IDirect3DVertexBuffer *buffer; + HWND window; + HRESULT hr; + D3DVERTEXBUFFERDESC desc; + BYTE *data; + static const unsigned int vbsize = 16; + unsigned int i; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = D3DVBCAPS_WRITEONLY; + desc.dwFVF = D3DFVF_XYZRHW; + desc.dwNumVertices = vbsize; + hr = IDirect3D3_CreateVertexBuffer(d3d, &desc, &buffer, 0, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memset(data, 0xaa, sizeof(struct vec4) * vbsize); + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (i = 0; i < sizeof(struct vec4) * vbsize; i++) + { + if (data[i] != 0xaa) + { + ok(FALSE, "Vertex buffer data byte %u is 0x%02x, expected 0xaa\n", i, data[i]); + break; + } + } + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer_Release(buffer); + IDirect3D3_Release(d3d); + IDirect3DDevice3_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -2879,4 +2958,5 @@ START_TEST(ddraw4) test_coop_level_mode_set_multi(); test_initialize(); test_coop_level_surf_create(); + test_vb_discard(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7985b06..2b7e075 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2665,6 +2665,85 @@ static void test_coop_level_surf_create(void) IDirectDraw7_Release(ddraw); } +static void test_vb_discard(void) +{ + static const struct vec4 quad[] = + { + { 0.0f, 480.0f, 0.0f, 1.0f}, + { 0.0f, 0.0f, 0.0f, 1.0f}, + {640.0f, 480.0f, 0.0f, 1.0f}, + {640.0f, 0.0f, 0.0f, 1.0f}, + }; + + IDirect3DDevice7 *device; + IDirect3D7 *d3d; + IDirect3DVertexBuffer7 *buffer; + HWND window; + HRESULT hr; + D3DVERTEXBUFFERDESC desc; + BYTE *data; + static const unsigned int vbsize = 16; + unsigned int i; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = D3DVBCAPS_WRITEONLY; + desc.dwFVF = D3DFVF_XYZRHW; + desc.dwNumVertices = vbsize; + hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &buffer, 0); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memset(data, 0xaa, sizeof(struct vec4) * vbsize); + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (i = 0; i < sizeof(struct vec4) * vbsize; i++) + { + if (data[i] != 0xaa) + { + ok(FALSE, "Vertex buffer data byte %u is 0x%02x, expected 0xaa\n", i, data[i]); + break; + } + } + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer7_Release(buffer); + IDirect3D7_Release(d3d); + IDirect3DDevice7_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -2695,4 +2774,5 @@ START_TEST(ddraw7) test_coop_level_mode_set_multi(); test_initialize(); test_coop_level_surf_create(); + test_vb_discard(); } diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 1b5d7af..5acd2e6 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -245,7 +245,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, wined3d_flags |= WINED3D_MAP_READONLY; if (flags & DDLOCK_NOOVERWRITE) wined3d_flags |= WINED3D_MAP_NOOVERWRITE; - if (flags & DDLOCK_DISCARDCONTENTS) + if (flags & DDLOCK_DISCARDCONTENTS && buffer->read_since_last_map) { wined3d_flags |= WINED3D_MAP_DISCARD; @@ -278,6 +278,10 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, } hr = wined3d_buffer_map(buffer->wineD3DVertexBuffer, 0, 0, (BYTE **)data, wined3d_flags); + + if (SUCCEEDED(hr)) + buffer->read_since_last_map = FALSE; + wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : ddraw: Avoid LPD3DLIGHT7.
by Alexandre Julliard Jan. 10, 2013

Jan. 10, 2013

Module: wine Branch: master Commit: 5687a27c56407ecfac6184cdfa34a13edb581348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5687a27c56407ecfac6184cdf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 10 11:45:53 2013 +0100 ddraw: Avoid LPD3DLIGHT7. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 032040e..7cf1512 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1311,8 +1311,8 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT7 *data) PURE; STDMETHOD(SetMaterial)(THIS_ D3DMATERIAL7 *data) PURE; STDMETHOD(GetMaterial)(THIS_ D3DMATERIAL7 *data) PURE; - STDMETHOD(SetLight)(THIS_ DWORD dwLightIndex,LPD3DLIGHT7 lpLight) PURE; - STDMETHOD(GetLight)(THIS_ DWORD dwLightIndex,LPD3DLIGHT7 lpLight) PURE; + STDMETHOD(SetLight)(THIS_ DWORD idx, D3DLIGHT7 *data) PURE; + STDMETHOD(GetLight)(THIS_ DWORD idx, D3DLIGHT7 *data) PURE; STDMETHOD(SetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, DWORD dwRenderState) PURE; STDMETHOD(GetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, LPDWORD lpdwRenderState) PURE; STDMETHOD(BeginStateBlock)(THIS) PURE;

1 0

Jacek Caban : atl80: Skip NULL map entries in AtlComModuleRegisterServer.
by Alexandre Julliard Jan. 10, 2013

Jan. 10, 2013

Module: wine Branch: master Commit: 07065b4d939f2f5d469f99e68332208462d5d1df URL: http://source.winehq.org/git/wine.git/?a=commit;h=07065b4d939f2f5d469f99e68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 10 13:26:46 2013 +0100 atl80: Skip NULL map entries in AtlComModuleRegisterServer. --- dlls/atl80/atl80.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index 278d736..2cee94c 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -37,18 +37,19 @@ HRESULT WINAPI AtlComModuleRegisterServer(_ATL_COM_MODULE *mod, BOOL bRegTypeLib TRACE("(%p %x %s)\n", mod, bRegTypeLib, debugstr_guid(clsid)); for(iter = mod->m_ppAutoObjMapFirst; iter < mod->m_ppAutoObjMapLast; iter++) { - if(!clsid || IsEqualCLSID((*iter)->pclsid, clsid)) { - TRACE("Registering clsid %s\n", debugstr_guid((*iter)->pclsid)); - hres = (*iter)->pfnUpdateRegistry(TRUE); + if(!*iter || (clsid && !IsEqualCLSID((*iter)->pclsid, clsid))) + continue; + + TRACE("Registering clsid %s\n", debugstr_guid((*iter)->pclsid)); + hres = (*iter)->pfnUpdateRegistry(TRUE); + if(FAILED(hres)) + return hres; + + catmap = (*iter)->pfnGetCategoryMap(); + if(catmap) { + hres = AtlRegisterClassCategoriesHelper((*iter)->pclsid, catmap, TRUE); if(FAILED(hres)) return hres; - - catmap = (*iter)->pfnGetCategoryMap(); - if(catmap) { - hres = AtlRegisterClassCategoriesHelper((*iter)->pclsid, catmap, TRUE); - if(FAILED(hres)) - return hres; - } } }

1 0