June 2011 - Wine-commits - list.winehq.org

Huw Davies : comdlg32: When changing printers, only preserve the paper/ bin settings if the new printer has the original setting available.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 016b7c53dc173389950af2047efd343cfd36666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=016b7c53dc173389950af2047… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 22 15:22:48 2011 +0100 comdlg32: When changing printers, only preserve the paper/bin settings if the new printer has the original setting available. --- dlls/comdlg32/printdlg.c | 101 +++++++++++++++++++++++++--------------------- 1 files changed, 55 insertions(+), 46 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index d692e7d..4d8b0c8 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -616,8 +616,8 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg, int NrOfEntries; char* Names; WORD* Words; - DWORD Sel; - WORD oldWord = 0; + DWORD Sel, old_Sel; + WORD oldWord = 0, newWord = 0; /* DMPAPER_ and DMBIN_ start at 1 */ int NamesSize; int fwCapability_Names; int fwCapability_Words; @@ -633,26 +633,14 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg, */ oldWord = SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETITEMDATA, Sel, 0); - if (dm) { - if (nIDComboBox == cmb2) - dm->u1.s1.dmPaperSize = oldWord; - else - dm->u1.s1.dmDefaultSource = oldWord; - } - } - else { - /* we enter here only when the Print setup dialog is initially - * opened. In this case the settings are restored from when - * the dialog was last closed. - */ - if (dm) { - if (nIDComboBox == cmb2) - oldWord = dm->u1.s1.dmPaperSize; - else - oldWord = dm->u1.s1.dmDefaultSource; - } + if(oldWord >= DMPAPER_USER) /* DMPAPER_USER == DMBIN_USER */ + oldWord = 0; /* There's no point in trying to keep custom + paper / bin sizes across printers */ } + if (dm) + newWord = (nIDComboBox == cmb2) ? dm->u1.s1.dmPaperSize : dm->u1.s1.dmDefaultSource; + if (nIDComboBox == cmb2) { NamesSize = 64; fwCapability_Names = DC_PAPERNAMES; @@ -695,16 +683,32 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg, Words[i]); } - /* Look for old selection - can't do this is previous loop since - item order will change as more items are added */ + /* Look for old selection or the new default. + Can't do this is previous loop since item order will change as more items are added */ Sel = 0; + old_Sel = NrOfEntries; for (i = 0; i < NrOfEntries; i++) { if(SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETITEMDATA, i, 0) == oldWord) { - Sel = i; + old_Sel = i; break; } + if(SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETITEMDATA, i, 0) == newWord) + Sel = i; + } + + if(old_Sel < NrOfEntries) + { + if (dm) + { + if(nIDComboBox == cmb2) + dm->u1.s1.dmPaperSize = oldWord; + else + dm->u1.s1.dmDefaultSource = oldWord; + } + Sel = old_Sel; } + SendDlgItemMessageA(hDlg, nIDComboBox, CB_SETCURSEL, Sel, 0); HeapFree(GetProcessHeap(),0,Words); @@ -722,8 +726,8 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, int NrOfEntries; WCHAR* Names; WORD* Words; - DWORD Sel; - WORD oldWord = 0; + DWORD Sel, old_Sel; + WORD oldWord = 0, newWord = 0; /* DMPAPER_ and DMBIN_ start at 1 */ int NamesSize; int fwCapability_Names; int fwCapability_Words; @@ -739,26 +743,15 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, */ oldWord = SendDlgItemMessageW(hDlg, nIDComboBox, CB_GETITEMDATA, Sel, 0); - if (dm) { - if (nIDComboBox == cmb2) - dm->u1.s1.dmPaperSize = oldWord; - else - dm->u1.s1.dmDefaultSource = oldWord; - } - } - else { - /* we enter here only when the Print setup dialog is initially - * opened. In this case the settings are restored from when - * the dialog was last closed. - */ - if (dm) { - if (nIDComboBox == cmb2) - oldWord = dm->u1.s1.dmPaperSize; - else - oldWord = dm->u1.s1.dmDefaultSource; - } + + if(oldWord >= DMPAPER_USER) /* DMPAPER_USER == DMBIN_USER */ + oldWord = 0; /* There's no point in trying to keep custom + paper / bin sizes across printers */ } + if (dm) + newWord = (nIDComboBox == cmb2) ? dm->u1.s1.dmPaperSize : dm->u1.s1.dmDefaultSource; + if (nIDComboBox == cmb2) { NamesSize = 64; fwCapability_Names = DC_PAPERNAMES; @@ -801,16 +794,32 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, Words[i]); } - /* Look for old selection - can't do this is previous loop since - item order will change as more items are added */ + /* Look for old selection or the new default. + Can't do this is previous loop since item order will change as more items are added */ Sel = 0; + old_Sel = NrOfEntries; for (i = 0; i < NrOfEntries; i++) { if(SendDlgItemMessageW(hDlg, nIDComboBox, CB_GETITEMDATA, i, 0) == oldWord) { - Sel = i; + old_Sel = i; break; } + if(SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETITEMDATA, i, 0) == newWord) + Sel = i; + } + + if(old_Sel < NrOfEntries) + { + if (dm) + { + if(nIDComboBox == cmb2) + dm->u1.s1.dmPaperSize = oldWord; + else + dm->u1.s1.dmDefaultSource = oldWord; + } + Sel = old_Sel; } + SendDlgItemMessageW(hDlg, nIDComboBox, CB_SETCURSEL, Sel, 0); HeapFree(GetProcessHeap(),0,Words);

1 0

Travis Athougies : d3dx9_36: Implemented ID3DXConstantTable_SetIntArray and ID3DXConstantTable_SetInt.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 73272d1664b93cc716779337256795e5137bceef URL: http://source.winehq.org/git/wine.git/?a=commit;h=73272d1664b93cc7167793372… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Jun 21 12:14:31 2011 -0700 d3dx9_36: Implemented ID3DXConstantTable_SetIntArray and ID3DXConstantTable_SetInt. --- dlls/d3dx9_36/shader.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8cebcbe..8f0c707 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -835,6 +835,9 @@ static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 devi case D3DXPT_FLOAT: row[0] = ((float *)data)[i]; break; + case D3DXPT_INT: + row[0] = (float)((int *)data)[i]; + break; default: FIXME("Unhandled type passed to set_float_array\n"); return D3DERR_INVALIDCALL; @@ -892,23 +895,23 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable* if return E_NOTIMPL; } -static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, INT n) +static HRESULT WINAPI ID3DXConstantTableImpl_SetInt(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, INT n) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %d): stub\n", This, device, constant, n); + TRACE("(%p)->(%p, %p, %d)\n", This, device, constant, n); - return E_NOTIMPL; + return ID3DXConstantTable_SetIntArray(iface, device, constant, &n, 1); } -static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, +static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, CONST INT* n, UINT count) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, n, count); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, n, count); - return E_NOTIMPL; + return set_float_array(iface, device, constant, n, count, D3DXPT_INT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device,

1 0

Travis Athougies : d3dx9_36: Implemented ID3DXConstantTable_SetVector and ID3DXConstantTable_SetVectorArray .
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 9c138a182a609ab9b458733f0cdbbbae29e25f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c138a182a609ab9b458733f0… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Jun 21 12:14:32 2011 -0700 d3dx9_36: Implemented ID3DXConstantTable_SetVector and ID3DXConstantTable_SetVectorArray. --- dlls/d3dx9_36/shader.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 8f0c707..6448e65 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -934,24 +934,50 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *i return set_float_array(iface, device, constant, f, count, D3DXPT_FLOAT); } -static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, - D3DXHANDLE constant, CONST D3DXVECTOR4* vector) +static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, + D3DXHANDLE constant, CONST D3DXVECTOR4 *vector) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p): stub\n", This, device, constant, vector); + TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, vector); - return E_NOTIMPL; + return ID3DXConstantTable_SetVectorArray(iface, device, constant, vector, 1); } -static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, - D3DXHANDLE constant, CONST D3DXVECTOR4* vector, UINT count) +static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, + D3DXHANDLE constant, CONST D3DXVECTOR4 *vector, UINT count) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, vector, count); + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT desc_count = 1; + + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, vector, count); - return E_NOTIMPL; + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x", hr); + return D3DERR_INVALIDCALL; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + if (is_vertex_shader(This->desc.Version)) + IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex, (float *)vector, + min(desc.RegisterCount, count)); + else + IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex, (float *)vector, + min(desc.RegisterCount, count)); + break; + default: + FIXME("Handle other register sets\n"); + return E_NOTIMPL; + } + + return D3D_OK; } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,

1 0

Travis Athougies : d3dx9_36: Implemented ID3DXConstantTable_SetMatrix and ID3DXConstantTable_SetMatrixArray .
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 4a412c1b83de1e1d137f036e49b3c0f3d5f88076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a412c1b83de1e1d137f036e4… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Jun 21 12:14:33 2011 -0700 d3dx9_36: Implemented ID3DXConstantTable_SetMatrix and ID3DXConstantTable_SetMatrixArray. --- dlls/d3dx9_36/shader.c | 51 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 6448e65..0e0709d 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -980,24 +980,59 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetVectorArray(ID3DXConstantTable * return D3D_OK; } -static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, - D3DXHANDLE constant, CONST D3DXMATRIX* matrix) +static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrix(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, + D3DXHANDLE constant, CONST D3DXMATRIX *matrix) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p): stub\n", This, device, constant, matrix); + TRACE("(%p)->(%p, %p, %p)\n", This, device, constant, matrix); - return E_NOTIMPL; + return ID3DXConstantTable_SetMatrixArray(iface, device, constant, matrix, 1); } -static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, - D3DXHANDLE constant, CONST D3DXMATRIX* matrix, UINT count) +static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, + D3DXHANDLE constant, CONST D3DXMATRIX *matrix, UINT count) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, matrix, count); + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT i, desc_count = 1; + D3DXMATRIX temp; - return E_NOTIMPL; + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, matrix, count); + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x", hr); + return D3DERR_INVALIDCALL; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + /* i * 4 + 3 is the last register we set. The conditional makes sure that we don't access + registers we're not supposed to */ + for (i = 0; i < count && i * 4 + 3 < desc.RegisterCount; i++) + { + if (desc.Class == D3DXPC_MATRIX_ROWS) + temp = matrix[i]; + else + D3DXMatrixTranspose(&temp, &matrix[i]); + + if (is_vertex_shader(This->desc.Version)) + IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex + i * 4, &temp._11, 4); + else + IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex + i * 4, &temp._11, 4); + } + break; + default: + FIXME("Handle other register sets\n"); + return E_NOTIMPL; + } + + return D3D_OK; } static HRESULT WINAPI ID3DXConstantTableImpl_SetMatrixPointerArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,

1 0

Travis Athougies : d3dx9_36/tests: Added tests for ID3DXConstantTable_Set* functions.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: ab5e8aed5a8b2eaa846d662c3ea863d5b52e5b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab5e8aed5a8b2eaa846d662c3… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Jun 21 12:14:34 2011 -0700 d3dx9_36/tests: Added tests for ID3DXConstantTable_Set* functions. --- dlls/d3dx9_36/tests/shader.c | 379 +++++++++++++++++++++++++++++++++--------- 1 files changed, 301 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab5e8aed5a8b2eaa846d6…

1 0

Alexandre Julliard : d3dx9: Update the spec files.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: c1a712afe0f6a4daf1cb494af47f917cc1bfc0d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a712afe0f6a4daf1cb494af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 15:40:07 2011 +0200 d3dx9: Update the spec files. --- dlls/d3dx9_24/d3dx9_24.spec | 10 +++++----- dlls/d3dx9_25/d3dx9_25.spec | 10 +++++----- dlls/d3dx9_26/d3dx9_26.spec | 10 +++++----- dlls/d3dx9_27/d3dx9_27.spec | 10 +++++----- dlls/d3dx9_28/d3dx9_28.spec | 10 +++++----- dlls/d3dx9_29/d3dx9_29.spec | 10 +++++----- dlls/d3dx9_30/d3dx9_30.spec | 10 +++++----- dlls/d3dx9_31/d3dx9_31.spec | 10 +++++----- dlls/d3dx9_32/d3dx9_32.spec | 10 +++++----- dlls/d3dx9_33/d3dx9_33.spec | 10 +++++----- dlls/d3dx9_34/d3dx9_34.spec | 10 +++++----- dlls/d3dx9_35/d3dx9_35.spec | 10 +++++----- dlls/d3dx9_37/d3dx9_37.spec | 10 +++++----- dlls/d3dx9_38/d3dx9_38.spec | 10 +++++----- dlls/d3dx9_39/d3dx9_39.spec | 10 +++++----- dlls/d3dx9_40/d3dx9_40.spec | 10 +++++----- dlls/d3dx9_41/d3dx9_41.spec | 10 +++++----- dlls/d3dx9_42/d3dx9_42.spec | 10 +++++----- dlls/d3dx9_43/d3dx9_43.spec | 10 +++++----- 19 files changed, 95 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1a712afe0f6a4daf1cb4…

1 0

Matteo Bruni : wined3d: Fix draw buffers tracking.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 32787ec0dd45a0ec794368ce8e513f421152f9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32787ec0dd45a0ec794368ce8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 17 19:28:38 2011 +0200 wined3d: Fix draw buffers tracking. --- dlls/wined3d/context.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a3c7c78..42141f2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1986,7 +1986,7 @@ static inline GLenum draw_buffer_from_rt_mask(DWORD rt_mask) } /* Context activation and GL locking are done by the caller. */ -static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask, struct wined3d_surface **rts) +static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt_mask) { if (!rt_mask) { @@ -2007,7 +2007,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt while (rt_mask) { - if ((rt_mask & 1) && rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + if (rt_mask & 1) context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; else context->draw_buffers[i] = GL_NONE; @@ -2120,7 +2120,10 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, context->current_rt, NULL, SFLAG_INTEXTURE); LEAVE_GL(); - rt_mask = 1; + if (context->current_rt && context->current_rt->resource.format->id != WINED3DFMT_NULL) + rt_mask = 1; + else + rt_mask = 0; } else { @@ -2138,7 +2141,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); if (rt_mask != context->draw_buffers_mask) { - context_apply_draw_buffers(context, rt_mask, &context->current_rt); + context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; } @@ -2191,7 +2194,8 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d for (i = 0; i < rt_count; ++i) { context->blit_targets[i] = rts[i]; - rt_mask |= (1 << i); + if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + rt_mask |= (1 << i); } while (i < context->gl_info->limits.buffers) { @@ -2218,7 +2222,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d ENTER_GL(); if (rt_mask != context->draw_buffers_mask) { - context_apply_draw_buffers(context, rt_mask, rts); + context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; } @@ -2282,6 +2286,8 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de else { const struct wined3d_shader *ps = device->stateBlock->state.pixel_shader; + DWORD rt_mask_bits; + struct wined3d_surface **rts = fb->render_targets; ENTER_GL(); context_apply_fbo_state(context, GL_FRAMEBUFFER, fb->render_targets, fb->depth_stencil, SFLAG_INTEXTURE); @@ -2290,6 +2296,16 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de LEAVE_GL(); rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= device->valid_rt_mask; + rt_mask_bits = rt_mask; + i = 0; + while (rt_mask_bits) + { + rt_mask_bits &= ~(1 << i); + if (!rts[i] || rts[i]->resource.format->id == WINED3DFMT_NULL) + rt_mask &= ~(1 << i); + + i++; + } } } else @@ -2300,7 +2316,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); if (context->draw_buffers_mask != rt_mask) { - context_apply_draw_buffers(context, rt_mask, fb->render_targets); + context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; }

1 0

Piotr Caban : msvcp90: Added std::locale::facet class stub.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 95891e4f56f5dac130090ece941c564538c51095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95891e4f56f5dac130090ece9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:02:58 2011 +0200 msvcp90: Added std::locale::facet class stub. --- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/locale.c | 110 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 30 ++++++------ 3 files changed, 126 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95891e4f56f5dac130090…

1 0

Piotr Caban : msvcp90: Added std::locale::id class stub.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 198162fbe5bc572c34b789a7d40d5b3ef4e9ea7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=198162fbe5bc572c34b789a7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:03:09 2011 +0200 msvcp90: Added std::locale::id class stub. --- dlls/msvcp90/locale.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 18 +++++++++--------- 2 files changed, 51 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 74db8d0..068c8c5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -26,13 +26,55 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +typedef struct _locale_id { + MSVCP_size_t id; +} locale_id; + typedef struct _locale_facet { const vtable_ptr *vtable; MSVCP_size_t refs; } locale_facet; +/* ?_Id_cnt(a)id@locale(a)std@@0HA */ +int locale_id__Id_cnt = 0; + static const vtable_ptr MSVCP_locale_facet_vtable[]; +/* ??0id(a)locale@std@@QAE(a)I@Z */ +/* ??0id(a)locale@std@@QEAA(a)_K@Z */ +DEFINE_THISCALL_WRAPPER(locale_id_ctor_id, 8) +locale_id* __thiscall locale_id_ctor_id(locale_id *this, MSVCP_size_t id) +{ + FIXME("(%p %lu) stub\n", this, id); + return NULL; +} + +/* ??_Fid(a)locale@std@@QAEXXZ */ +/* ??_Fid(a)locale@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(locale_id_ctor, 4) +locale_id* __thiscall locale_id_ctor(locale_id *this) +{ + FIXME("(%p) stub\n", this); + return NULL; +} + +/* ??Bid(a)locale@std@@QAEIXZ */ +/* ??Bid(a)locale@std@@QEAA_KXZ */ +DEFINE_THISCALL_WRAPPER(locale_id_operator_size_t, 4) +MSVCP_size_t __thiscall locale_id_operator_size_t(locale_id *this) +{ + FIXME("(%p) stub\n", this); + return 0; +} + +/* ?_Id_cnt_func(a)id@locale(a)std@@CAAAHXZ */ +/* ?_Id_cnt_func(a)id@locale(a)std@@CAAEAHXZ */ +int* __cdecl locale_id__Id_cnt_func(void) +{ + FIXME("stub\n"); + return NULL; +} + /* ??_Ffacet(a)locale@std@@QAEXXZ */ /* ??_Ffacet(a)locale@std@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(locale_facet_ctor, 4) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 21ba935..c10e70f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1098,8 +1098,8 @@ @ stub -arch=win64 ??0ctype_base(a)std@@QEAA(a)_K@Z @ thiscall -arch=win32 ??0facet(a)locale@std@@IAE(a)I@Z(ptr long) locale_facet_ctor_refs @ cdecl -arch=win64 ??0facet(a)locale@std@@IEAA(a)_K@Z(ptr long) locale_facet_ctor_refs -@ stub -arch=win32 ??0id(a)locale@std@@QAE(a)I@Z -@ stub -arch=win64 ??0id(a)locale@std@@QEAA(a)_K@Z +@ thiscall -arch=win32 ??0id(a)locale@std@@QAE(a)I@Z(ptr long) locale_id_ctor_id +@ cdecl -arch=win64 ??0id(a)locale@std@@QEAA(a)_K@Z(ptr long) locale_id_ctor_id @ thiscall -arch=win32 ??0ios_base(a)std@@IAE(a)XZ(ptr) ios_base_ctor @ cdecl -arch=win64 ??0ios_base(a)std@@IEAA(a)XZ(ptr) ios_base_ctor @ thiscall -arch=win32 ??0ios_base(a)std@@QAE(a)ABV01@@Z(ptr ptr) ios_base_copy_ctor @@ -1706,8 +1706,8 @@ @ stub -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_WU_Size_type_nosscl(a)01@@Z @ stub -arch=win32 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEAB_WU_Size_type_nosscl(a)01@@Z @ cdecl -arch=win64 ??A?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAAEB_W_K(a)Z(ptr long) MSVCP_basic_string_wchar_const_at -@ stub -arch=win32 ??Bid(a)locale@std@@QAEIXZ -@ stub -arch=win64 ??Bid(a)locale@std@@QEAA_KXZ +@ thiscall -arch=win32 ??Bid(a)locale@std@@QAEIXZ(ptr) locale_id_operator_size_t +@ cdecl -arch=win64 ??Bid(a)locale@std@@QEAA_KXZ(ptr) locale_id_operator_size_t @ thiscall -arch=win32 ??Bios_base(a)std@@QBEPAXXZ(ptr) ios_base_op_fail @ cdecl -arch=win64 ??Bios_base(a)std@@QEBAPEAXXZ(ptr) ios_base_op_fail @ stub -arch=win32 ??X?$complex(a)M@std@@QAEAAV01(a)ABM@Z @@ -2087,8 +2087,8 @@ @ stub -arch=win64 ??_Fctype_base(a)std@@QEAAXXZ @ thiscall -arch=win32 ??_Ffacet(a)locale@std@@QAEXXZ(ptr) locale_facet_ctor @ cdecl -arch=win64 ??_Ffacet(a)locale@std@@QEAAXXZ(ptr) locale_facet_ctor -@ stub -arch=win32 ??_Fid(a)locale@std@@QAEXXZ -@ stub -arch=win64 ??_Fid(a)locale@std@@QEAAXXZ +@ thiscall -arch=win32 ??_Fid(a)locale@std@@QAEXXZ(ptr) locale_id_ctor +@ cdecl -arch=win64 ??_Fid(a)locale@std@@QEAAXXZ(ptr) locale_id_ctor @ stub -arch=win32 ??_Fmessages_base(a)std@@QAEXXZ @ stub -arch=win64 ??_Fmessages_base(a)std@@QEAAXXZ @ stub -arch=win32 ??_Fmoney_base(a)std@@QAEXXZ @@ -2401,9 +2401,9 @@ @ stub -arch=win64 ?_Hexdig@?$num_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBAHGGGG(a)Z @ stub -arch=win32 ?_Hexdig@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABEH_W000(a)Z @ stub -arch=win64 ?_Hexdig@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBAH_W000(a)Z -# extern ?_Id_cnt(a)id@locale(a)std@@0HA -@ stub -arch=win32 ?_Id_cnt_func(a)id@locale(a)std@@CAAAHXZ -@ stub -arch=win64 ?_Id_cnt_func(a)id@locale(a)std@@CAAEAHXZ +@ extern ?_Id_cnt(a)id@locale(a)std@@0HA locale_id__Id_cnt +@ cdecl -arch=win32 ?_Id_cnt_func(a)id@locale(a)std@@CAAAHXZ(long) locale_id__Id_cnt_func +@ cdecl -arch=win64 ?_Id_cnt_func(a)id@locale(a)std@@CAAEAHXZ(long) locale_id__Id_cnt_func @ stub -arch=win32 ?_Id_func@?$codecvt(a)GDH@std@@SAAAVid(a)locale@2(a)XZ @ stub -arch=win64 ?_Id_func@?$codecvt(a)GDH@std@@SAAEAVid(a)locale@2(a)XZ @ stub -arch=win32 ?_Id_func@?$codecvt(a)_WDH@std@@SAAAVid(a)locale@2(a)XZ

1 0

Piotr Caban : msvcp90: Added locale::_Locimp class stub.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: ac978ea85e29c0c15d0514a9fe67281513eaf831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac978ea85e29c0c15d0514a9f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:03:24 2011 +0200 msvcp90: Added locale::_Locimp class stub. --- dlls/msvcp90/locale.c | 131 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 58 ++++++++++---------- 2 files changed, 160 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac978ea85e29c0c15d051…

1 0