wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Juan Lang : rsaenh: Fail if CRYPT_IPSEC_HMAC_KEY is passed to CryptImportKey.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: a48aae26e60b76695d0661ac8fa9001712f5a743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48aae26e60b76695d0661ac8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 21 13:42:37 2009 -0700 rsaenh: Fail if CRYPT_IPSEC_HMAC_KEY is passed to CryptImportKey. --- dlls/advapi32/tests/crypt.c | 5 ++++- dlls/rsaenh/rsaenh.c | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 022d3e6..35ce974 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -949,7 +949,7 @@ static void test_rc2_keylen(void) } key_blob; HCRYPTPROV provider; - HCRYPTKEY hkey; + HCRYPTKEY hkey = 0; BOOL ret; SetLastError(0xdeadbeef); @@ -970,6 +970,7 @@ static void test_rc2_keylen(void) sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ + todo_wine ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); @@ -1007,6 +1008,7 @@ static void test_rc2_keylen(void) sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ + todo_wine ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); @@ -1027,6 +1029,7 @@ static void test_rc2_keylen(void) ret = pCryptImportKey(provider, (BYTE*)&key_blob, sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + todo_wine ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), "CryptImportKey error %08x\n", GetLastError()); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 1b23391..a6c852a 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3011,6 +3011,12 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } return import_key(hProv, pbData, dwDataLen, hPubKey, dwFlags, TRUE, phKey); }

1 0

Juan Lang : rsaenh: Add more tests of the RC2 key length.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: a1502846af3d93564d460aab4ec9afe048359b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1502846af3d93564d460aab4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 21 13:33:18 2009 -0700 rsaenh: Add more tests of the RC2 key length. --- dlls/advapi32/tests/crypt.c | 84 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 78 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index e4b5934..022d3e6 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -939,13 +939,13 @@ static const unsigned char key[key_length] = { 0xbf, 0xf6, 0x83, 0x4b, 0x3e, 0xa3, 0x23, 0xdd, 0x96, 0x78, 0x70, 0x8e, 0xa1, 0x9d, 0x3b, 0x40 }; -static void hashtest(void) +static void test_rc2_keylen(void) { struct KeyBlob { BLOBHEADER header; DWORD key_size; - BYTE key_data[key_length]; + BYTE key_data[2048]; } key_blob; HCRYPTPROV provider; @@ -961,20 +961,92 @@ static void hashtest(void) key_blob.header.bVersion = CUR_BLOB_VERSION; key_blob.header.reserved = 0; key_blob.header.aiKeyAlg = CALG_RC2; - key_blob.key_size = key_length; + key_blob.key_size = sizeof(key); memcpy(key_blob.key_data, key, key_length); + /* Importing a 16-byte key works with the default provider. */ SetLastError(0xdeadbeef); ret = pCryptImportKey(provider, (BYTE*)&key_blob, - sizeof(BLOBHEADER)+sizeof(DWORD)+key_length, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, 0, CRYPT_IPSEC_HMAC_KEY, &hkey); /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ ok(ret || broken(!ret && GetLastError() == NTE_BAD_FLAGS), - "CryptImportKey error %u\n", GetLastError()); + "CryptImportKey error %08x\n", GetLastError()); pCryptDestroyKey(hkey); pCryptReleaseContext(provider, 0); + + SetLastError(0xdeadbeef); + ret = pCryptAcquireContextA(&provider, NULL, MS_DEF_PROV, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContext error %08x\n", GetLastError()); + + /* Importing a 16-byte key doesn't work with the base provider.. */ + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, 0, &hkey); + todo_wine + ok(!ret && GetLastError() == NTE_BAD_DATA, + "expected NTE_BAD_DATA, got %08x\n", GetLastError()); + /* but importing an 8-bit (7-byte) key does.. */ + key_blob.key_size = 7; + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, 0, &hkey); + ok(ret, "CryptAcquireContext error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + /* as does importing a 16-byte key with the base provider when + * CRYPT_IPSEC_HMAC_KEY is specified. + */ + key_blob.key_size = sizeof(key); + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + /* CRYPT_IPSEC_HMAC_KEY is not supported on W2K and lower */ + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_FLAGS), + "CryptImportKey error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + + pCryptReleaseContext(provider, 0); + + key_blob.key_size = sizeof(key); + SetLastError(0xdeadbeef); + ret = pCryptAcquireContextA(&provider, NULL, NULL, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContext error %08x\n", GetLastError()); + + /* Importing a 16-byte key also works with the default provider when + * CRYPT_IPSEC_HMAC_KEY is specified. + */ + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_FLAGS), + "CryptImportKey error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + + /* There is no apparent limit to the size of the input key when + * CRYPT_IPSEC_HMAC_KEY is specified. + */ + key_blob.key_size = sizeof(key_blob.key_data); + SetLastError(0xdeadbeef); + ret = pCryptImportKey(provider, (BYTE*)&key_blob, + sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size, + 0, CRYPT_IPSEC_HMAC_KEY, &hkey); + todo_wine + ok(ret || + broken(!ret && GetLastError() == NTE_BAD_FLAGS), + "CryptImportKey error %08x\n", GetLastError()); + pCryptDestroyKey(hkey); + + pCryptReleaseContext(provider, 0); } START_TEST(crypt) @@ -982,7 +1054,7 @@ START_TEST(crypt) init_function_pointers(); if (pCryptAcquireContextA && pCryptReleaseContext) { - hashtest(); + test_rc2_keylen(); init_environment(); test_acquire_context(); test_incorrect_api_usage();

1 0

Henri Verbeet : d3d9: Free "elements" in a vertexdeclaration_init() error path (Valgrind).
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 66961840a5447af4e584acaa5b26a02bcf58f928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66961840a5447af4e584acaa5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 22 10:09:57 2009 +0200 d3d9: Free "elements" in a vertexdeclaration_init() error path (Valgrind). --- dlls/d3d9/vertexdeclaration.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 9cb0528..cd0829f 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -405,6 +405,7 @@ HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, HeapFree(GetProcessHeap(), 0, wined3d_elements); if (FAILED(hr)) { + HeapFree(GetProcessHeap(), 0, declaration->elements); WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); return hr; }

1 0

Henri Verbeet : wined3d: Free the context array in IWineGDISwapChainImpl_Destroy() (Valgrind).
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: a927573395d60790f7c42772d97f1c1933b80b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a927573395d60790f7c42772d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 22 10:09:56 2009 +0200 wined3d: Free the context array in IWineGDISwapChainImpl_Destroy() (Valgrind). --- dlls/wined3d/swapchain_gdi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index f4909bc..f795d89 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -70,6 +70,7 @@ static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface) IWineD3DDevice_SetDisplayMode((IWineD3DDevice *) This->wineD3DDevice, 0, &mode); } + HeapFree(GetProcessHeap(), 0, This->context); HeapFree(GetProcessHeap(), 0, This); }

1 0

Henri Verbeet : wined3d: Free the blitter private data in arbfp_blit_free() (Valgrind).
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 8d2512317ff64fcb1aa07f47d24ab3df3f458fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d2512317ff64fcb1aa07f47d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 22 10:09:55 2009 +0200 wined3d: Free the blitter private data in arbfp_blit_free() (Valgrind). --- dlls/wined3d/arb_program_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 565f2ef..855c368 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6154,6 +6154,9 @@ static void arbfp_blit_free(IWineD3DDevice *iface) { GL_EXTCALL(glDeleteProgramsARB(1, &priv->yv12_2d_shader)); checkGLcall("Delete yuv programs"); LEAVE_GL(); + + HeapFree(GetProcessHeap(), 0, device->blit_priv); + device->blit_priv = NULL; } static BOOL gen_planar_yuv_read(struct wined3d_shader_buffer *buffer, enum yuv_fixup yuv_fixup,

1 0

Henri Verbeet : wined3d: Get rid of GL_LIMITS.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 6be41fd59ac9e1ae6a0297ce780c5049ef1b5ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be41fd59ac9e1ae6a0297ce7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 22 10:09:54 2009 +0200 wined3d: Get rid of GL_LIMITS. --- dlls/wined3d/arb_program_shader.c | 42 +++++++------ dlls/wined3d/ati_fragment_shader.c | 12 +++- dlls/wined3d/context.c | 52 +++++++++------- dlls/wined3d/device.c | 45 +++++++++----- dlls/wined3d/directx.c | 23 ++++---- dlls/wined3d/drawprim.c | 10 ++- dlls/wined3d/glsl_shader.c | 56 ++++++++++------- dlls/wined3d/nvidia_texture_shader.c | 16 +++-- dlls/wined3d/state.c | 110 +++++++++++++++++++++------------ dlls/wined3d/stateblock.c | 26 +++++--- dlls/wined3d/surface.c | 5 +- dlls/wined3d/utils.c | 33 ++++------ dlls/wined3d/vertexshader.c | 17 +++-- dlls/wined3d/wined3d_private.h | 1 - 14 files changed, 266 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6be41fd59ac9e1ae6a029…

1 0

Henri Verbeet : wined3d: Fix some GLINFO_LOCATION abuse.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 55047f811ab3c0a9d0c22243e66bcfbbcc18db98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55047f811ab3c0a9d0c22243e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 22 10:09:53 2009 +0200 wined3d: Fix some GLINFO_LOCATION abuse. --- dlls/wined3d/arb_program_shader.c | 12 ++++++------ dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/glsl_shader.c | 14 +++++++------- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1141d4c..38d3fd2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -53,7 +53,7 @@ static BOOL need_mova_const(IWineD3DBaseShader *shader, const struct wined3d_gl_ static inline BOOL use_nv_clip(const struct wined3d_gl_info *gl_info) { return GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION) && - !(GLINFO_LOCATION.quirks & WINED3D_QUIRK_NV_CLIP_BROKEN); + !(gl_info->quirks & WINED3D_QUIRK_NV_CLIP_BROKEN); } static BOOL need_helper_const(const struct wined3d_gl_info *gl_info) @@ -3394,8 +3394,8 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct } /* Base Declarations */ - next_local = shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, - lconst_map, NULL, &priv_ctx); + next_local = shader_generate_arb_declarations((IWineD3DBaseShader *)This, + reg_maps, buffer, gl_info, lconst_map, NULL, &priv_ctx); for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) { @@ -3867,8 +3867,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct shader_addline(buffer, "TEMP TA;\n"); /* Base Declarations */ - next_local = shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, - lconst_map, &priv_ctx.vs_clipplanes, &priv_ctx); + next_local = shader_generate_arb_declarations((IWineD3DBaseShader *)This, + reg_maps, buffer, gl_info, lconst_map, &priv_ctx.vs_clipplanes, &priv_ctx); for(i = 0; i < MAX_CONST_I; i++) { @@ -3909,7 +3909,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct if(!GL_SUPPORT(NV_VERTEX_PROGRAM)) { shader_addline(buffer, "MOV result.color.secondary, -helper_const.wwwy;\n"); - if ((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W && !device->frag_pipe->ffp_proj_control) + if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W && !device->frag_pipe->ffp_proj_control) { int i; for(i = 0; i < min(8, MAX_REG_TEXCRD); i++) { diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index aea942c..bba85f6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -821,7 +821,7 @@ static void set_tex_op_atifs(DWORD state, IWineD3DStateBlockImpl *stateblock, st } memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); - new_desc->shader = gen_ati_shader(settings.op, &GLINFO_LOCATION); + new_desc->shader = gen_ati_shader(settings.op, context->gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); desc = new_desc; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 396edca..2d0004e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1108,7 +1108,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, object->orig_width = Mode.Width; object->orig_height = Mode.Height; object->orig_fmt = Mode.Format; - format_desc = getFormatDescEntry(Mode.Format, &GLINFO_LOCATION); + format_desc = getFormatDescEntry(Mode.Format, &This->adapter->gl_info); if (pPresentationParameters->Windowed && ((pPresentationParameters->BackBufferWidth == 0) || @@ -2135,7 +2135,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, U DEVMODEW devmode; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; LONG ret; - const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(pMode->Format, &GLINFO_LOCATION); + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(pMode->Format, &This->adapter->gl_info); RECT clip_rc; TRACE("(%p)->(%d,%p) Mode=%dx%dx@%d, %s\n", This, iSwapChain, pMode, pMode->Width, pMode->Height, pMode->RefreshRate, debug_d3dformat(pMode->Format)); @@ -6285,7 +6285,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* i if (SUCCEEDED(IWineD3DSurface_LockRect(pCursorBitmap, &rect, NULL, WINED3DLOCK_READONLY))) { const struct GlPixelFormatDesc *glDesc = - getFormatDescEntry(WINED3DFMT_B8G8R8A8_UNORM, &GLINFO_LOCATION); + getFormatDescEntry(WINED3DFMT_B8G8R8A8_UNORM, &This->adapter->gl_info); char *mem, *bits = rect.pBits; GLint intfmt = glDesc->glInternal; GLint format = glDesc->glFormat; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 37e325d..6a074b1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -862,7 +862,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont */ max_constantsF -= count_bits(This->baseShader.reg_maps.boolean_constants); /* Set by driver quirks in directx.c */ - max_constantsF -= GLINFO_LOCATION.reserved_glsl_constants; + max_constantsF -= gl_info->reserved_glsl_constants; } else { max_constantsF = GL_LIMITS(vs_glsl_constantsF); } @@ -3575,7 +3575,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer * Take care about the texcoord .w fixup though if we're using the fixed function fragment pipeline */ device = (IWineD3DDeviceImpl *) vs->baseShader.device; - if (((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W) + if ((gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) && ps_major == 0 && vs_major > 0 && !device->frag_pipe->ffp_proj_control) { shader_addline(buffer, "void order_ps_input() {\n"); @@ -3622,7 +3622,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer { if (semantic_idx < 8) { - if (!((GLINFO_LOCATION).quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) + if (!(gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) write_mask |= WINED3DSP_WRITEMASK_3; shader_addline(buffer, "gl_TexCoord[%u]%s = OUT[%u]%s;\n", @@ -3809,7 +3809,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context TRACE("Compiling shader object %u\n", shader_obj); GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer->buffer, NULL)); GL_EXTCALL(glCompileShaderARB(shader_obj)); - print_glsl_info_log(&GLINFO_LOCATION, shader_obj); + print_glsl_info_log(gl_info, shader_obj); /* Store the shader object */ return shader_obj; @@ -3878,7 +3878,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context TRACE("Compiling shader object %u\n", shader_obj); GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer->buffer, NULL)); GL_EXTCALL(glCompileShaderARB(shader_obj)); - print_glsl_info_log(&GLINFO_LOCATION, shader_obj); + print_glsl_info_log(gl_info, shader_obj); return shader_obj; } @@ -4130,7 +4130,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, /* Link the program */ TRACE("Linking GLSL shader program %u\n", programId); GL_EXTCALL(glLinkProgramARB(programId)); - print_glsl_info_log(&GLINFO_LOCATION, programId); + print_glsl_info_log(gl_info, programId); entry->vuniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(vs_glsl_constantsF)); for (i = 0; i < GL_LIMITS(vs_glsl_constantsF); ++i) { @@ -4278,7 +4278,7 @@ static GLhandleARB create_glsl_blt_shader(const struct wined3d_gl_info *gl_info, GL_EXTCALL(glAttachObjectARB(program_id, pshader_id)); GL_EXTCALL(glLinkProgramARB(program_id)); - print_glsl_info_log(&GLINFO_LOCATION, program_id); + print_glsl_info_log(gl_info, program_id); /* Once linked we can mark the shaders for deletion. They will be deleted once the program * is destroyed diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 194cb9e..822c269 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4322,7 +4322,7 @@ static void loadVertexData(const struct wined3d_context *context, IWineD3DStateB curVBO = e->buffer_object; } - if(format != 4 || (GLINFO_LOCATION.quirks & WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA)) + if (format != 4 || (context->gl_info->quirks & WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA)) { /* Usually specular colors only allow 3 components, since they have no alpha. In D3D, the specular alpha * contains the fog coordinate, which is passed to GL with GL_EXT_fog_coord. However, the fixed function diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9d69c96..c0e0e10 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -126,7 +126,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(format, &GLINFO_LOCATION); + const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(format, gl_info); void (*cleanup)(IWineD3DSurfaceImpl *This); unsigned int resource_size; HRESULT hr;

1 0

Jacek Caban : jscript: Fixed replace string parsing.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 571125455eb97fc6473e9e16b9598f24204e64a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571125455eb97fc6473e9e16b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 22:45:30 2009 +0200 jscript: Fixed replace string parsing. Reported by Dan Kegel. --- dlls/jscript/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 2e48d5b..97c807f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -965,7 +965,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI } idx = ptr2[1] - '0'; - if(isdigitW(ptr[3]) && idx*10 + (ptr[2]-'0') <= parens_cnt) { + if(isdigitW(ptr2[2]) && idx*10 + (ptr2[2]-'0') <= parens_cnt) { idx = idx*10 + (ptr[2]-'0'); ptr = ptr2+3; }else if(idx && idx <= parens_cnt) {

1 0

Jacek Caban : jscript: Fixed a test that depends on time zone.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 0c8794614de23a691ab37fe1ac6e936f24f658a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8794614de23a691ab37fe1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 22:44:39 2009 +0200 jscript: Fixed a test that depends on time zone. --- dlls/jscript/tests/api.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index cc13f03..da32da4 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1595,7 +1595,7 @@ ok(err.toString === Error.prototype.toString, "err.toString !== Error.prototype. ok(err.message === "", "err.message != ''"); err.message = date; ok(err.message === date, "err.message != date"); -ok(err.toString() === (invokeVersion < 2 ? "[object Error]" : "EvalError: Fri Aug 17 22:50:50 UTC+0200 85"), +ok(err.toString().substring(0,21) === (invokeVersion < 2 ? "[object Error]" : "EvalError: Fri Aug 17"), "err.toString() = " + err.toString()); ok(err.toString !== Object.prototype.toString, "err.toString === Object.prototype.toString"); err = new RangeError();

1 0

Jacek Caban : mshtml: Initialize iframe windows when added to document.
by Alexandre Julliard 22 Oct '09

22 Oct '09

Module: wine Branch: master Commit: 3263ace6866db867d57e30aec99326eddfb32639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3263ace6866db867d57e30aec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 21 21:30:20 2009 +0200 mshtml: Initialize iframe windows when added to document. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmliframe.c | 53 +++++++-------------------------------- dlls/mshtml/htmlwindow.c | 55 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 6 ++++- dlls/mshtml/mutation.c | 50 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3263ace6866db867d57e3…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009