May 2013 - Wine-commits - list.winehq.org

Matteo Bruni : winex11.drv: Fix wglCreateContextAttribsARB' s attributes handling for real.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 667bd327bec7edf9a8958358d342bf75683ed3f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=667bd327bec7edf9a8958358d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 31 14:52:21 2013 +0200 winex11.drv: Fix wglCreateContextAttribsARB's attributes handling for real. --- dlls/winex11.drv/opengl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 05b8f60..cd24575 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1945,7 +1945,6 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg ret->fmt = gl->format; ret->vis = NULL; /* glXCreateContextAttribsARB requires a fbconfig instead of a visual */ ret->gl3_context = TRUE; - ret->numAttribs = 0; if (attribList) { int *pContextAttribList = &ret->attribList[0]; @@ -1959,11 +1958,13 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg pContextAttribList[0] = GLX_CONTEXT_MAJOR_VERSION_ARB; pContextAttribList[1] = attribList[1]; pContextAttribList += 2; + ret->numAttribs++; break; case WGL_CONTEXT_MINOR_VERSION_ARB: pContextAttribList[0] = GLX_CONTEXT_MINOR_VERSION_ARB; pContextAttribList[1] = attribList[1]; pContextAttribList += 2; + ret->numAttribs++; break; case WGL_CONTEXT_LAYER_PLANE_ARB: break; @@ -1971,16 +1972,17 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB; pContextAttribList[1] = attribList[1]; pContextAttribList += 2; + ret->numAttribs++; break; case WGL_CONTEXT_PROFILE_MASK_ARB: pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; pContextAttribList[1] = attribList[1]; pContextAttribList += 2; + ret->numAttribs++; break; default: ERR("Unhandled attribList pair: %#x %#x\n", attribList[0], attribList[1]); } - ret->numAttribs++; attribList += 2; } }

1 0

Hans Leidekker : rpcrt4: Specify INTERNET_FLAG_NO_CACHE_WRITE for the HTTP transport pipes.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 30c00ea16d3f2bfc51d8dc67459d12b4fb831339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c00ea16d3f2bfc51d8dc674… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 31 16:04:15 2013 +0200 rpcrt4: Specify INTERNET_FLAG_NO_CACHE_WRITE for the HTTP transport pipes. --- dlls/rpcrt4/rpc_transport.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 6adc289..921c43d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2364,6 +2364,7 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) static const WCHAR wszColon[] = {':',0}; static const WCHAR wszAcceptType[] = {'a','p','p','l','i','c','a','t','i','o','n','/','r','p','c',0}; LPCWSTR wszAcceptTypes[] = { wszAcceptType, NULL }; + DWORD flags; WCHAR *url; RPC_STATUS status; BOOL secure; @@ -2403,20 +2404,19 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL); - httpc->in_request = HttpOpenRequestW(httpc->session, wszVerbIn, url, NULL, NULL, - wszAcceptTypes, - (secure ? INTERNET_FLAG_SECURE : 0)|INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_PRAGMA_NOCACHE, - (DWORD_PTR)httpc->async_data); + flags = INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_NO_CACHE_WRITE; + if (secure) flags |= INTERNET_FLAG_SECURE; + + httpc->in_request = HttpOpenRequestW(httpc->session, wszVerbIn, url, NULL, NULL, wszAcceptTypes, + flags, (DWORD_PTR)httpc->async_data); if (!httpc->in_request) { ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, url); return RPC_S_SERVER_UNAVAILABLE; } - httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, - wszAcceptTypes, - (secure ? INTERNET_FLAG_SECURE : 0)|INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_PRAGMA_NOCACHE, - (DWORD_PTR)httpc->async_data); + httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, wszAcceptTypes, + flags, (DWORD_PTR)httpc->async_data); HeapFree(GetProcessHeap(), 0, url); if (!httpc->out_request) {

1 0

Kyle Luna : wined3d: Add Mobility Radeon HD 4200.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 7f5f166a19c4ddd690a2b7eb792a613f58ad7a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5f166a19c4ddd690a2b7eb7… Author: Kyle Luna <kyl416(a)aol.com> Date: Thu May 30 17:51:10 2013 -0400 wined3d: Add Mobility Radeon HD 4200. --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d308322..d2fd22c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1177,6 +1177,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD2600, "ATI Mobility Radeon HD 2600", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD2900, "ATI Radeon HD 2900 XT", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD3200, "ATI Radeon HD 3200 Graphics", DRIVER_AMD_R600, 128 }, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4200M, "ATI Mobility Radeon HD 4200", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4350, "ATI Radeon HD 4350", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4600, "ATI Radeon HD 4600 Series", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4700, "ATI Radeon HD 4700 Series", DRIVER_AMD_R600, 512 }, @@ -1812,6 +1813,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in {"HD 4550", CARD_AMD_RADEON_HD4350}, /* Radeon RV710 */ {"HD 4350", CARD_AMD_RADEON_HD4350}, /* Radeon RV710 */ /* R600/R700 integrated */ + {"HD 4200M", CARD_AMD_RADEON_HD4200M}, {"HD 3300", CARD_AMD_RADEON_HD3200}, {"HD 3200", CARD_AMD_RADEON_HD3200}, {"HD 3100", CARD_AMD_RADEON_HD3200}, @@ -1987,7 +1989,7 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info {"RV730", CARD_AMD_RADEON_HD4600}, {"RV710", CARD_AMD_RADEON_HD4350}, /* R600/R700 integrated */ - {"RS880", CARD_AMD_RADEON_HD3200}, + {"RS880", CARD_AMD_RADEON_HD4200M}, {"RS780", CARD_AMD_RADEON_HD3200}, /* R600 */ {"R680", CARD_AMD_RADEON_HD2900}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84adc27..7c088eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1364,6 +1364,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD2600 = 0x9581, CARD_AMD_RADEON_HD2900 = 0x9400, CARD_AMD_RADEON_HD3200 = 0x9620, + CARD_AMD_RADEON_HD4200M = 0x9712, CARD_AMD_RADEON_HD4350 = 0x954f, CARD_AMD_RADEON_HD4600 = 0x9495, CARD_AMD_RADEON_HD4700 = 0x944e,

1 0

Andrew Eikum : dsound/tests: Fix test that fails on older Windows 2000.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 892068f96ca895731dd2ed5f070c21c711b8eff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892068f96ca895731dd2ed5f0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 31 10:27:38 2013 -0500 dsound/tests: Fix test that fails on older Windows 2000. --- dlls/dsound/tests/dsound.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index bca0d76..d31dc9c 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1409,6 +1409,11 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) ok(wfx.nBlockAlign == 4, "blockalign: %u\n", wfx.nBlockAlign); ok(wfx.nAvgBytesPerSec == 44100 * 4, "avgbytes: %u\n", wfx.nAvgBytesPerSec); + if(!gotdx8){ + win_skip("Not doing the WAVE_FORMAT_EXTENSIBLE tests\n"); + goto done; + } + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; fmtex.Format.nChannels = 2; @@ -1475,6 +1480,7 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) IDirectSoundBuffer_Release(primary); } +done: IDirectSound_Release(dso); return S_OK;

1 0

Andrew Eikum : winmm/tests: Fix test that fails on NT4.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: d4560b0ce02f62ce14d6495f72fb0bcc85e439f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4560b0ce02f62ce14d6495f7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 31 10:42:37 2013 -0500 winmm/tests: Fix test that fails on NT4. --- dlls/winmm/tests/capture.c | 6 ++++-- dlls/winmm/tests/wave.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 329130a..f904bb1 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -649,10 +649,12 @@ static void wave_in_tests(void) rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || + rc == MMSYSERR_NOTSUPPORTED || rc == MMSYSERR_NOERROR, "waveInMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); - ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || - preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + if(rc != MMSYSERR_NOTSUPPORTED) + ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || + preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); rc=waveInGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index fd05f7b..171bf49 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1420,10 +1420,12 @@ static void wave_out_tests(void) rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, (DWORD_PTR)&preferred, (DWORD_PTR)&status); ok((ndev == 0 && (rc == MMSYSERR_NODRIVER || rc == MMSYSERR_BADDEVICEID)) || + rc == MMSYSERR_NOTSUPPORTED || rc == MMSYSERR_NOERROR, "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); - ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || - preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + if(rc != MMSYSERR_NOTSUPPORTED) + ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || + preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); rc=waveOutGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID,

1 0

Nikolay Sivov : xmllite: Set PI target value just after it's parsed.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: caa452e958b883133d0378d5be2e82249a55ccb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa452e958b883133d0378d5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 31 19:27:31 2013 +0400 xmllite: Set PI target value just after it's parsed. --- dlls/xmllite/reader.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ed4f97e..8276b85 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1300,6 +1300,9 @@ static HRESULT reader_parse_pi(xmlreader *reader) case XmlReadResumeState_PITarget: hr = reader_parse_pitarget(reader, &target); if (FAILED(hr)) return hr; + reader_set_strvalue(reader, StringValue_LocalName, &target); + reader_set_strvalue(reader, StringValue_QualifiedName, &target); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); reader->resumestate = XmlReadResumeState_PIBody; default: ; @@ -1313,9 +1316,6 @@ static HRESULT reader_parse_pi(xmlreader *reader) reader_skipn(reader, 2); reader->nodetype = XmlNodeType_ProcessingInstruction; reader->resumestate = XmlReadResumeState_Initial; - reader_set_strvalue(reader, StringValue_LocalName, &target); - reader_set_strvalue(reader, StringValue_QualifiedName, &target); - reader_set_strvalue(reader, StringValue_Value, &strval_empty); return S_OK; } @@ -1348,8 +1348,6 @@ static HRESULT reader_parse_pi(xmlreader *reader) reader->resumestate = XmlReadResumeState_Initial; reader->resume[XmlReadResume_Body] = NULL; reader_init_strvalue(start, ptr-start, &value); - reader_set_strvalue(reader, StringValue_LocalName, &target); - reader_set_strvalue(reader, StringValue_QualifiedName, &target); reader_set_strvalue(reader, StringValue_Value, &value); return S_OK; }

1 0

Marcus Meissner : wininet: Avoid one-byte overflows (Coverity).
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 038e3d3773d44738320f1381abdb88454ff92cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=038e3d3773d44738320f1381a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu May 30 20:27:10 2013 +0200 wininet: Avoid one-byte overflows (Coverity). --- dlls/wininet/tests/http.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b42e732..f4d0b43 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2835,13 +2835,13 @@ static void test_cache_read_gzipped(int port) buf[size] = 0; ok(!strncmp(buf, content, size), "incorrect page content: %s\n", buf); - size = sizeof(buf); + size = sizeof(buf)-1; ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_TYPE, buf, &size, 0); ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); buf[size] = 0; ok(!strncmp(text_html, buf, size), "buf = %s\n", buf); - size = sizeof(buf); + size = sizeof(buf)-1; ret = HttpQueryInfoA(req, HTTP_QUERY_RAW_HEADERS_CRLF, buf, &size, 0); ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); buf[size] = 0; @@ -2858,7 +2858,7 @@ static void test_cache_read_gzipped(int port) ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); size = 0; - while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + while(InternetReadFile(req, buf+size, sizeof(buf)-1-size, &read) && read) size += read; todo_wine ok(size == 10, "read %d bytes of data\n", size); buf[size] = 0; @@ -2870,7 +2870,7 @@ static void test_cache_read_gzipped(int port) "HttpQueryInfo(HTTP_QUERY_CONTENT_ENCODING) returned %d, %d\n", ret, GetLastError()); - size = sizeof(buf); + size = sizeof(buf)-1; ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_TYPE, buf, &size, 0); todo_wine ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); buf[size] = 0; @@ -2888,7 +2888,7 @@ static void test_cache_read_gzipped(int port) ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); size = 0; - while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + while(InternetReadFile(req, buf+size, sizeof(buf)-1-size, &read) && read) size += read; ok(size == 31, "read %d bytes of data\n", size); InternetCloseHandle(req); @@ -2903,7 +2903,7 @@ static void test_cache_read_gzipped(int port) ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); size = 0; - while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + while(InternetReadFile(req, buf+size, sizeof(buf)-1-size, &read) && read) size += read; todo_wine ok(size == 31, "read %d bytes of data\n", size);

1 0

Austin English : msvcrt: Remove warning hack.
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: d42ed7595c1a2992250222031481ab987e0b070e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d42ed7595c1a2992250222031… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 30 13:28:11 2013 -0700 msvcrt: Remove warning hack. --- dlls/msvcrt/process.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index b61eea1..4505b67 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -360,8 +360,6 @@ MSVCRT_intptr_t CDECL _cwait(int *status, MSVCRT_intptr_t pid, int action) HANDLE hPid = (HANDLE)pid; int doserrno; - action = action; /* Remove warning */ - if (!WaitForSingleObject(hPid, INFINITE)) { if (status)

1 0

Henri Verbeet : wined3d: Get rid of the unused "half" GLSL variable in shader_glsl_ffp_vertex_lighting().
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: e4f50de336cf4b3d4be1f78d4d04d7376df7280e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4f50de336cf4b3d4be1f78d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 30 22:34:15 2013 +0200 wined3d: Get rid of the unused "half" GLSL variable in shader_glsl_ffp_vertex_lighting(). --- dlls/wined3d/glsl_shader.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fb96463..57f22de 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4836,7 +4836,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer shader_addline(buffer, "vec3 ambient = gl_LightModel.ambient.xyz;\n"); shader_addline(buffer, "vec3 diffuse = vec3(0.0);\n"); shader_addline(buffer, "vec4 specular = vec4(0.0);\n"); - shader_addline(buffer, "vec3 dir, dst, half;\n"); + shader_addline(buffer, "vec3 dir, dst;\n"); shader_addline(buffer, "float att, t;\n"); ambient = shader_glsl_ffp_mcs(settings->ambient_source, "gl_FrontMaterial.ambient"); @@ -4846,7 +4846,6 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) { - light_type = (settings->light_type >> WINED3D_FFP_LIGHT_TYPE_SHIFT(i)) & WINED3D_FFP_LIGHT_TYPE_MASK; switch (light_type) {

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_CreatePredicate().
by Alexandre Julliard 31 May '13

31 May '13

Module: wine Branch: master Commit: 7b84e3234b5b079c04374e3a2070ef84e9f4efb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b84e3234b5b079c04374e3a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 30 22:34:16 2013 +0200 d3d10core: Implement d3d10_device_CreatePredicate(). --- dlls/d3d10core/async.c | 8 ++++++-- dlls/d3d10core/d3d10core_private.h | 4 +++- dlls/d3d10core/device.c | 32 ++++++++++++++++++++++++++++---- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c index 3f869a5..d5de9a9 100644 --- a/dlls/d3d10core/async.c +++ b/dlls/d3d10core/async.c @@ -33,9 +33,12 @@ static inline struct d3d10_query *impl_from_ID3D10Query(ID3D10Query *iface) static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object) { + struct d3d10_query *query = impl_from_ID3D10Query(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_ID3D10Query) + if ((IsEqualGUID(riid, &IID_ID3D10Predicate) && query->predicate) + || IsEqualGUID(riid, &IID_ID3D10Query) || IsEqualGUID(riid, &IID_ID3D10Asynchronous) || IsEqualGUID(riid, &IID_ID3D10DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) @@ -162,10 +165,11 @@ static const struct ID3D10QueryVtbl d3d10_query_vtbl = d3d10_query_GetDesc, }; -HRESULT d3d10_query_init(struct d3d10_query *query) +HRESULT d3d10_query_init(struct d3d10_query *query, BOOL predicate) { query->ID3D10Query_iface.lpVtbl = &d3d10_query_vtbl; query->refcount = 1; + query->predicate = predicate; return S_OK; } diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index a859642..9916d63 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -278,9 +278,11 @@ struct d3d10_query { ID3D10Query ID3D10Query_iface; LONG refcount; + + BOOL predicate; }; -HRESULT d3d10_query_init(struct d3d10_query *query) DECLSPEC_HIDDEN; +HRESULT d3d10_query_init(struct d3d10_query *query, BOOL predicate) DECLSPEC_HIDDEN; /* IDirect3D10Device */ struct d3d10_device diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index f7b906d..0e7fc95 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1532,8 +1532,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device *iface, if (!object) return E_OUTOFMEMORY; - hr = d3d10_query_init(object); - if (FAILED(hr)) + if (FAILED(hr = d3d10_query_init(object, FALSE))) { WARN("Failed to initialize query, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -1549,9 +1548,34 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device *iface, static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device *iface, const D3D10_QUERY_DESC *desc, ID3D10Predicate **predicate) { - FIXME("iface %p, desc %p, predicate %p stub!\n", iface, desc, predicate); + struct d3d10_query *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, predicate %p.\n", iface, desc, predicate); + + if (!desc) + return E_INVALIDARG; + + if (desc->Query != D3D10_QUERY_OCCLUSION_PREDICATE && desc->Query != D3D10_QUERY_SO_OVERFLOW_PREDICATE) + { + WARN("Query type %#x is not a predicate.\n", desc->Query); + return E_INVALIDARG; + } + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d10_query_init(object, TRUE))) + { + WARN("Failed to initialize predicate, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created predicate %p.\n", object); + *predicate = (ID3D10Predicate *)&object->ID3D10Query_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateCounter(ID3D10Device *iface,

1 0