wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Henri Verbeet : dxgi: Try to create a software adapter when no regular adapters are found as well .
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 20043c0a46527e4e1b678be996f3c5629b142737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20043c0a46527e4e1b678be99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 25 12:33:42 2010 +0200 dxgi: Try to create a software adapter when no regular adapters are found as well. --- dlls/dxgi/tests/device.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 4d2ac14..ef86b34 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -36,18 +36,17 @@ static IDXGIDevice *create_device(HMODULE d3d10core) if (FAILED(hr)) goto cleanup; hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - ok(SUCCEEDED(hr) || - hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ - "EnumAdapters failed, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; + if (SUCCEEDED(hr)) + { + hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, NULL, (void **)&device); + } - hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, NULL, (void **)&device); if (FAILED(hr)) { HMODULE d3d10ref; trace("Failed to create a HW device, trying REF\n"); - IDXGIAdapter_Release(adapter); + if (adapter) IDXGIAdapter_Release(adapter); adapter = NULL; d3d10ref = LoadLibraryA("d3d10ref.dll");

1 0

Henri Verbeet : d3d10core: Try to create a software adapter when no regular adapters are found as well .
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: bbc7b5ac20bf60d61c43ef3264fe84f3f7a855b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc7b5ac20bf60d61c43ef326… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 25 12:33:41 2010 +0200 d3d10core: Try to create a software adapter when no regular adapters are found as well. --- dlls/d3d10core/tests/device.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4195bad..ce3d03c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -35,18 +35,19 @@ static ID3D10Device *create_device(void) if (FAILED(hr)) goto cleanup; hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - ok(SUCCEEDED(hr) || - hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ - "EnumAdapters failed, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ + "EnumAdapters failed, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); + } - hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); if (FAILED(hr)) { HMODULE d3d10ref; trace("Failed to create a HW device, trying REF\n"); - IDXGIAdapter_Release(adapter); + if (adapter) IDXGIAdapter_Release(adapter); adapter = NULL; d3d10ref = LoadLibraryA("d3d10ref.dll");

1 0

Henri Verbeet : wined3d: Explicitly pass parameters to shader_load_np2fixup_constants().
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 5ef7a8c2427b1c6456249193e8934250eb1c5a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef7a8c2427b1c6456249193e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 25 12:33:40 2010 +0200 wined3d: Explicitly pass parameters to shader_load_np2fixup_constants(). --- dlls/wined3d/arb_program_shader.c | 26 ++++++++++---------------- dlls/wined3d/glsl_shader.c | 36 +++++++++++++++--------------------- dlls/wined3d/shader.c | 3 ++- dlls/wined3d/state.c | 11 +++++------ dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 35 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2623b57..dac1f4a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -480,20 +480,13 @@ static unsigned int shader_arb_load_constantsF(IWineD3DBaseShaderImpl *This, con /** * Loads the texture dimensions for NP2 fixup into the currently set ARB_[vertex/fragment]_programs. */ -static void shader_arb_load_np2fixup_constants( - IWineD3DDevice* device, - char usePixelShader, - char useVertexShader) { +static void shader_arb_load_np2fixup_constants(void *shader_priv, + const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) +{ + const struct shader_arb_priv * priv = shader_priv; - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl *) device; - const struct shader_arb_priv* const priv = (const struct shader_arb_priv *) deviceImpl->shader_priv; - IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; - const struct wined3d_gl_info *gl_info = &deviceImpl->adapter->gl_info; - - if (!usePixelShader) { - /* NP2 texcoord fixup is (currently) only done for pixelshaders. */ - return; - } + /* NP2 texcoord fixup is (currently) only done for pixelshaders. */ + if (!use_ps(state)) return; if (priv->compiled_fprog && priv->compiled_fprog->np2fixup_info.super.active) { const struct arb_ps_np2fixup_info* const fixup = &priv->compiled_fprog->np2fixup_info; @@ -501,9 +494,10 @@ static void shader_arb_load_np2fixup_constants( WORD active = fixup->super.active; GLfloat np2fixup_constants[4 * MAX_FRAGMENT_SAMPLERS]; - for (i = 0; active; active >>= 1, ++i) { + for (i = 0; active; active >>= 1, ++i) + { + const IWineD3DBaseTextureImpl *tex = state->textures[i]; const unsigned char idx = fixup->super.idx[i]; - const IWineD3DBaseTextureImpl *tex = stateBlock->state.textures[i]; GLfloat *tex_dim = &np2fixup_constants[(idx >> 1) * 4]; if (!(active & 1)) continue; @@ -4574,7 +4568,7 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, /* Force constant reloading for the NP2 fixup (see comment in shader_glsl_select for more info) */ if (compiled->np2fixup_info.super.active) - shader_arb_load_np2fixup_constants((IWineD3DDevice *)This, usePS, useVS); + shader_arb_load_np2fixup_constants(priv, gl_info, state); } else if (gl_info->supported[ARB_FRAGMENT_PROGRAM] && !priv->use_arbfp_fixed_func) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 85b1a28..f24f309 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -681,34 +681,28 @@ static void reset_program_constant_version(struct wine_rb_entry *entry, void *co * Loads the texture dimensions for NP2 fixup into the currently set GLSL program. */ /* GL locking is done by the caller (state handler) */ -static void shader_glsl_load_np2fixup_constants( - IWineD3DDevice* device, - char usePixelShader, - char useVertexShader) { - - const IWineD3DDeviceImpl* deviceImpl = (const IWineD3DDeviceImpl*) device; - const struct glsl_shader_prog_link* prog = ((struct shader_glsl_priv *)(deviceImpl->shader_priv))->glsl_program; +static void shader_glsl_load_np2fixup_constants(void *shader_priv, + const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) +{ + struct shader_glsl_priv *glsl_priv = shader_priv; + const struct glsl_shader_prog_link *prog = glsl_priv->glsl_program; - if (!prog) { - /* No GLSL program set - nothing to do. */ - return; - } + /* No GLSL program set - nothing to do. */ + if (!prog) return; - if (!usePixelShader) { - /* NP2 texcoord fixup is (currently) only done for pixelshaders. */ - return; - } + /* NP2 texcoord fixup is (currently) only done for pixelshaders. */ + if (!use_ps(state)) return; - if (prog->ps_args.np2_fixup && -1 != prog->np2Fixup_location) { - const struct wined3d_gl_info *gl_info = &deviceImpl->adapter->gl_info; - const IWineD3DStateBlockImpl* stateBlock = (const IWineD3DStateBlockImpl*) deviceImpl->stateBlock; + if (prog->ps_args.np2_fixup && prog->np2Fixup_location != -1) + { UINT i; UINT fixup = prog->ps_args.np2_fixup; GLfloat np2fixup_constants[4 * MAX_FRAGMENT_SAMPLERS]; - for (i = 0; fixup; fixup >>= 1, ++i) { + for (i = 0; fixup; fixup >>= 1, ++i) + { + const IWineD3DBaseTextureImpl *tex = state->textures[i]; const unsigned char idx = prog->np2Fixup_info->idx[i]; - const IWineD3DBaseTextureImpl *tex = stateBlock->state.textures[i]; GLfloat *tex_dim = &np2fixup_constants[(idx >> 1) * 4]; if (!tex) @@ -4619,7 +4613,7 @@ static void shader_glsl_select(const struct wined3d_context *context, BOOL usePS * called between selecting the shader and using it, which results in wrong fixup for some frames. */ if (priv->glsl_program && priv->glsl_program->np2Fixup_info) { - shader_glsl_load_np2fixup_constants((IWineD3DDevice *)device, usePS, useVS); + shader_glsl_load_np2fixup_constants(priv, gl_info, &device->stateBlock->state); } } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 77ffacb..e0af2bc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1508,7 +1508,8 @@ static void shader_none_deselect_depth_blt(IWineD3DDevice *iface) {} static void shader_none_update_float_vertex_constants(IWineD3DDevice *iface, UINT start, UINT count) {} static void shader_none_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) {} static void shader_none_load_constants(const struct wined3d_context *context, char usePS, char useVS) {} -static void shader_none_load_np2fixup_constants(IWineD3DDevice *iface, char usePS, char useVS) {} +static void shader_none_load_np2fixup_constants(void *shader_priv, + const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) {} static void shader_none_destroy(IWineD3DBaseShader *iface) {} static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} static void shader_none_free(IWineD3DDevice *iface) {} diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6a415ee..52fc819 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3614,7 +3614,8 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, s static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { DWORD sampler = state_id - STATE_SAMPLER(0); - DWORD mapped_stage = stateblock->device->texUnitMap[sampler]; + IWineD3DDeviceImpl *device = stateblock->device; + DWORD mapped_stage = device->texUnitMap[sampler]; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_state *state = &stateblock->state; union { @@ -3673,9 +3674,7 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!state->textures[sampler]->baseTexture.pow2Matrix_identity) { - IWineD3DDeviceImpl *d3ddevice = stateblock->device; - d3ddevice->shader_backend->shader_load_np2fixup_constants( - (IWineD3DDevice*)d3ddevice, use_ps(state), use_vs(state)); + device->shader_backend->shader_load_np2fixup_constants(device->shader_priv, gl_info, state); } } else if (mapped_stage < gl_info->limits.textures) @@ -3691,8 +3690,8 @@ static void sampler(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct w state_alpha(WINED3DRS_COLORKEYENABLE, stateblock, context); } } /* Otherwise tex_colorop disables the stage */ - glBindTexture(GL_TEXTURE_2D, stateblock->device->dummyTextureName[sampler]); - checkGLcall("glBindTexture(GL_TEXTURE_2D, stateblock->device->dummyTextureName[sampler])"); + glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[sampler]); + checkGLcall("glBindTexture(GL_TEXTURE_2D, device->dummyTextureName[sampler])"); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 329bee1..2d791ce 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -723,6 +723,7 @@ struct vs_compile_args { }; struct wined3d_context; +struct wined3d_state; typedef struct { void (*shader_handle_instruction)(const struct wined3d_shader_instruction *); @@ -732,7 +733,8 @@ typedef struct { void (*shader_update_float_vertex_constants)(IWineD3DDevice *iface, UINT start, UINT count); void (*shader_update_float_pixel_constants)(IWineD3DDevice *iface, UINT start, UINT count); void (*shader_load_constants)(const struct wined3d_context *context, char usePS, char useVS); - void (*shader_load_np2fixup_constants)(IWineD3DDevice *iface, char usePS, char useVS); + void (*shader_load_np2fixup_constants)(void *shader_priv, const struct wined3d_gl_info *gl_info, + const struct wined3d_state *state); void (*shader_destroy)(IWineD3DBaseShader *iface); HRESULT (*shader_alloc_private)(IWineD3DDevice *iface); void (*shader_free_private)(IWineD3DDevice *iface);

1 0

Henri Verbeet : wined3d: Pass a sub-resource index instead of a face + miplevel to cube texture methods .
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 6dd9109358f259903f935a0335387e2783d92afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dd9109358f259903f935a033… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 25 12:33:39 2010 +0200 wined3d: Pass a sub-resource index instead of a face + miplevel to cube texture methods. --- dlls/d3d8/cubetexture.c | 23 ++++++++++++++++------- dlls/d3d9/cubetexture.c | 23 ++++++++++++++++------- dlls/wined3d/basetexture.c | 14 +++++--------- dlls/wined3d/cubetexture.c | 36 +++++++++++++++++------------------- dlls/wined3d/device.c | 29 +++++++++++------------------ dlls/wined3d/texture.c | 23 +++++------------------ dlls/wined3d/volumetexture.c | 23 +++++------------------ dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 11 ++++------- 9 files changed, 80 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dd9109358f259903f935…

1 0

Henri Verbeet : wined3d: Pass a sub-resource index instead of a miplevel to 2D texture methods.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: f0a0714ecd08c5d346ad4f1f635455858bb8a206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a0714ecd08c5d346ad4f1f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 25 12:33:38 2010 +0200 wined3d: Pass a sub-resource index instead of a miplevel to 2D texture methods. --- dlls/wined3d/texture.c | 45 ++++++++++++++++++++++++++++----------------- include/wine/wined3d.idl | 8 ++++---- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a1d83e9..f7eaea7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -333,17 +333,28 @@ static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DTexture *iface) { return This->cond_np2; } -/* ******************************************* - IWineD3DTexture IWineD3DTexture parts follow - ******************************************* */ -static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, UINT level, WINED3DSURFACE_DESC *desc) +static IWineD3DResourceImpl *texture_get_sub_resource(IWineD3DBaseTextureImpl *texture, UINT sub_resource_idx) +{ + UINT sub_count = texture->baseTexture.level_count * texture->baseTexture.layer_count; + + if (sub_resource_idx >= sub_count) + { + WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + return NULL; + } + + return texture->baseTexture.sub_resources[sub_resource_idx]; +} + +static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, + UINT sub_resource_idx, WINED3DSURFACE_DESC *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DSurface *surface; - TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); + TRACE("iface %p, sub_resource_idx %u, desc %p.\n", iface, sub_resource_idx, desc); - if (!(surface = (IWineD3DSurface *)basetexture_get_sub_resource(texture, 0, level))) + if (!(surface = (IWineD3DSurface *)texture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -355,14 +366,14 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, U } static HRESULT WINAPI IWineD3DTextureImpl_GetSurfaceLevel(IWineD3DTexture *iface, - UINT level, IWineD3DSurface **surface) + UINT sub_resource_idx, IWineD3DSurface **surface) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DSurface *s; - TRACE("iface %p, level %u, surface %p.\n", iface, level, surface); + TRACE("iface %p, sub_resource_idx %u, surface %p.\n", iface, sub_resource_idx, surface); - if (!(s = (IWineD3DSurface *)basetexture_get_sub_resource(texture, 0, level))) + if (!(s = (IWineD3DSurface *)texture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -377,15 +388,15 @@ static HRESULT WINAPI IWineD3DTextureImpl_GetSurfaceLevel(IWineD3DTexture *iface } static HRESULT WINAPI IWineD3DTextureImpl_Map(IWineD3DTexture *iface, - UINT level, WINED3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) + UINT sub_resource_idx, WINED3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DSurface *surface; - TRACE("iface %p, level %u, locked_rect %p, rect %s, flags %#x.\n", - iface, level, locked_rect, wine_dbgstr_rect(rect), flags); + TRACE("iface %p, sub_resource_idx %u, locked_rect %p, rect %s, flags %#x.\n", + iface, sub_resource_idx, locked_rect, wine_dbgstr_rect(rect), flags); - if (!(surface = (IWineD3DSurface *)basetexture_get_sub_resource(texture, 0, level))) + if (!(surface = (IWineD3DSurface *)texture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -394,14 +405,14 @@ static HRESULT WINAPI IWineD3DTextureImpl_Map(IWineD3DTexture *iface, return IWineD3DSurface_Map(surface, locked_rect, rect, flags); } -static HRESULT WINAPI IWineD3DTextureImpl_Unmap(IWineD3DTexture *iface, UINT level) +static HRESULT WINAPI IWineD3DTextureImpl_Unmap(IWineD3DTexture *iface, UINT sub_resource_idx) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; IWineD3DSurface *surface; - TRACE("iface %p, level %u.\n", iface, level); + TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); - if (!(surface = (IWineD3DSurface *)basetexture_get_sub_resource(texture, 0, level))) + if (!(surface = (IWineD3DSurface *)texture_get_sub_resource(texture, sub_resource_idx))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; @@ -417,7 +428,7 @@ static HRESULT WINAPI IWineD3DTextureImpl_AddDirtyRect(IWineD3DTexture *iface, c TRACE("iface %p, dirty_rect %s.\n", iface, wine_dbgstr_rect(dirty_rect)); - if (!(surface = (IWineD3DSurfaceImpl *)basetexture_get_sub_resource(texture, 0, 0))) + if (!(surface = (IWineD3DSurfaceImpl *)texture_get_sub_resource(texture, 0))) { WARN("Failed to get sub-resource.\n"); return WINED3DERR_INVALIDCALL; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index d720db5..df2cc84 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2544,21 +2544,21 @@ interface IWineD3DBaseTexture : IWineD3DResource interface IWineD3DTexture : IWineD3DBaseTexture { HRESULT GetLevelDesc( - [in] UINT level, + [in] UINT sub_resource_idx, [out] WINED3DSURFACE_DESC *desc ); HRESULT GetSurfaceLevel( - [in] UINT level, + [in] UINT sub_resource_idx, [out] IWineD3DSurface **surface ); HRESULT Map( - [in] UINT level, + [in] UINT sub_resource_idx, [out] WINED3DLOCKED_RECT *locked_rect, [in] const RECT *rect, [in] DWORD flags ); HRESULT Unmap( - [in] UINT level + [in] UINT sub_resource_idx ); HRESULT AddDirtyRect( [in] const RECT *dirty_rect

1 0

Austin Lund : gdiplus/tests: Fix GetLogFont charset tests for Asian platforms.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: ae0a48494504a73b5a9ad70901c621433bb673ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0a48494504a73b5a9ad7090… Author: Austin Lund <austin.lund(a)gmail.com> Date: Mon Oct 25 14:39:08 2010 +1000 gdiplus/tests: Fix GetLogFont charset tests for Asian platforms. --- dlls/gdiplus/tests/font.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index c2ed3c7..834ba60 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -129,7 +129,8 @@ static void test_logfont(void) expect(0, lfa2.lfItalic); expect(0, lfa2.lfUnderline); expect(0, lfa2.lfStrikeOut); - expect(GetTextCharset(hdc), lfa2.lfCharSet); + ok(lfa2.lfCharSet == GetTextCharset(hdc) || lfa2.lfCharSet == ANSI_CHARSET, + "Expected %x or %x, got %x\n", GetTextCharset(hdc), ANSI_CHARSET, lfa2.lfCharSet); expect(0, lfa2.lfOutPrecision); expect(0, lfa2.lfClipPrecision); expect(0, lfa2.lfQuality); @@ -159,7 +160,8 @@ static void test_logfont(void) expect(TRUE, lfa2.lfItalic); expect(TRUE, lfa2.lfUnderline); expect(TRUE, lfa2.lfStrikeOut); - expect(GetTextCharset(hdc), lfa2.lfCharSet); + ok(lfa2.lfCharSet == GetTextCharset(hdc) || lfa2.lfCharSet == ANSI_CHARSET, + "Expected %x or %x, got %x\n", GetTextCharset(hdc), ANSI_CHARSET, lfa2.lfCharSet); expect(0, lfa2.lfOutPrecision); expect(0, lfa2.lfClipPrecision); expect(0, lfa2.lfQuality);

1 0

Austin Lund : kernel32/tests: Increase timeouts to avoid test failures in CreateRemoteThread.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 86c39000a45d6b1660ce5215014bdf572231d072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c39000a45d6b1660ce52150… Author: Austin Lund <austin.lund(a)gmail.com> Date: Mon Oct 25 11:56:48 2010 +1000 kernel32/tests: Increase timeouts to avoid test failures in CreateRemoteThread. --- dlls/kernel32/tests/thread.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index c285b01..fe1cc7d 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -310,18 +310,18 @@ static VOID test_CreateRemoteThread(void) ok(ret == 2, "ret=%u, err=%u\n", ret, GetLastError()); /* thread still suspended, so wait times out */ - ret = WaitForSingleObject(hEvent, 100); + ret = WaitForSingleObject(hEvent, 1000); ok(ret == WAIT_TIMEOUT, "wait did not time out, ret=%u\n", ret); ret = ResumeThread(hThread); ok(ret == 1, "ret=%u, err=%u\n", ret, GetLastError()); /* wait that doesn't time out */ - ret = WaitForSingleObject(hEvent, 100); + ret = WaitForSingleObject(hEvent, 1000); ok(ret == WAIT_OBJECT_0, "object not signaled, ret=%u\n", ret); /* wait for thread end */ - ret = WaitForSingleObject(hThread, 100); + ret = WaitForSingleObject(hThread, 1000); ok(ret == WAIT_OBJECT_0, "waiting for thread failed, ret=%u\n", ret); CloseHandle(hThread); @@ -330,7 +330,7 @@ static VOID test_CreateRemoteThread(void) threadFunc_CloseHandle, hRemoteEvent, 0, &tid); ok(hThread != NULL, "CreateRemoteThread failed, err=%u\n", GetLastError()); - ret = WaitForSingleObject(hThread, 100); + ret = WaitForSingleObject(hThread, 1000); ok(ret == WAIT_OBJECT_0, "waiting for thread failed, ret=%u\n", ret); CloseHandle(hThread); @@ -341,7 +341,7 @@ static VOID test_CreateRemoteThread(void) ok(hThread != NULL, "CreateRemoteThread failed, err=%u\n", GetLastError()); /* closed handle, so wait times out */ - ret = WaitForSingleObject(hEvent, 100); + ret = WaitForSingleObject(hEvent, 1000); ok(ret == WAIT_TIMEOUT, "wait did not time out, ret=%u\n", ret); /* check that remote SetEvent() failed */

1 0

Austin Lund : user32/tests: Fix some combo box tests for different font sizes.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: d732cd7412c594e93634ef74f971912f5d5efeba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d732cd7412c594e93634ef74f… Author: Austin Lund <austin.lund(a)gmail.com> Date: Mon Oct 25 20:01:40 2010 +1000 user32/tests: Fix some combo box tests for different font sizes. --- dlls/user32/tests/combo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index b7fa63f..f63b941 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -77,7 +77,7 @@ static void test_setitemheight(DWORD style) trace("Style %x\n", style); GetClientRect(hCombo, &r); - expect_rect(r, 0, 0, 100, 24); + expect_rect(r, 0, 0, 100, font_height(GetStockObject(SYSTEM_FONT)) + 8); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); todo_wine expect_rect(r, 5, 5, 105, 105); @@ -112,7 +112,7 @@ static void test_setfont(DWORD style) hFont2 = CreateFont(8, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, SYMBOL_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH|FF_DONTCARE, "Marlett"); GetClientRect(hCombo, &r); - expect_rect(r, 0, 0, 100, 24); + expect_rect(r, 0, 0, 100, font_height(GetStockObject(SYSTEM_FONT)) + 8); SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&r); MapWindowPoints(HWND_DESKTOP, hMainWnd, (LPPOINT)&r, 2); todo_wine expect_rect(r, 5, 5, 105, 105);

1 0

Paul Vriens : write: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: bc1f5c4a369f242260b7498ac98422c4c97f84fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1f5c4a369f242260b7498ac… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 25 09:20:48 2010 +0200 write: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- programs/write/Makefile.in | 1 + programs/write/Sr.rc | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in index 9b98f3d..3ae4651 100644 --- a/programs/write/Makefile.in +++ b/programs/write/Makefile.in @@ -23,6 +23,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Uk.rc diff --git a/programs/write/Sr.rc b/programs/write/Sr.rc new file mode 100644 index 0000000..da4dae9 --- /dev/null +++ b/programs/write/Sr.rc @@ -0,0 +1,38 @@ +/* + * Serbian language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resources.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_FAILED, "Покретање Писанке није успело" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_FAILED, "Pokretanje Pisanke nije uspelo" +}

1 0

Paul Vriens : inetcpl.cpl: Add the Serbian (Latin and Cyrillic) translation .
by Alexandre Julliard 25 Oct '10

25 Oct '10

Module: wine Branch: master Commit: 77c67b9c8030d58f327c231a5e7e4a32de60126f URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c67b9c8030d58f327c231a5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 24 22:52:46 2010 +0200 inetcpl.cpl: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Sr.rc | 105 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index d11814e..9095d7e 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -19,6 +19,7 @@ RC_SRCS = \ cpl_Nl.rc \ cpl_Pl.rc \ cpl_Si.rc \ + cpl_Sr.rc \ cpl_Sv.rc \ cpl_Uk.rc \ inetcpl.rc diff --git a/dlls/inetcpl.cpl/cpl_Sr.rc b/dlls/inetcpl.cpl/cpl_Sr.rc new file mode 100644 index 0000000..6a7afa1 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Sr.rc @@ -0,0 +1,105 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "inetcpl.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Поставке интернета" + IDS_CPL_INFO "Подеси Wine интернет прегледач и сродне поставке" +END + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Опште" +BEGIN + + GROUPBOX "Почетна страна", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Изаберите адресу која ће се користити за почетну страну.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Текућа страна", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&Подразумевана страна", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "Празна &страна", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Садржај" +BEGIN + + GROUPBOX "Сертификати", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Сертификати се користе за личну идентификацију, као и за препознавање ауторитета и издавача сертификата.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Сертификати...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Издавачи...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Postavke interneta" + IDS_CPL_INFO "Podesi Wine internet pregledač i srodne postavke" +END + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Opšte" +BEGIN + + GROUPBOX "Početna strana", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Izaberite adresu koja će se koristiti za početnu stranu.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Tekuća strana", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&Podrazumevana strana", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "Prazna &strana", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Sadržaj" +BEGIN + + GROUPBOX "Sertifikati", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Sertifikati se koriste za ličnu identifikaciju, kao i za prepoznavanje autoriteta i izdavača sertifikata.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Sertifikati...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Izdavači...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

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 2010