October 2011 - Wine-Commits

Piotr Caban : msvcp90: Added more basic_string constructor implementations.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 796a13c80d2be359a5b89ab38119645f3a0f8039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=796a13c80d2be359a5b89ab38… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 14 15:01:12 2011 +0200 msvcp90: Added more basic_string constructor implementations. --- dlls/msvcp90/msvcp90.spec | 56 +++++++++--------- dlls/msvcp90/string.c | 136 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=796a13c80d2be359a5b89…

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 4b9d21843c3ceab36a53823c4c70f0ce889a05d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9d21843c3ceab36a53823c4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Oct 13 00:44:47 2011 -0600 po: Update Catalan translation. --- po/ca.po | 5381 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 3012 insertions(+), 2369 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b9d21843c3ceab36a538…

1 0

Piotr Caban : msvcp90: Added more basic_string::assing functions.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 044e07d1f84cfc225ad2246a0a7a4f4234f3c52b URL: http://source.winehq.org/git/wine.git/?a=commit;h=044e07d1f84cfc225ad2246a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 14 15:01:03 2011 +0200 msvcp90: Added more basic_string::assing functions. --- dlls/msvcp90/msvcp90.spec | 24 ++++++++-------- dlls/msvcp90/string.c | 66 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 77 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=044e07d1f84cfc225ad22…

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_npatch_mode() const.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: a9fcaed6105bdbb75f0689317e0cc5cd2e616ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9fcaed6105bdbb75f0689317… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:09 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_npatch_mode() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4509d93..20bf808 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4613,7 +4613,7 @@ HRESULT CDECL wined3d_device_set_npatch_mode(struct wined3d_device *device, floa return WINED3D_OK; } -float CDECL wined3d_device_get_npatch_mode(struct wined3d_device *device) +float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) { static BOOL warned; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 92d7d4d..e466400 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2224,7 +2224,7 @@ HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *dev HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, WINED3DLIGHT *light); HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable); HRESULT __cdecl wined3d_device_get_material(const struct wined3d_device *device, WINED3DMATERIAL *material); -float __cdecl wined3d_device_get_npatch_mode(struct wined3d_device *device); +float __cdecl wined3d_device_get_npatch_mode(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_topology);

1 0

Henri Verbeet : wined3d: Cleanup context_create() error handling a bit.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 7ffa768e712420576728777f5919eac5a8daedc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffa768e712420576728777f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:07 2011 +0200 wined3d: Cleanup context_create() error handling a bit. --- dlls/wined3d/context.c | 123 ++++++++++++++++++++++++++--------------------- 1 files changed, 68 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 61398e6..9d15176 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1311,6 +1311,53 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, return NULL; } + if (device->shader_backend->shader_dirtifyable_constants()) + { + /* Create the dirty constants array and initialize them to dirty */ + ret->vshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, + sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); + if (!ret->vshader_const_dirty) + goto out; + + ret->pshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, + sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); + if (!ret->pshader_const_dirty) + goto out; + + memset(ret->vshader_const_dirty, 1, + sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); + memset(ret->pshader_const_dirty, 1, + sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); + } + + ret->blit_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + gl_info->limits.buffers * sizeof(*ret->blit_targets)); + if (!ret->blit_targets) + goto out; + + ret->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + gl_info->limits.buffers * sizeof(*ret->draw_buffers)); + if (!ret->draw_buffers) + goto out; + + ret->free_occlusion_query_size = 4; + ret->free_occlusion_queries = HeapAlloc(GetProcessHeap(), 0, + ret->free_occlusion_query_size * sizeof(*ret->free_occlusion_queries)); + if (!ret->free_occlusion_queries) + goto out; + + list_init(&ret->occlusion_queries); + + ret->free_event_query_size = 4; + ret->free_event_queries = HeapAlloc(GetProcessHeap(), 0, + ret->free_event_query_size * sizeof(*ret->free_event_queries)); + if (!ret->free_event_queries) + goto out; + + list_init(&ret->event_queries); + list_init(&ret->fbo_list); + list_init(&ret->fbo_destroy_list); + if (!(hdc = GetDC(swapchain->win_handle))) { WARN("Failed to retireve device context, trying swapchain backup.\n"); @@ -1362,36 +1409,41 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } + context_enter(ret); + if (!context_set_pixel_format(gl_info, hdc, pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc); + context_release(ret); + goto out; + } + + if (!(ctx = pwglCreateContext(hdc))) + { + ERR("Failed to create a WGL context.\n"); + context_release(ret); goto out; } - ctx = pwglCreateContext(hdc); if (device->context_count) { if (!pwglShareLists(device->contexts[0]->glCtx, ctx)) { - DWORD err = GetLastError(); ERR("wglShareLists(%p, %p) failed, last error %#x.\n", - device->contexts[0]->glCtx, ctx, err); + device->contexts[0]->glCtx, ctx, GetLastError()); + context_release(ret); + if (!pwglDeleteContext(ctx)) + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); + goto out; } } - if(!ctx) { - ERR("Failed to create a WGL context\n"); - goto out; - } - if (!device_context_add(device, ret)) { ERR("Failed to add the newly created context to the context list\n"); + context_release(ret); if (!pwglDeleteContext(ctx)) - { - DWORD err = GetLastError(); - ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, err); - } + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); goto out; } @@ -1419,53 +1471,14 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ret->hdc = hdc; ret->pixel_format = pixel_format; - if (device->shader_backend->shader_dirtifyable_constants()) - { - /* Create the dirty constants array and initialize them to dirty */ - ret->vshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, - sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); - ret->pshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, - sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); - memset(ret->vshader_const_dirty, 1, - sizeof(*ret->vshader_const_dirty) * device->d3d_vshader_constantF); - memset(ret->pshader_const_dirty, 1, - sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); - } - - ret->blit_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - gl_info->limits.buffers * sizeof(*ret->blit_targets)); - if (!ret->blit_targets) goto out; - - ret->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - gl_info->limits.buffers * sizeof(*ret->draw_buffers)); - if (!ret->draw_buffers) goto out; - - ret->free_occlusion_query_size = 4; - ret->free_occlusion_queries = HeapAlloc(GetProcessHeap(), 0, - ret->free_occlusion_query_size * sizeof(*ret->free_occlusion_queries)); - if (!ret->free_occlusion_queries) goto out; - - list_init(&ret->occlusion_queries); - - ret->free_event_query_size = 4; - ret->free_event_queries = HeapAlloc(GetProcessHeap(), 0, - ret->free_event_query_size * sizeof(*ret->free_event_queries)); - if (!ret->free_event_queries) goto out; - - list_init(&ret->event_queries); - - TRACE("Successfully created new context %p\n", ret); - - list_init(&ret->fbo_list); - list_init(&ret->fbo_destroy_list); - - context_enter(ret); - /* Set up the context defaults */ if (!context_set_current(ret)) { - ERR("Cannot activate context to set up defaults\n"); + ERR("Cannot activate context to set up defaults.\n"); + device_context_remove(device, ret); context_release(ret); + if (!pwglDeleteContext(ctx)) + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); goto out; }

1 0

Vitaliy Margolen : dinput: Acquire should not reset buffer position.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 1a56be85be3f909aaede36b65b75f426ebd2bab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a56be85be3f909aaede36b65… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Oct 13 21:22:31 2011 -0600 dinput: Acquire should not reset buffer position. --- dlls/dinput/device.c | 3 --- dlls/dinput/tests/mouse.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 83740c5..a9c7b87 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -791,10 +791,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) res = This->acquired ? S_FALSE : DI_OK; This->acquired = 1; if (res == DI_OK) - { - This->queue_head = This->queue_tail = This->overflow = 0; check_dinput_hooks(iface); - } LeaveCriticalSection(&This->crit); return res; diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 25a9a5e..db96a15 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -72,6 +72,9 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) LPDIRECTINPUTDEVICE pMouse = NULL; DIMOUSESTATE m_state; HWND hwnd2; + DIPROPDWORD di_op; + DIDEVICEOBJECTDATA mouse_state; + DWORD cnt; if (! SetForegroundWindow(hwnd)) { @@ -86,6 +89,14 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) hr = IDirectInputDevice_SetCooperativeLevel(pMouse, hwnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND); ok(hr == S_OK, "SetCooperativeLevel: %08x\n", hr); + memset(&di_op, 0, sizeof(di_op)); + di_op.dwData = 20; + di_op.diph.dwHow = DIPH_DEVICE; + di_op.diph.dwSize = sizeof(DIPROPDWORD); + di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); + hr = IDirectInputDevice_SetProperty(pMouse, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&di_op); + ok(hr == S_OK, "SetProperty() failed: %08x\n", hr); + hr = IDirectInputDevice_SetDataFormat(pMouse, &c_dfDIMouse); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %08x\n", hr); hr = IDirectInputDevice_Unacquire(pMouse); @@ -113,6 +124,25 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) hr = IDirectInputDevice_Acquire(pMouse); ok(hr == S_OK, "Acquire() failed: %08x\n", hr); + mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + + mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); + IDirectInputDevice_Unacquire(pMouse); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + + IDirectInputDevice_Acquire(pMouse); + mouse_event(MOUSEEVENTF_MOVE, 10, 10, 0, 0); + IDirectInputDevice_Unacquire(pMouse); + IDirectInputDevice_Acquire(pMouse); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); + ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + if (pMouse) IUnknown_Release(pMouse); DestroyWindow( hwnd2 );

1 0

Vitaliy Margolen : dinput: GetDeviceData always succeeds regardless if buffering is enabled or device is acquired .
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 157528eb0f826f1008488097e361ffc2872d640f URL: http://source.winehq.org/git/wine.git/?a=commit;h=157528eb0f826f1008488097e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Oct 13 21:22:26 2011 -0600 dinput: GetDeviceData always succeeds regardless if buffering is enabled or device is acquired. --- dlls/dinput/device.c | 4 +--- dlls/dinput/tests/device.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a4052ea..83740c5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1286,10 +1286,8 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W ifac TRACE("(%p) %p -> %p(%d) x%d, 0x%08x\n", This, dod, entries, entries ? *entries : 0, dodsize, flags); - if (!This->acquired) - return DIERR_NOTACQUIRED; if (!This->queue_len) - return DIERR_NOTBUFFERED; + return DI_OK; if (dodsize < sizeof(DIDEVICEOBJECTDATA_DX3)) return DIERR_INVALIDPARAM; diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index e79c564..2e4e4f8 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -103,6 +103,9 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET); if (SUCCEEDED(hr)) { + DWORD cnt; + DIDEVICEOBJECTDATA buffer[5]; + /* No device supports per axis relative/absolute mode */ memset(&dp, 0, sizeof(dp)); dp.diph.dwSize = sizeof(DIPROPDWORD); @@ -119,9 +122,28 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd) hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + dp.dwData = 0; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + + cnt = 5; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + ok(hr == DI_OK && cnt == 5, "GetDeviceData() failed: %08x cnt: %d\n", hr, cnt); + + dp.dwData = 20; + hr = IDirectInputDevice_SetProperty(device, DIPROP_BUFFERSIZE, (LPCDIPROPHEADER)&dp.diph); + ok(hr == DI_OK, "SetProperty() failed: %08x\n", hr); + + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + /* Cannot change mode while acquired */ hr = IDirectInputDevice_Acquire(device); ok(hr == DI_OK, "Acquire() failed: %08x\n", hr); + cnt = 1; + hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer), buffer, &cnt, 0); + ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); hr = IDirectInputDevice_SetProperty(device, DIPROP_AXISMODE, &dp.diph); ok(hr == DIERR_ACQUIRED, "SetProperty() returned: %08x\n", hr); hr = IDirectInputDevice_Unacquire(device);

1 0

Piotr Caban : msvcrt: Fix handling of locales without region in MSVCRT_locale_to_LCID.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 922ae2e2689bf9d0161754dfad031704e40542b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=922ae2e2689bf9d0161754dfa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 23:29:27 2011 +0200 msvcrt: Fix handling of locales without region in MSVCRT_locale_to_LCID. --- dlls/msvcrt/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 8d71c11..6733522 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -232,7 +232,7 @@ LCID MSVCRT_locale_to_LCID(const char *locale) if(cp) { lstrcpynA(search.search_codepage, cp+1, MAX_ELEM_LEN); - if(cp-region-1 < MAX_ELEM_LEN) + if(region && cp-region-1<MAX_ELEM_LEN) search.search_country[cp-region-1] = '\0'; if(cp-locale < MAX_ELEM_LEN) search.search_language[cp-locale] = '\0';

1 0

Andrew Talbot : wined3d: Mark some fall-throughs in switch statements.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 819225d98b14fe576658c57dd86367513d39ab04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819225d98b14fe576658c57dd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 13 22:17:55 2011 +0100 wined3d: Mark some fall-throughs in switch statements. --- dlls/wined3d/ati_fragment_shader.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 4cf273c..d550a04 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -551,6 +551,7 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con arg1 = arg2; argmod1 = argmod2; rep1 = rep2; + /* fall through */ case WINED3DTOP_SELECTARG1: wrap_op1(gl_info, GL_MOV_ATI, dstreg, GL_NONE, GL_NONE, arg1, rep1, argmod1); @@ -558,9 +559,11 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con case WINED3DTOP_MODULATE4X: if(dstmod == GL_NONE) dstmod = GL_4X_BIT_ATI; + /* fall through */ case WINED3DTOP_MODULATE2X: if(dstmod == GL_NONE) dstmod = GL_2X_BIT_ATI; dstmod |= GL_SATURATE_BIT_ATI; + /* fall through */ case WINED3DTOP_MODULATE: wrap_op2(gl_info, GL_MUL_ATI, dstreg, GL_NONE, dstmod, arg1, rep1, argmod1, @@ -569,8 +572,10 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con case WINED3DTOP_ADDSIGNED2X: dstmod = GL_2X_BIT_ATI; + /* fall through */ case WINED3DTOP_ADDSIGNED: argmodextra = GL_BIAS_BIT_ATI; + /* fall through */ case WINED3DTOP_ADD: dstmod |= GL_SATURATE_BIT_ATI; wrap_op2(gl_info, GL_ADD_ATI, GL_REG_0_ATI, GL_NONE, dstmod, @@ -598,10 +603,13 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con case WINED3DTOP_BLENDCURRENTALPHA: if(extrarg == GL_NONE) extrarg = register_for_arg(WINED3DTA_CURRENT, gl_info, stage, NULL, NULL, -1); + /* fall through */ case WINED3DTOP_BLENDFACTORALPHA: if(extrarg == GL_NONE) extrarg = register_for_arg(WINED3DTA_TFACTOR, gl_info, stage, NULL, NULL, -1); + /* fall through */ case WINED3DTOP_BLENDTEXTUREALPHA: if(extrarg == GL_NONE) extrarg = register_for_arg(WINED3DTA_TEXTURE, gl_info, stage, NULL, NULL, -1); + /* fall through */ case WINED3DTOP_BLENDDIFFUSEALPHA: if(extrarg == GL_NONE) extrarg = register_for_arg(WINED3DTA_DIFFUSE, gl_info, stage, NULL, NULL, -1); wrap_op3(gl_info, GL_LERP_ATI, dstreg, GL_NONE, GL_NONE, @@ -622,6 +630,7 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con case WINED3DTOP_MODULATEINVALPHA_ADDCOLOR: argmodextra = argmod1 & GL_COMP_BIT_ATI ? argmod1 & ~GL_COMP_BIT_ATI : argmod1 | GL_COMP_BIT_ATI; + /* fall through */ case WINED3DTOP_MODULATEALPHA_ADDCOLOR: if(!argmodextra) argmodextra = argmod1; wrap_op3(gl_info, GL_MAD_ATI, dstreg, GL_NONE, GL_SATURATE_BIT_ATI, @@ -632,6 +641,7 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con case WINED3DTOP_MODULATEINVCOLOR_ADDALPHA: argmodextra = argmod1 & GL_COMP_BIT_ATI ? argmod1 & ~GL_COMP_BIT_ATI : argmod1 | GL_COMP_BIT_ATI; + /* fall through */ case WINED3DTOP_MODULATECOLOR_ADDALPHA: if(!argmodextra) argmodextra = argmod1; wrap_op3(gl_info, GL_MAD_ATI, dstreg, GL_NONE, GL_SATURATE_BIT_ATI, @@ -688,6 +698,7 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con case WINED3DTOP_SELECTARG2: arg1 = arg2; argmod1 = argmod2; + /* fall through */ case WINED3DTOP_SELECTARG1: wrap_op1(gl_info, GL_MOV_ATI, dstreg, GL_ALPHA, GL_NONE, arg1, GL_NONE, argmod1); @@ -695,9 +706,11 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con case WINED3DTOP_MODULATE4X: if(dstmod == GL_NONE) dstmod = GL_4X_BIT_ATI; + /* fall through */ case WINED3DTOP_MODULATE2X: if(dstmod == GL_NONE) dstmod = GL_2X_BIT_ATI; dstmod |= GL_SATURATE_BIT_ATI; + /* fall through */ case WINED3DTOP_MODULATE: wrap_op2(gl_info, GL_MUL_ATI, dstreg, GL_ALPHA, dstmod, arg1, GL_NONE, argmod1, @@ -706,8 +719,10 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con case WINED3DTOP_ADDSIGNED2X: dstmod = GL_2X_BIT_ATI; + /* fall through */ case WINED3DTOP_ADDSIGNED: argmodextra = GL_BIAS_BIT_ATI; + /* fall through */ case WINED3DTOP_ADD: dstmod |= GL_SATURATE_BIT_ATI; wrap_op2(gl_info, GL_ADD_ATI, dstreg, GL_ALPHA, dstmod, @@ -735,10 +750,13 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con case WINED3DTOP_BLENDCURRENTALPHA: if(extrarg == GL_NONE) extrarg = register_for_arg(WINED3DTA_CURRENT, gl_info, stage, NULL, NULL, -1); + /* fall through */ case WINED3DTOP_BLENDFACTORALPHA: if(extrarg == GL_NONE) extrarg = register_for_arg(WINED3DTA_TFACTOR, gl_info, stage, NULL, NULL, -1); + /* fall through */ case WINED3DTOP_BLENDTEXTUREALPHA: if(extrarg == GL_NONE) extrarg = register_for_arg(WINED3DTA_TEXTURE, gl_info, stage, NULL, NULL, -1); + /* fall through */ case WINED3DTOP_BLENDDIFFUSEALPHA: if(extrarg == GL_NONE) extrarg = register_for_arg(WINED3DTA_DIFFUSE, gl_info, stage, NULL, NULL, -1); wrap_op3(gl_info, GL_LERP_ATI, dstreg, GL_ALPHA, GL_NONE,

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_raster_status() const.
by Alexandre Julliard Oct. 14, 2011

Oct. 14, 2011

Module: wine Branch: master Commit: 39f898b26a5985e35fd776641c827a901abc625d URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f898b26a5985e35fd776641… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 13 21:43:08 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_raster_status() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec9126f..4509d93 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4568,7 +4568,7 @@ BOOL CDECL wined3d_device_get_software_vertex_processing(const struct wined3d_de return device->softwareVertexProcessing; } -HRESULT CDECL wined3d_device_get_raster_status(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status) { struct wined3d_swapchain *swapchain; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c6949bd..92d7d4d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2234,7 +2234,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *devi UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); -HRESULT __cdecl wined3d_device_get_raster_status(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status); HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, WINED3DRENDERSTATETYPE state, DWORD *value);

1 0