March 2014 - Wine-commits - list.winehq.org

Gediminas Jakutis : d3dx9: Implement D3DXCreateBox().
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: cc3ec2da1a96b9f6874aed8f3140dd984261fc73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3ec2da1a96b9f6874aed8f3… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Thu Feb 27 21:02:19 2014 +0200 d3dx9: Implement D3DXCreateBox(). --- dlls/d3dx9_36/mesh.c | 106 ++++++++++++++++++++++++++++++++++++++++---- dlls/d3dx9_36/tests/mesh.c | 14 +++--- 2 files changed, 105 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 118baf7..cc3576c 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4525,20 +4525,110 @@ cleanup: return hr; } -HRESULT WINAPI D3DXCreateBox(struct IDirect3DDevice9 *device, float width, float height, - float depth, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency) -{ - FIXME("(%p, %f, %f, %f, %p, %p): stub\n", device, width, height, depth, mesh, adjacency); - - return E_NOTIMPL; -} - struct vertex { D3DXVECTOR3 position; D3DXVECTOR3 normal; }; +HRESULT WINAPI D3DXCreateBox(struct IDirect3DDevice9 *device, float width, float height, + float depth, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency) +{ + HRESULT hr; + ID3DXMesh *box; + struct vertex *vertices; + WORD (*faces)[3]; + DWORD *adjacency_buf; + unsigned int i, face; + static const D3DXVECTOR3 unit_box[] = + { + {-1.0f, -1.0f, -1.0f}, {-1.0f, -1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, -1.0f}, + {-1.0f, 1.0f, -1.0f}, {-1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, -1.0f}, + { 1.0f, 1.0f, -1.0f}, { 1.0f, 1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, -1.0f}, + {-1.0f, -1.0f, 1.0f}, {-1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, 1.0f}, + {-1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, + {-1.0f, -1.0f, -1.0f}, {-1.0f, 1.0f, -1.0f}, { 1.0f, 1.0f, -1.0f}, { 1.0f, -1.0f, -1.0f} + }; + static const D3DXVECTOR3 normals[] = + { + {-1.0f, 0.0f, 0.0f}, { 0.0f, 1.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, + { 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, -1.0f} + }; + static const DWORD adjacency_table[] = + { + 6, 9, 1, 2, 10, 0, 1, 9, 3, 4, 10, 2, + 3, 8, 5, 7, 11, 4, 0, 11, 7, 5, 8, 6, + 7, 4, 9, 2, 0, 8, 1, 3, 11, 5, 6, 10 + }; + + TRACE("device %p, width %f, height %f, depth %f, mesh %p, adjacency %p\n", + device, width, height, depth, mesh, adjacency); + + if (!device || width < 0.0f || height < 0.0f || depth < 0.0f || !mesh) + { + return D3DERR_INVALIDCALL; + } + + if (FAILED(hr = D3DXCreateMeshFVF(12, 24, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, device, &box))) + { + return hr; + } + + if (FAILED(hr = box->lpVtbl->LockVertexBuffer(box, 0, (void **)&vertices))) + { + box->lpVtbl->Release(box); + return hr; + } + + if (FAILED(hr = box->lpVtbl->LockIndexBuffer(box, 0, (void **)&faces))) + { + box->lpVtbl->UnlockVertexBuffer(box); + box->lpVtbl->Release(box); + return hr; + } + + width /= 2.0f; + height /= 2.0f; + depth /= 2.0f; + + for (i = 0; i < 24; i++) + { + vertices[i].position.x = width * unit_box[i].x; + vertices[i].position.y = height * unit_box[i].y; + vertices[i].position.z = depth * unit_box[i].z; + vertices[i].normal.x = normals[i / 4].x; + vertices[i].normal.y = normals[i / 4].y; + vertices[i].normal.z = normals[i / 4].z; + } + + face = 0; + for (i = 0; i < 12; i++) + { + faces[i][0] = face++; + faces[i][1] = face++; + faces[i][2] = (i % 2) ? face - 4 : face; + } + + box->lpVtbl->UnlockIndexBuffer(box); + box->lpVtbl->UnlockVertexBuffer(box); + + if (adjacency) + { + if (FAILED(hr = D3DXCreateBuffer(sizeof(adjacency_table), adjacency))) + { + box->lpVtbl->Release(box); + return hr; + } + + adjacency_buf = ID3DXBuffer_GetBufferPointer(*adjacency); + memcpy(adjacency_buf, adjacency_table, sizeof(adjacency_table)); + } + + *mesh = box; + + return D3D_OK; +} + typedef WORD face[3]; struct sincos_table diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 1c3748f..d32f159 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2482,23 +2482,23 @@ static void D3DXCreateBoxTest(void) } hr = D3DXCreateBox(device,2.0f,20.0f,4.9f,NULL, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(NULL,22.0f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,-2.0f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,22.0f,-20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); hr = D3DXCreateBox(device,22.0f,20.0f,-4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ok(hr==D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); ppBuffer = NULL; hr = D3DXCreateBox(device,10.9f,20.0f,4.9f,&box, &ppBuffer); - todo_wine ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); + ok(hr==D3D_OK, "Expected D3D_OK, received %#x\n", hr); if (FAILED(hr)) { @@ -2508,7 +2508,7 @@ static void D3DXCreateBoxTest(void) buffer = ID3DXBuffer_GetBufferPointer(ppBuffer); for(i=0; i<36; i++) - todo_wine ok(adjacency[i]==buffer[i], "expected adjacency %d: %#x, received %#x\n",i,adjacency[i], buffer[i]); + ok(adjacency[i]==buffer[i], "expected adjacency %d: %#x, received %#x\n",i,adjacency[i], buffer[i]); box->lpVtbl->Release(box);

1 0

Gediminas Jakutis : d3dx9/tests: Add a mesh test for D3DXCreateBox().
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 6749bdf66bd83f6e5680d0bc17b6f60468932711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6749bdf66bd83f6e5680d0bc1… Author: Gediminas Jakutis <gediminas(a)varciai.lt> Date: Thu Feb 27 21:03:03 2014 +0200 d3dx9/tests: Add a mesh test for D3DXCreateBox(). --- dlls/d3dx9_36/tests/mesh.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d32f159..3fd5d9d 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2424,6 +2424,85 @@ cleanup: if (wnd) DestroyWindow(wnd); } +static BOOL compute_box(struct mesh *mesh, float width, float height, float depth) +{ + unsigned int i, face; + static const D3DXVECTOR3 unit_box[] = + { + {-1.0f, -1.0f, -1.0f}, {-1.0f, -1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, -1.0f}, + {-1.0f, 1.0f, -1.0f}, {-1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, -1.0f}, + { 1.0f, 1.0f, -1.0f}, { 1.0f, 1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, -1.0f}, + {-1.0f, -1.0f, 1.0f}, {-1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, -1.0f}, { 1.0f, -1.0f, 1.0f}, + {-1.0f, -1.0f, 1.0f}, { 1.0f, -1.0f, 1.0f}, { 1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, 1.0f}, + {-1.0f, -1.0f, -1.0f}, {-1.0f, 1.0f, -1.0f}, { 1.0f, 1.0f, -1.0f}, { 1.0f, -1.0f, -1.0f} + }; + static const D3DXVECTOR3 normals[] = + { + {-1.0f, 0.0f, 0.0f}, { 0.0f, 1.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, + { 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, -1.0f} + }; + + if (!new_mesh(mesh, 24, 12)) + { + return FALSE; + } + + width /= 2.0f; + height /= 2.0f; + depth /= 2.0f; + + for (i = 0; i < 24; i++) + { + mesh->vertices[i].position.x = width * unit_box[i].x; + mesh->vertices[i].position.y = height * unit_box[i].y; + mesh->vertices[i].position.z = depth * unit_box[i].z; + mesh->vertices[i].normal.x = normals[i / 4].x; + mesh->vertices[i].normal.y = normals[i / 4].y; + mesh->vertices[i].normal.z = normals[i / 4].z; + } + + face = 0; + for (i = 0; i < 12; i++) + { + mesh->faces[i][0] = face++; + mesh->faces[i][1] = face++; + mesh->faces[i][2] = (i % 2) ? face - 4 : face; + } + + return TRUE; +} + +static void test_box(IDirect3DDevice9 *device, float width, float height, float depth) +{ + HRESULT hr; + ID3DXMesh *box; + struct mesh mesh; + char name[256]; + + hr = D3DXCreateBox(device, width, height, depth, &box, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + if (hr != D3D_OK) + { + skip("Couldn't create box\n"); + return; + } + + if (!compute_box(&mesh, width, height, depth)) + { + skip("Couldn't create mesh\n"); + box->lpVtbl->Release(box); + return; + } + + mesh.fvf = D3DFVF_XYZ | D3DFVF_NORMAL; + + sprintf(name, "box (%g, %g, %g)", width, height, depth); + compare_mesh(name, box, &mesh); + + free_mesh(&mesh); + + box->lpVtbl->Release(box); +} static void D3DXCreateBoxTest(void) { HRESULT hr; @@ -2512,6 +2591,8 @@ static void D3DXCreateBoxTest(void) box->lpVtbl->Release(box); + test_box(device, 10.9f, 20.0f, 4.9f); + end: IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);

1 0

Stefan Dösinger : wined3d: surface_load_ds_location can handle WINED3D_LOCATION_DISCARDED.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: dfbff712f414e5ff8903802e56f379e63be081e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbff712f414e5ff8903802e5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 3 10:15:35 2014 +0100 wined3d: surface_load_ds_location can handle WINED3D_LOCATION_DISCARDED. --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6af6158..7c5f053 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5123,7 +5123,8 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - if (location == WINED3D_LOCATION_TEXTURE_RGB && surface->locations & WINED3D_LOCATION_DRAWABLE) + if (location == WINED3D_LOCATION_TEXTURE_RGB + && surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED)) { struct wined3d_context *context = context_acquire(device, NULL); surface_load_ds_location(surface, context, location);

1 0

Nikolay Sivov : dmime: COM cleanup of IDirectMusicGraph interface.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 91ee56769c4037dc62b945e6b8f74554c0197f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ee56769c4037dc62b945e6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 08:57:06 2014 +0400 dmime: COM cleanup of IDirectMusicGraph interface. --- dlls/dmime/dmime_private.h | 17 -- dlls/dmime/graph.c | 512 +++++++++++++++++++++++--------------------- 2 files changed, 271 insertions(+), 258 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91ee56769c4037dc62b94…

1 0

Nikolay Sivov : kernel32: Partial implementation for GetCalendarInfoEx().
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 95142cad53df5d67f5061f9c7861b91a4c179f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95142cad53df5d67f5061f9c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 09:13:56 2014 +0400 kernel32: Partial implementation for GetCalendarInfoEx(). --- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/time.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index 7c6f6fe..7b3c86f 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -9,7 +9,7 @@ @ stdcall GetACP() kernel32.GetACP @ stdcall GetCPInfo(long ptr) kernel32.GetCPInfo @ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW -@ stub GetCalendarInfoEx +@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW @ stub GetFileMUIInfo @ stub GetFileMUIPath diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f7f3320..f8d3a80 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -442,6 +442,7 @@ @ stdcall GetCPInfoExW(long long ptr) @ stdcall GetCalendarInfoA(long long long ptr long ptr) @ stdcall GetCalendarInfoW(long long long ptr long ptr) +@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) # @ stub GetComPlusPackageInstallStatus @ stdcall GetCommConfig(long ptr long) @ stdcall GetCommMask(long ptr) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 77c71cb..4dc5d0e 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -798,6 +798,18 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, } /********************************************************************* + * GetCalendarInfoEx (KERNEL32.@) + */ +int WINAPI GetCalendarInfoEx(LPCWSTR locale, CALID calendar, LPCWSTR lpReserved, CALTYPE caltype, + LPWSTR data, int len, DWORD *value) +{ + LCID lcid = LocaleNameToLCID(locale, 0); + FIXME("(%s, %d, %p, 0x%08x, %p, %d, %p): semi-stub\n", debugstr_w(locale), calendar, lpReserved, caltype, + data, len, value); + return GetCalendarInfoW(lcid, calendar, caltype, data, len, value); +} + +/********************************************************************* * SetCalendarInfoA (KERNEL32.@) * */

1 0

Hans Leidekker : wbemprox: Implement Win32_DiskDrive.MediaType.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 59b9c36df54ecfaa2b5867064cb7731b6571584a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b9c36df54ecfaa2b5867064… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 28 11:21:11 2014 +0100 wbemprox: Implement Win32_DiskDrive.MediaType. --- dlls/wbemprox/builtin.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4b02ea2..449eb2f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -181,6 +181,8 @@ static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_maxclockspeedW[] = {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; +static const WCHAR prop_mediatypeW[] = + {'M','e','d','i','a','T','y','p','e',0}; static const WCHAR prop_memberW[] = {'M','e','m','b','e','r',0}; static const WCHAR prop_methodW[] = @@ -315,6 +317,7 @@ static const struct column col_diskdrive[] = { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_indexW, CIM_UINT32, VT_I4 }, { prop_manufacturerW, CIM_STRING }, + { prop_mediatypeW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_serialnumberW, CIM_STRING } }; @@ -507,10 +510,12 @@ static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; static const WCHAR diskdrive_deviceidW[] = {'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; -static const WCHAR diskdrive_modelW[] = - {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; static const WCHAR diskdrive_manufacturerW[] = {'(','S','t','a','n','d','a','r','d',' ','d','i','s','k',' ','d','r','i','v','e','s',')',0}; +static const WCHAR diskdrive_mediatypeW[] = + {'F','i','x','e','d',' ','h','a','r','d',' ','d','i','s','k',0}; +static const WCHAR diskdrive_modelW[] = + {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; static const WCHAR diskdrive_serialW[] = {'W','I','N','E','H','D','I','S','K',0}; static const WCHAR networkadapter_pnpdeviceidW[]= @@ -593,6 +598,7 @@ struct record_diskdrive const WCHAR *device_id; UINT32 index; const WCHAR *manufacturer; + const WCHAR *mediatype; const WCHAR *name; const WCHAR *serialnumber; }; @@ -762,7 +768,8 @@ static const struct record_bios data_bios[] = }; static const struct record_diskdrive data_diskdrive[] = { - { diskdrive_deviceidW, 0, diskdrive_manufacturerW, diskdrive_modelW, diskdrive_serialW } + { diskdrive_deviceidW, 0, diskdrive_manufacturerW, diskdrive_mediatypeW, diskdrive_modelW, + diskdrive_serialW } }; static const struct record_param data_param[] = {

1 0

Hans Leidekker : wbemprox: Implement Win32_PhysicalMedia.Tag.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 14bc54d536bec5b57874dd12bec6df4a95ff9351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14bc54d536bec5b57874dd12b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 28 11:22:01 2014 +0100 wbemprox: Implement Win32_PhysicalMedia.Tag. --- dlls/wbemprox/builtin.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 449eb2f..118ec0a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -395,7 +395,8 @@ static const struct column col_param[] = }; static const struct column col_physicalmedia[] = { - { prop_serialnumberW, CIM_STRING } + { prop_serialnumberW, CIM_STRING }, + { prop_tagW, CIM_STRING } }; static const struct column col_process[] = { @@ -538,6 +539,8 @@ static const WCHAR os_nameW[] = '\\','P','a','r','t','i','t','i','o','n','1',0}; static const WCHAR os_versionW[] = {'5','.','1','.','2','6','0','0',0}; +static const WCHAR physicalmedia_tagW[] = + {'\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; static const WCHAR videocontroller_dactypeW[] = @@ -677,6 +680,7 @@ struct record_param struct record_physicalmedia { const WCHAR *serialnumber; + const WCHAR *tag; }; struct record_process { @@ -801,7 +805,7 @@ static const struct record_param data_param[] = static const struct record_physicalmedia data_physicalmedia[] = { - { diskdrive_serialW } + { diskdrive_serialW, physicalmedia_tagW } }; static const struct record_qualifier data_qualifier[] = {

1 0

Hans Leidekker : wbemprox: Add support for negated expressions in WHERE clauses.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: d0d9b9dcd7fd9bd5114ab8a2f59754caeaa422eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d9b9dcd7fd9bd5114ab8a2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 28 11:23:39 2014 +0100 wbemprox: Add support for negated expressions in WHERE clauses. --- dlls/wbemprox/query.c | 9 +++++++++ dlls/wbemprox/wbemprox_private.h | 3 ++- dlls/wbemprox/wql.y | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 6933da2..921c3cd 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -250,6 +250,15 @@ static HRESULT eval_unary( const struct table *table, UINT row, const struct com UINT column; LONGLONG lval; + if (expr->op == OP_NOT) + { + hr = eval_cond( table, row, expr->left, &lval, type ); + if (hr != S_OK) + return hr; + *val = !lval; + return S_OK; + } + hr = get_column_index( table, expr->left->u.propval->name, &column ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 0e39d00..da4f84f 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -53,7 +53,8 @@ enum operator OP_NE = 8, OP_ISNULL = 9, OP_NOTNULL = 10, - OP_LIKE = 11 + OP_LIKE = 11, + OP_NOT = 12 }; struct expr; diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 58663d0..6eabe19 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -318,6 +318,12 @@ expr: if (!$$) YYABORT; } + | TK_NOT expr + { + $$ = expr_unary( ctx, $2, OP_NOT ); + if (!$$) + YYABORT; + } | prop_val TK_EQ const_val { $$ = expr_complex( ctx, $1, OP_EQ, $3 );

1 0

Henri Verbeet : d3d9/tests: Get rid of "skip_once" in yuv_layout_test().
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 1168948764ebe0ecc9a22a3cd509b8525b195a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1168948764ebe0ecc9a22a3cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 28 11:26:50 2014 +0100 d3d9/tests: Get rid of "skip_once" in yuv_layout_test(). --- dlls/d3d9/tests/visual.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e107471..4d921dc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10522,7 +10522,6 @@ static void yuv_layout_test(IDirect3DDevice9 *device) BYTE *buf, *chroma_buf, *u_buf, *v_buf; UINT width = 20, height = 16; D3DCAPS9 caps; - D3DFORMAT skip_once = D3DFMT_UNKNOWN; D3DSURFACE_DESC desc; static const struct @@ -10582,21 +10581,13 @@ static void yuv_layout_test(IDirect3DDevice9 *device) if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, format) != D3D_OK) { - if (skip_once != format) - { - skip("%s is not supported.\n", fmt_string); - skip_once = format; - } + skip("%s is not supported.\n", fmt_string); continue; } if (FAILED(IDirect3D9_CheckDeviceFormatConversion(d3d, 0, D3DDEVTYPE_HAL, format, desc.Format))) { - if (skip_once != format) - { - skip("Driver cannot blit %s surfaces.\n", fmt_string); - skip_once = format; - } + skip("Driver cannot blit %s surfaces.\n", fmt_string); continue; }

1 0

Henri Verbeet : ddraw/tests: Try 24 bpp display modes if 32 bpp modes are unavailable.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 048f4d4c2663bcbf1216552b130459933420fb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=048f4d4c2663bcbf1216552b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 28 11:26:51 2014 +0100 ddraw/tests: Try 24 bpp display modes if 32 bpp modes are unavailable. --- dlls/ddraw/tests/ddraw1.c | 63 ++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw2.c | 75 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw4.c | 75 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 75 +++++++++++++++++++++++++-------------------- 4 files changed, 158 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=048f4d4c2663bcbf12165…

1 0