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

Henri Verbeet : wined3d: Remove the "declaration" parameter to IWineD3DDeviceImpl_CreateVertexShader().
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 13a05caa9744673d618bc00426f3bf21e72aa0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a05caa9744673d618bc0042… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 28 08:44:21 2009 +0200 wined3d: Remove the "declaration" parameter to IWineD3DDeviceImpl_CreateVertexShader(). Once upon a time this was used for creating fake vertex shader attribute semantics for d3d8 shaders. We don't need this anymore since device_stream_info_from_declaration() will use the vertex declaration's output slot to load the data, if present. That also avoids the potentially expensive matching of attribute semantics between vertex shader and declaration for d3d8. --- dlls/d3d10core/device.c | 2 +- dlls/d3d8/device.c | 7 ++----- dlls/d3d9/vertexshader.c | 2 +- dlls/wined3d/device.c | 7 +------ dlls/wined3d/vertexshader.c | 28 ---------------------------- include/wine/wined3d.idl | 4 ---- 6 files changed, 5 insertions(+), 45 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index de07db7..20e7c46 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1003,7 +1003,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i return hr; } - hr = IWineD3DDevice_CreateVertexShader(This->wined3d_device, NULL, + hr = IWineD3DDevice_CreateVertexShader(This->wined3d_device, shader_info.shader_code, &object->output_signature, &object->wined3d_shader, (IUnknown *)object); if (FAILED(hr)) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4b24ac8..6af8d1e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1726,7 +1726,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hrc = D3D_OK; IDirect3DVertexShader8Impl *object; - IWineD3DVertexDeclaration *wined3d_vertex_declaration; const DWORD *token = pDeclaration; DWORD handle; @@ -1783,13 +1782,11 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 *ppShader = ((IDirect3DVertexDeclaration8Impl *)object->vertex_declaration)->shader_handle = shader_handle; } - wined3d_vertex_declaration = ((IDirect3DVertexDeclaration8Impl *)object->vertex_declaration)->wined3d_vertex_declaration; - if (pFunction) { /* Usage is missing ... Use SetRenderState to set the sw vp render state in SetVertexShader */ - hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, wined3d_vertex_declaration, - pFunction, NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); + hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, pFunction, + NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); if (FAILED(hrc)) { diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index c138690..d7b680e 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -126,7 +126,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9EX iface object->ref = 1; object->lpVtbl = &Direct3DVertexShader9_Vtbl; EnterCriticalSection(&d3d9_cs); - hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, NULL /* declaration */, pFunction, + hrc= IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, pFunction, NULL /* output signature */, &object->wineD3DVertexShader, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 91a0266..b022755 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2329,8 +2329,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF(IWineD3D } static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *iface, - IWineD3DVertexDeclaration *vertex_declaration, const DWORD *pFunction, - const struct wined3d_shader_signature *output_signature, + const DWORD *pFunction, const struct wined3d_shader_signature *output_signature, IWineD3DVertexShader **ppVertexShader, IUnknown *parent) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -2355,10 +2354,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac TRACE("(%p) : Created vertex shader %p\n", This, *ppVertexShader); - if (vertex_declaration) { - IWineD3DVertexShader_FakeSemantics(*ppVertexShader, vertex_declaration); - } - hr = IWineD3DVertexShader_SetFunction(*ppVertexShader, pFunction, output_signature); if (FAILED(hr)) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index b8c56cc..99108a8 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -105,20 +105,6 @@ static void vshader_set_limits(IWineD3DVertexShaderImpl *This) } } -/* This is an internal function, - * used to create fake semantics for shaders - * that don't have them - d3d8 shaders where the declaration - * stores the register for each input - */ -static void vshader_set_input( - IWineD3DVertexShaderImpl* This, - unsigned int regnum, - BYTE usage, BYTE usage_idx) { - - This->attributes[regnum].usage = usage; - This->attributes[regnum].usage_idx = usage_idx; -} - static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_idx2) { if (usage_idx1 != usage_idx2) return FALSE; if (usage1 == usage2) return TRUE; @@ -320,19 +306,6 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader return WINED3D_OK; } -/* Preload semantics for d3d8 shaders */ -static void WINAPI IWineD3DVertexShaderImpl_FakeSemantics(IWineD3DVertexShader *iface, IWineD3DVertexDeclaration *vertex_declaration) { - IWineD3DVertexShaderImpl *This =(IWineD3DVertexShaderImpl *)iface; - IWineD3DVertexDeclarationImpl* vdecl = (IWineD3DVertexDeclarationImpl*)vertex_declaration; - - unsigned int i; - for (i = 0; i < vdecl->element_count; ++i) - { - const struct wined3d_vertex_declaration_element *e = &vdecl->elements[i]; - vshader_set_input(This, e->output_slot, e->usage, e->usage_idx); - } -} - /* Set local constants for d3d8 shaders */ static HRESULT WINAPI IWIneD3DVertexShaderImpl_SetLocalConstantsF(IWineD3DVertexShader *iface, UINT start_idx, const float *src_data, UINT count) { @@ -389,7 +362,6 @@ const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl = /*** IWineD3DVertexShader methods ***/ IWineD3DVertexShaderImpl_GetDevice, IWineD3DVertexShaderImpl_GetFunction, - IWineD3DVertexShaderImpl_FakeSemantics, IWIneD3DVertexShaderImpl_SetLocalConstantsF }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7c875e4..48938cb 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2868,9 +2868,6 @@ interface IWineD3DVertexShader : IWineD3DBaseShader [out] void *data, [in, out] UINT *data_size ); - void FakeSemantics( - [in] IWineD3DVertexDeclaration *vertex_declaration - ); HRESULT SetLocalConstantsF( [in] UINT start_idx, [in] const float *src_data, @@ -3011,7 +3008,6 @@ interface IWineD3DDevice : IWineD3DBase [in] DWORD fvf ); HRESULT CreateVertexShader( - [in] IWineD3DVertexDeclaration *declaration, [in] const DWORD *function, [in] const struct wined3d_shader_signature *output_signature, [out] IWineD3DVertexShader **shader,

1 0

Austin English : user32: Downgrade a FIXME to a WARN.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 5f2a3d8467dc48883547d2d2e52a7b3b4d5d50c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2a3d8467dc48883547d2d2e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 27 23:21:50 2009 -0500 user32: Downgrade a FIXME to a WARN. --- dlls/user32/hook.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 0b0d7c4..b6dc8e8 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -891,6 +891,7 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id */ BOOL WINAPI IsWinEventHookInstalled(DWORD dwEvent) { - FIXME("(%d)-stub!\n", dwEvent); + /* FIXME: Needed by Office 2007 installer */ + WARN("(%d)-stub!\n", dwEvent); return TRUE; }

1 0

Stefan Dösinger : wined3d: Store the compile args in the compile context, not the shader.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 5865d9c01b2aed1ed7a2f5987f587de952cb2ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5865d9c01b2aed1ed7a2f5987… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 13:27:54 2009 +0200 wined3d: Store the compile args in the compile context, not the shader. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++++-------- dlls/wined3d/glsl_shader.c | 26 ++++++++++++++++++++------ dlls/wined3d/pixelshader.c | 2 -- dlls/wined3d/vertexshader.c | 2 -- dlls/wined3d/wined3d_private.h | 4 ---- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4ace13b..db19fe5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -93,6 +93,9 @@ struct shader_arb_ctx_priv { /* GL_NV_vertex_program3 or GL_NV_fragment_program2 */ NV3 } target_version; + + const struct vs_compile_args *cur_vs_args; + const struct ps_compile_args *cur_ps_args; }; /******************************************************** @@ -543,7 +546,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if (((IWineD3DVertexShaderImpl *)This)->cur_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; + if (ctx->cur_vs_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; sprintf(register_name, "vertex.attrib[%u]", reg->idx); } break; @@ -606,7 +609,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction case WINED3DSPR_COLOROUT: if (reg->idx == 0) { - if(((IWineD3DPixelShaderImpl *)This)->cur_args->srgb_correction) + if(ctx->cur_ps_args->srgb_correction) { strcpy(register_name, "TMP_COLOR"); } @@ -739,6 +742,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD const char *tex_type; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; switch(sampler_type) { case WINED3DSTT_1D: @@ -754,10 +758,10 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD } if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - const IWineD3DPixelShaderImpl* const ps = (const IWineD3DPixelShaderImpl*)This; - if(ps->cur_args->np2_fixup & (1 << sampler_idx)) { - FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); - } + if(priv->cur_ps_args->np2_fixup & (1 << sampler_idx)) + { + FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); + } } break; @@ -787,9 +791,8 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *)ins->ctx->shader; gen_color_correction(buffer, dst_str, ins->dst[0].write_mask, - "one", "coefmul.x", ps->cur_args->color_fixup[sampler_idx]); + "one", "coefmul.x", priv->cur_ps_args->color_fixup[sampler_idx]); } } @@ -2128,6 +2131,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, /* Create the hw ARB shader */ memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_ps_args = args; shader_addline(buffer, "!!ARBfp1.0\n"); if(GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { shader_addline(buffer, "OPTION NV_fragment_program;\n"); @@ -2240,6 +2244,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, struct shader_arb_ctx_priv priv_ctx; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_vs_args = args; /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f576e67..8eaffe8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -122,6 +122,11 @@ typedef struct { struct vs_compile_args vs_args; } glsl_program_key_t; +struct shader_glsl_ctx_priv { + const struct vs_compile_args *cur_vs_args; + const struct ps_compile_args *cur_ps_args; +}; + /* Extract a line from the info log. * Note that this modifies the source string. */ static char *get_info_log_line(char **ptr) @@ -1123,7 +1128,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* vertex shaders */ if (!pshader) { - if (((IWineD3DVertexShaderImpl *)This)->cur_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + if (priv->cur_vs_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; sprintf(register_name, "attrib%u", reg->idx); break; } @@ -1657,11 +1663,11 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->ctx->shader; - fixup = This->cur_args->color_fixup[sampler]; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + fixup = priv->cur_ps_args->color_fixup[sampler]; sampler_base = "Psampler"; - if(This->cur_args->np2_fixup & (1 << sampler)) { + if(priv->cur_ps_args->np2_fixup & (1 << sampler)) { if(bias) { FIXME("Biased sampling from NP2 textures is unsupported\n"); } else { @@ -4164,10 +4170,14 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, CONST DWORD *function = This->baseShader.function; const char *fragcolor; const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; + struct shader_glsl_ctx_priv priv_ctx; /* Create the hw GLSL shader object and assign it as the shader->prgId */ GLhandleARB shader_obj = GL_EXTCALL(glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB)); + memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_ps_args = args; + shader_addline(buffer, "#version 120\n"); if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { @@ -4193,7 +4203,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, NULL); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ if (reg_maps->shader_version.major < 2) @@ -4270,17 +4280,21 @@ static GLuint shader_glsl_generate_vshader(IWineD3DVertexShader *iface, const struct shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; + struct shader_glsl_ctx_priv priv_ctx; /* Create the hw GLSL shader program and assign it as the shader->prgId */ GLhandleARB shader_obj = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); shader_addline(buffer, "#version 120\n"); + memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_vs_args = args; + /* Base Declarations */ shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, NULL); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, NULL); + shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, &priv_ctx); /* Unpack 3.0 outputs */ if (reg_maps->shader_version.major >= 3) shader_addline(buffer, "order_ps_input(OUT);\n"); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 839b9bb..f1966a1 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -358,11 +358,9 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This); - This->cur_args = args; shader_buffer_init(&buffer); retval = device->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer, args); shader_buffer_free(&buffer); - This->cur_args = NULL; return retval; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 99108a8..9ae52f9 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -341,9 +341,7 @@ static GLuint vertexshader_compile(IWineD3DVertexShaderImpl *This, const struct /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This); shader_buffer_init(&buffer); - This->cur_args = args; ret = deviceImpl->shader_backend->shader_generate_vshader((IWineD3DVertexShader *)This, &buffer, args); - This->cur_args = NULL; shader_buffer_free(&buffer); return ret; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1698504..c830d35 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2687,8 +2687,6 @@ typedef struct IWineD3DVertexShaderImpl { UINT rel_offset; UINT recompile_count; - - const struct vs_compile_args *cur_args; } IWineD3DVertexShaderImpl; extern const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl; @@ -2728,8 +2726,6 @@ typedef struct IWineD3DPixelShaderImpl { unsigned char numbumpenvmatconsts; struct stb_const_desc luminanceconst[MAX_TEXTURES]; char vpos_uniform; - - const struct ps_compile_args *cur_args; } IWineD3DPixelShaderImpl; extern const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl;

1 0

Stefan Dösinger : wined3d: Make find_gl_pshader backend private.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: d0d681c81ef537ae3e8d0a6cc67310758b9f63f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d681c81ef537ae3e8d0a6cc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 13:43:43 2009 +0200 wined3d: Make find_gl_pshader backend private. --- dlls/wined3d/arb_program_shader.c | 59 +++++++++++++++++++++++++++++++-- dlls/wined3d/baseshader.c | 7 ---- dlls/wined3d/glsl_shader.c | 55 +++++++++++++++++++++++++++++- dlls/wined3d/pixelshader.c | 66 +------------------------------------ dlls/wined3d/wined3d_private.h | 4 +-- 5 files changed, 111 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0d681c81ef537ae3e8d0…

1 0

Michael Stefaniuc : notepad: Use the ARRAY_SIZE() macro if we already have it.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 129889b2872c7ab98485b6550e711cf1f1a8e145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129889b2872c7ab98485b6550… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 27 23:49:13 2009 +0200 notepad: Use the ARRAY_SIZE() macro if we already have it. --- programs/notepad/dialog.c | 2 +- programs/notepad/main.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 761705b..d7354e7 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -257,7 +257,7 @@ void DoOpenFile(LPCWSTR szFileName) SetFocus(Globals.hEdit); /* If the file starts with .LOG, add a time/date at the end and set cursor after */ - if (GetWindowTextW(Globals.hEdit, log, sizeof(log)/sizeof(log[0])) && !lstrcmpW(log, dotlog)) + if (GetWindowTextW(Globals.hEdit, log, ARRAY_SIZE(log)) && !lstrcmpW(log, dotlog)) { static const WCHAR lfW[] = { '\r','\n',0 }; SendMessageW(Globals.hEdit, EM_SETSEL, GetWindowTextLengthW(Globals.hEdit), -1); diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 57018ce..c195668 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -203,10 +203,10 @@ static VOID NOTEPAD_LoadSettingFromRegistry(void) Globals.lfFont.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE; lstrcpyW(Globals.lfFont.lfFaceName, systemW); - LoadStringW(Globals.hInstance, STRING_PAGESETUP_HEADERVALUE, Globals.szHeader, - sizeof(Globals.szHeader) / sizeof(Globals.szHeader[0])); - LoadStringW(Globals.hInstance, STRING_PAGESETUP_FOOTERVALUE, Globals.szFooter, - sizeof(Globals.szFooter) / sizeof(Globals.szFooter[0])); + LoadStringW(Globals.hInstance, STRING_PAGESETUP_HEADERVALUE, + Globals.szHeader, ARRAY_SIZE(Globals.szHeader)); + LoadStringW(Globals.hInstance, STRING_PAGESETUP_FOOTERVALUE, + Globals.szFooter, ARRAY_SIZE(Globals.szFooter)); if(RegOpenKeyW(HKEY_CURRENT_USER, notepad_reg_key, &hkey) == ERROR_SUCCESS) {

1 0

Dmitry Timoshkov : winex11.drv: Avoid a crash if not in a desktop mode.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 2fdbeefc9693fe4af2ec9b9581311442f141633e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fdbeefc9693fe4af2ec9b958… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 28 15:00:10 2009 +0900 winex11.drv: Avoid a crash if not in a desktop mode. --- dlls/winex11.drv/desktop.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 5b96e33..a2bc004 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -137,6 +137,8 @@ Window CDECL X11DRV_create_desktop( UINT width, UINT height ) Window win; Display *display = thread_init_display(); + TRACE( "%u x %u\n", width, height ); + wine_tsx11_lock(); /* Create window */ @@ -206,7 +208,7 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) Display *display = thread_display(); XEvent xev; - wine_tsx11_lock(); + if (!display || root_window != DefaultRootWindow( display )) return; xev.xclient.type = ClientMessage; xev.xclient.window = root_window; @@ -225,9 +227,9 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) TRACE("action=%li\n", xev.xclient.data.l[0]); + wine_tsx11_lock(); XSendEvent( display, DefaultRootWindow(display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev ); - wine_tsx11_unlock(); }

1 0

Henri Verbeet : wined3d: Use the output signature to setup SM4 vertex shader output semantics.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 3925cd5f15c25a20e0f729fbc359e518c53e5c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3925cd5f15c25a20e0f729fbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 28 08:44:21 2009 +0200 wined3d: Use the output signature to setup SM4 vertex shader output semantics. --- dlls/wined3d/vertexshader.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 681ec35..b8c56cc 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -246,6 +246,7 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader IWineD3DVertexShaderImpl *This =(IWineD3DVertexShaderImpl *)iface; IWineD3DDeviceImpl *deviceImpl = (IWineD3DDeviceImpl *) This->baseShader.device; const struct wined3d_shader_frontend *fe; + unsigned int i; HRESULT hr; shader_reg_maps *reg_maps = &This->baseShader.reg_maps; @@ -281,6 +282,16 @@ static HRESULT WINAPI IWineD3DVertexShaderImpl_SetFunction(IWineD3DVertexShader pFunction, GL_LIMITS(vshader_constantsF)); if (hr != WINED3D_OK) return hr; + if (output_signature) + { + for (i = 0; i < output_signature->element_count; ++i) + { + struct wined3d_shader_signature_element *e = &output_signature->elements[i]; + reg_maps->output_registers |= 1 << e->register_idx; + This->output_signature[e->register_idx] = *e; + } + } + vshader_set_limits(This); if(deviceImpl->vs_selected_mode == SHADER_ARB &&

1 0

Henri Verbeet : wined3d: Match the d3d10 name for WINED3DDECLUSAGE_POSITION .
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: fcf7844653368f70d175e1fd90f99742accc65eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf7844653368f70d175e1fd9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 28 08:44:21 2009 +0200 wined3d: Match the d3d10 name for WINED3DDECLUSAGE_POSITION. I.e., make sure that if a SM4 shader uses SV_POSITION it ends up as position data. --- dlls/wined3d/baseshader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index c5f364c..dbbca56 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -345,7 +345,7 @@ static const char *shader_semantic_name_from_usage(WINED3DDECLUSAGE usage) { static const char *semantic_names[] = { - /* WINED3DDECLUSAGE_POSITION */ "POSITION", + /* WINED3DDECLUSAGE_POSITION */ "SV_POSITION", /* WINED3DDECLUSAGE_BLENDWEIGHT */ "BLENDWEIGHT", /* WINED3DDECLUSAGE_BLENDINDICES */ "BLENDINDICES", /* WINED3DDECLUSAGE_NORMAL */ "NORMAL",

1 0

Vincent Povirk : gdiplus: Stub GdipCreateHICONFromBitmap.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 8219db2d6d9eb9212bbcd7864fd53cd964b6694b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8219db2d6d9eb9212bbcd7864… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 27 13:16:20 2009 -0500 gdiplus: Stub GdipCreateHICONFromBitmap. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 34c897a..dff3cf3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -94,7 +94,7 @@ @ stdcall GdipCreateFromHWND(long ptr) @ stdcall GdipCreateFromHWNDICM(long ptr) @ stdcall GdipCreateHBITMAPFromBitmap(ptr ptr long) -@ stub GdipCreateHICONFromBitmap +@ stdcall GdipCreateHICONFromBitmap(ptr ptr) @ stdcall GdipCreateHalftonePalette() @ stdcall GdipCreateHatchBrush(long long long ptr) @ stdcall GdipCreateImageAttributes(ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9902f0f..29eb000 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -655,6 +655,13 @@ GpStatus WINGDIPAPI GdipCreateCachedBitmap(GpBitmap *bitmap, GpGraphics *graphic return Ok; } +GpStatus WINGDIPAPI GdipCreateHICONFromBitmap(GpBitmap *bitmap, HICON *hicon) +{ + FIXME("(%p, %p)\n", bitmap, hicon); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipDeleteCachedBitmap(GpCachedBitmap *cachedbmp) { TRACE("%p\n", cachedbmp);

1 0

Aric Stewart : advapi: Correct buffer length in LookupAccountNameW.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: a61885d64d14803689e15b5824df2b9ac01b2101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61885d64d14803689e15b582… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 27 14:31:10 2009 -0500 advapi: Correct buffer length in LookupAccountNameW. --- dlls/advapi32/security.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index efe34f4..0aa92ce 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2761,6 +2761,7 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI SetLastError(ERROR_NONE_MAPPED); ret = FALSE; } + nameLen = UNLEN + 1; } if (GetUserNameW(userName, &nameLen) && !strcmpW(lpAccountNamePtr, userName))

1 0