July 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Avoid redundant FBO binds.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: a80247f58b3ee9b5da0e2e1898169c2fc4238670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80247f58b3ee9b5da0e2e189… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 10:34:05 2009 +0200 wined3d: Avoid redundant FBO binds. Apparently this is an expensive operation for certain drivers, even if the binding doesn't actually change. --- dlls/wined3d/context.c | 24 ++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 86e73c5..172cd6b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -64,6 +64,30 @@ void context_bind_fbo(struct WineD3DContext *context, GLenum target, GLuint *fbo f = *fbo; } + switch (target) + { + case GL_READ_FRAMEBUFFER_EXT: + if (context->fbo_read_binding == f) return; + context->fbo_read_binding = f; + break; + + case GL_DRAW_FRAMEBUFFER_EXT: + if (context->fbo_draw_binding == f) return; + context->fbo_draw_binding = f; + break; + + case GL_FRAMEBUFFER_EXT: + if (context->fbo_read_binding == f + && context->fbo_draw_binding == f) return; + context->fbo_read_binding = f; + context->fbo_draw_binding = f; + break; + + default: + FIXME("Unhandled target %#x.\n", target); + break; + } + GL_EXTCALL(glBindFramebufferEXT(target, f)); checkGLcall("glBindFramebuffer()"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d02bfdc..5d61c6a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1242,6 +1242,8 @@ struct WineD3DContext struct fbo_entry *current_fbo; GLuint src_fbo; GLuint dst_fbo; + GLuint fbo_read_binding; + GLuint fbo_draw_binding; /* Extension emulation */ GLint gl_fog_source;

1 0

Henri Verbeet : wined3d: Always use context_bind_fbo() to change the framebuffer binding.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 710f6f8456ebd059dbd95e00ba6e1805f38fa392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=710f6f8456ebd059dbd95e00b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 10:34:04 2009 +0200 wined3d: Always use context_bind_fbo() to change the framebuffer binding. --- dlls/wined3d/context.c | 37 ++++++++++++++++++++----------------- dlls/wined3d/device.c | 12 +++++------- dlls/wined3d/surface.c | 11 ++++------- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 49e2337..86e73c5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -47,15 +47,24 @@ void context_set_last_device(IWineD3DDeviceImpl *device) void context_bind_fbo(struct WineD3DContext *context, GLenum target, GLuint *fbo) { const struct wined3d_gl_info *gl_info = context->gl_info; + GLuint f; - if (!*fbo) + if (!fbo) { - GL_EXTCALL(glGenFramebuffersEXT(1, fbo)); - checkGLcall("glGenFramebuffersEXT()"); - TRACE("Created FBO %d\n", *fbo); + f = 0; + } + else + { + if (!*fbo) + { + GL_EXTCALL(glGenFramebuffersEXT(1, fbo)); + checkGLcall("glGenFramebuffersEXT()"); + TRACE("Created FBO %u.\n", *fbo); + } + f = *fbo; } - GL_EXTCALL(glBindFramebufferEXT(target, *fbo)); + GL_EXTCALL(glBindFramebufferEXT(target, f)); checkGLcall("glBindFramebuffer()"); } @@ -77,17 +86,14 @@ static void context_clean_fbo_attachments(const struct wined3d_gl_info *gl_info) } /* GL locking is done by the caller */ -static void context_destroy_fbo(struct WineD3DContext *context, const GLuint *fbo) +static void context_destroy_fbo(struct WineD3DContext *context, GLuint *fbo) { const struct wined3d_gl_info *gl_info = context->gl_info; - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, *fbo)); - checkGLcall("glBindFramebuffer()"); - + context_bind_fbo(context, GL_FRAMEBUFFER_EXT, fbo); context_clean_fbo_attachments(gl_info); + context_bind_fbo(context, GL_FRAMEBUFFER_EXT, NULL); - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); - checkGLcall("glBindFramebuffer()"); GL_EXTCALL(glDeleteFramebuffersEXT(1, fbo)); checkGLcall("glDeleteFramebuffers()"); } @@ -308,8 +314,7 @@ static void context_reuse_fbo_entry(struct WineD3DContext *context, struct fbo_e IWineD3DDeviceImpl *device = ((IWineD3DSurfaceImpl *)context->surface)->resource.wineD3DDevice; const struct wined3d_gl_info *gl_info = context->gl_info; - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, entry->id)); - checkGLcall("glBindFramebuffer()"); + context_bind_fbo(context, GL_FRAMEBUFFER_EXT, &entry->id); context_clean_fbo_attachments(gl_info); memcpy(entry->render_targets, device->render_targets, GL_LIMITS(buffers) * sizeof(*entry->render_targets)); @@ -419,7 +424,6 @@ static void context_apply_fbo_entry(struct WineD3DContext *context, struct fbo_e static void context_apply_fbo_state(struct WineD3DContext *context) { IWineD3DDeviceImpl *device = ((IWineD3DSurfaceImpl *)context->surface)->resource.wineD3DDevice; - const struct wined3d_gl_info *gl_info = context->gl_info; if (device->render_offscreen) { @@ -427,7 +431,7 @@ static void context_apply_fbo_state(struct WineD3DContext *context) context_apply_fbo_entry(context, context->current_fbo); } else { context->current_fbo = NULL; - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + context_bind_fbo(context, GL_FRAMEBUFFER_EXT, NULL); } context_check_fbo_status(context); @@ -1800,8 +1804,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU LEAVE_GL(); } else { ENTER_GL(); - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); - checkGLcall("glFramebufferRenderbufferEXT"); + context_bind_fbo(context, GL_FRAMEBUFFER_EXT, NULL); LEAVE_GL(); } context->draw_buffer_dirty = TRUE; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b9d60e2..a1ed4dc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6041,7 +6041,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, ActivateContext(This, surface, CTXUSAGE_RESOURCELOAD); ENTER_GL(); - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, NULL); buffer = surface_get_gl_buffer(surface, swapchain); glDrawBuffer(buffer); checkGLcall("glDrawBuffer()"); @@ -6083,8 +6083,7 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, if (This->activeContext->current_fbo) { context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, &This->activeContext->current_fbo->id); } else { - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); - checkGLcall("glBindFramebuffer()"); + context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, NULL); } if (swapchain && surface == ((IWineD3DSwapChainImpl *)swapchain)->frontBuffer @@ -6468,7 +6467,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED } ENTER_GL(); - GL_EXTCALL(glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0)); + context_bind_fbo(This->activeContext, GL_READ_FRAMEBUFFER_EXT, NULL); glReadBuffer(buffer); checkGLcall("glReadBuffer()"); } else { @@ -6507,7 +6506,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED } ENTER_GL(); - GL_EXTCALL(glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0)); + context_bind_fbo(This->activeContext, GL_DRAW_FRAMEBUFFER_EXT, NULL); glDrawBuffer(buffer); checkGLcall("glDrawBuffer()"); } else { @@ -6538,8 +6537,7 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED if (This->activeContext->current_fbo) { context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, &This->activeContext->current_fbo->id); } else { - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); - checkGLcall("glBindFramebuffer()"); + context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, NULL); } /* If we switched from GL_BACK to GL_FRONT above, we need to switch back here */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4ff3245..0122e1e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4404,7 +4404,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { /* Note that we use depth_blt here as well, rather than glCopyTexImage2D * directly on the FBO texture. That's because we need to flip. */ - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + context_bind_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, NULL); if (This->texture_target == GL_TEXTURE_RECTANGLE_ARB) { glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); @@ -4451,8 +4451,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { if (device->activeContext->current_fbo) { context_bind_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, &device->activeContext->current_fbo->id); } else { - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); - checkGLcall("glBindFramebuffer()"); + context_bind_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, NULL); } LEAVE_GL(); @@ -4465,15 +4464,13 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { ENTER_GL(); - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); - checkGLcall("glBindFramebuffer()"); + context_bind_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, NULL); surface_depth_blt(This, This->texture_name, This->currentDesc.Width, This->currentDesc.Height, This->texture_target); checkGLcall("depth_blt"); if (device->activeContext->current_fbo) { - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, device->activeContext->current_fbo->id)); - checkGLcall("glBindFramebuffer()"); + context_bind_fbo(device->activeContext, GL_FRAMEBUFFER_EXT, &device->activeContext->current_fbo->id); } LEAVE_GL();

1 0

Henri Verbeet : wined3d: Pass the context instead of the device to the various context functions.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 7485173849eeb0d71fa43f0ccaf346f38adaa1aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7485173849eeb0d71fa43f0cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 10:34:03 2009 +0200 wined3d: Pass the context instead of the device to the various context functions. --- dlls/wined3d/context.c | 148 ++++++++++++++++++++-------------------- dlls/wined3d/device.c | 22 +++--- dlls/wined3d/surface.c | 6 +- dlls/wined3d/wined3d_private.h | 8 ++- 4 files changed, 93 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7485173849eeb0d71fa43…

1 0

Henri Verbeet : wined3d: Store a pointer to wined3d_gl_info in struct WineD3DContext.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: a01616a6c31afcdfefe750d6103a78d0b58ff751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a01616a6c31afcdfefe750d61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 10:34:02 2009 +0200 wined3d: Store a pointer to wined3d_gl_info in struct WineD3DContext. --- dlls/wined3d/context.c | 24 ++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1fd7ea2..7a10ac2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION This->adapter->gl_info +#define GLINFO_LOCATION (*gl_info) /* The last used device. * @@ -46,7 +46,7 @@ void context_set_last_device(IWineD3DDeviceImpl *device) /* GL locking is done by the caller */ void context_bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { - const IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + const struct wined3d_gl_info *gl_info = ((IWineD3DDeviceImpl *)iface)->activeContext->gl_info; if (!*fbo) { @@ -62,6 +62,7 @@ void context_bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) /* GL locking is done by the caller */ static void context_clean_fbo_attachments(IWineD3DDeviceImpl *This) { + const struct wined3d_gl_info *gl_info = This->activeContext->gl_info; unsigned int i; for (i = 0; i < GL_LIMITS(buffers); ++i) @@ -79,6 +80,8 @@ static void context_clean_fbo_attachments(IWineD3DDeviceImpl *This) /* GL locking is done by the caller */ static void context_destroy_fbo(IWineD3DDeviceImpl *This, const GLuint *fbo) { + const struct wined3d_gl_info *gl_info = This->activeContext->gl_info; + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, *fbo)); checkGLcall("glBindFramebuffer()"); @@ -158,6 +161,7 @@ static void context_apply_attachment_filter_states(IWineD3DDevice *iface, IWineD void context_attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer) { IWineD3DSurfaceImpl *depth_stencil_impl = (IWineD3DSurfaceImpl *)depth_stencil; + const struct wined3d_gl_info *gl_info = This->activeContext->gl_info; TRACE("Attach depth stencil %p\n", depth_stencil); @@ -228,6 +232,7 @@ void context_attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_targe void context_attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) { const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; + const struct wined3d_gl_info *gl_info = This->activeContext->gl_info; TRACE("Attach surface %p to %u\n", surface, idx); @@ -248,6 +253,7 @@ void context_attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWO static void context_check_fbo_status(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + const struct wined3d_gl_info *gl_info = This->activeContext->gl_info; GLenum status; status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); @@ -283,6 +289,7 @@ static void context_check_fbo_status(IWineD3DDevice *iface) static struct fbo_entry *context_create_fbo_entry(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + const struct wined3d_gl_info *gl_info = This->activeContext->gl_info; struct fbo_entry *entry; entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); @@ -299,6 +306,7 @@ static struct fbo_entry *context_create_fbo_entry(IWineD3DDevice *iface) static void context_reuse_fbo_entry(IWineD3DDevice *iface, struct fbo_entry *entry) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + const struct wined3d_gl_info *gl_info = This->activeContext->gl_info; GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, entry->id)); checkGLcall("glBindFramebuffer()"); @@ -328,6 +336,7 @@ static void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, WineD3DContext * static struct fbo_entry *context_find_fbo_entry(IWineD3DDevice *iface, WineD3DContext *context) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry; LIST_FOR_EACH_ENTRY(entry, &context->fbo_list, struct fbo_entry, entry) @@ -362,6 +371,7 @@ static struct fbo_entry *context_find_fbo_entry(IWineD3DDevice *iface, WineD3DCo static void context_apply_fbo_entry(IWineD3DDevice *iface, struct fbo_entry *entry) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + const struct wined3d_gl_info *gl_info = This->activeContext->gl_info; unsigned int i; context_bind_fbo(iface, GL_FRAMEBUFFER_EXT, &entry->id); @@ -409,6 +419,7 @@ static void context_apply_fbo_state(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineD3DContext *context = This->activeContext; + const struct wined3d_gl_info *gl_info = context->gl_info; if (This->render_offscreen) { @@ -485,6 +496,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource for (i = 0; i < This->numContexts; ++i) { WineD3DContext *context = This->contexts[i]; + const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry, *entry2; ENTER_GL(); @@ -791,6 +803,7 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, * *****************************************************************************/ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win_handle, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms) { + const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; HPBUFFERARB pbuffer = NULL; WineD3DContext *ret = NULL; unsigned int s; @@ -976,6 +989,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } goto out; } + ret->gl_info = &This->adapter->gl_info; ret->surface = (IWineD3DSurface *) target; ret->isPBuffer = create_pbuffer; ret->tid = GetCurrentThreadId(); @@ -1161,6 +1175,7 @@ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, WineD3DContext *con * *****************************************************************************/ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry, *entry2; BOOL has_glctx; @@ -1255,6 +1270,7 @@ static inline void set_blit_dimension(UINT width, UINT height) { static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *context, UINT width, UINT height) { int i, sampler; const struct StateEntry *StateTable = This->StateTable; + const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("Setting up context %p for blitting\n", context); if(context->last_was_blit) { @@ -1651,6 +1667,7 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf /* Context activation is done by the caller. */ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, BOOL blit) { + const struct wined3d_gl_info *gl_info = This->activeContext->gl_info; IWineD3DSwapChain *swapchain; if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) @@ -1711,6 +1728,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU BYTE shift; WineD3DContext *context; const struct StateEntry *StateTable = This->StateTable; + const struct wined3d_gl_info *gl_info; TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); if(This->lastActiveRenderTarget != target || tid != This->lastThread) { @@ -1723,6 +1741,8 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU context = This->activeContext; } + gl_info = context->gl_info; + /* Activate the opengl context */ if(last_device != This || context != This->activeContext) { BOOL ret; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2ec03d0..a70e843 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1189,7 +1189,9 @@ enum fogsource { #define WINED3D_MAX_FBO_ENTRIES 64 /* The new context manager that should deal with onscreen and offscreen rendering */ -struct WineD3DContext { +struct WineD3DContext +{ + const struct wined3d_gl_info *gl_info; /* State dirtification * dirtyArray is an array that contains markers for dirty states. numDirtyEntries states are dirty, their numbers are in indices * 0...numDirtyEntries - 1. isStateDirty is a redundant copy of the dirtyArray. Technically only one of them would be needed,

1 0

Henri Verbeet : wined3d: Rename _WineD3D_GL_Info to struct wined3d_gl_info.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 43e6686a788e56896e6693bb167bb85ac2e87888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e6686a788e56896e6693bb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 17 10:34:01 2009 +0200 wined3d: Rename _WineD3D_GL_Info to struct wined3d_gl_info. --- dlls/wined3d/arb_program_shader.c | 58 +++++++++-------- dlls/wined3d/ati_fragment_shader.c | 25 ++++--- dlls/wined3d/baseshader.c | 3 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/directx.c | 77 +++++++++++----------- dlls/wined3d/gl_compat.c | 3 +- dlls/wined3d/glsl_shader.c | 63 +++++++++-------- dlls/wined3d/nvidia_texture_shader.c | 3 +- dlls/wined3d/state.c | 5 +- dlls/wined3d/surface.c | 4 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 20 +++--- dlls/wined3d/volumetexture.c | 4 +- dlls/wined3d/wined3d_gl.h | 123 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 16 ++-- 15 files changed, 210 insertions(+), 198 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43e6686a788e56896e669…

1 0

Michael Stefaniuc : wordpad: Change some string resource ids to logically group the strings in separate STRINGTABLEs .
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 0c110597db91e4074c50ef89f4f2aba630a33080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c110597db91e4074c50ef89f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 17 10:17:07 2009 +0200 wordpad: Change some string resource ids to logically group the strings in separate STRINGTABLEs. --- programs/wordpad/En.rc | 26 +++++++------------------- programs/wordpad/wordpad.h | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 33 deletions(-) diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index fe92de7..b6ade3a 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -179,10 +179,14 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_RICHTEXT_FILES_RTF, "Rich text format (*.rtf)" + STRING_ALL_FILES, "All documents (*.*)" STRING_TEXT_FILES_TXT, "Text documents (*.txt)" STRING_TEXT_FILES_UNICODE_TXT, "Unicode text document (*.txt)" - STRING_ALL_FILES, "All documents (*.*)" + STRING_RICHTEXT_FILES_RTF, "Rich text format (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Rich text document" + STRING_NEWFILE_TXT, "Text document" + STRING_NEWFILE_TXT_UNICODE, "Unicode text document" + STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" END STRINGTABLE DISCARDABLE @@ -194,18 +198,6 @@ END STRINGTABLE DISCARDABLE BEGIN - STRING_NEWFILE_RICHTEXT, "Rich text document" - STRING_NEWFILE_TXT, "Text document" - STRING_NEWFILE_TXT_UNICODE, "Unicode text document" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_PRINTER_FILES_PRN, "Printer files (*.PRN)" -END - -STRINGTABLE DISCARDABLE -BEGIN STRING_VIEWPROPS_TITLE, "Options" STRING_VIEWPROPS_TEXT, "Text" STRING_VIEWPROPS_RICHTEXT, "Rich text" @@ -219,11 +211,7 @@ BEGIN STRING_PREVIEW_TWOPAGES, "Two pages" STRING_PREVIEW_ONEPAGE, "One page" STRING_PREVIEW_CLOSE, "Close" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" + STRING_UNITS_CM, "cm" END STRINGTABLE DISCARDABLE diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 6d3e64a..b51bec8 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -172,24 +172,24 @@ #define STRING_NEWFILE_TXT 1405 #define STRING_NEWFILE_TXT_UNICODE 1406 -#define STRING_ALIGN_LEFT 1407 -#define STRING_ALIGN_RIGHT 1408 -#define STRING_ALIGN_CENTER 1409 +#define STRING_PRINTER_FILES_PRN 1407 -#define STRING_PRINTER_FILES_PRN 1410 +#define STRING_ALIGN_LEFT 1416 +#define STRING_ALIGN_RIGHT 1417 +#define STRING_ALIGN_CENTER 1418 -#define STRING_VIEWPROPS_TITLE 1411 -#define STRING_VIEWPROPS_TEXT 1412 -#define STRING_VIEWPROPS_RICHTEXT 1413 +#define STRING_VIEWPROPS_TITLE 1432 +#define STRING_VIEWPROPS_TEXT 1433 +#define STRING_VIEWPROPS_RICHTEXT 1434 -#define STRING_PREVIEW_PRINT 1414 -#define STRING_PREVIEW_NEXTPAGE 1415 -#define STRING_PREVIEW_PREVPAGE 1416 -#define STRING_PREVIEW_TWOPAGES 1417 -#define STRING_PREVIEW_ONEPAGE 1418 -#define STRING_PREVIEW_CLOSE 1419 +#define STRING_PREVIEW_PRINT 1448 +#define STRING_PREVIEW_NEXTPAGE 1449 +#define STRING_PREVIEW_PREVPAGE 1450 +#define STRING_PREVIEW_TWOPAGES 1451 +#define STRING_PREVIEW_ONEPAGE 1452 +#define STRING_PREVIEW_CLOSE 1453 -#define STRING_UNITS_CM 1420 +#define STRING_UNITS_CM 1454 #define STRING_DEFAULT_FILENAME 1700 #define STRING_PROMPT_SAVE_CHANGES 1701

1 0

Dylan Smith : richedit: Prevent autoscrolling without ES_AUTO[VH] SCROLL style.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 140fee179040c68717f46bfd076949a58bb7ed63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=140fee179040c68717f46bfd0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 16 20:01:25 2009 -0400 richedit: Prevent autoscrolling without ES_AUTO[VH]SCROLL style. When the richedit control is created without the ES_AUTOHSCROLL or the ES_AUTOVSCROLL, then scrolling isn't done automatically when moving the cursor with the arrow keys, drag selecting with the mouse, or even from using the EM_SCROLLCARET (based on testing using a modified version of wordpad). --- dlls/riched20/paint.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 620ac69..bc62bdb 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1242,11 +1242,21 @@ void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor) assert(pRow); assert(pPara); - x = pRun->pt.x + ME_PointFromChar(editor, pRun, pCursor->nOffset); - if (x > editor->horz_si.nPos + editor->sizeWindow.cx) - x = x + 1 - editor->sizeWindow.cx; - else if (x > editor->horz_si.nPos) + if (editor->styleFlags & ES_AUTOHSCROLL) + { + x = pRun->pt.x + ME_PointFromChar(editor, pRun, pCursor->nOffset); + if (x > editor->horz_si.nPos + editor->sizeWindow.cx) + x = x + 1 - editor->sizeWindow.cx; + else if (x > editor->horz_si.nPos) + x = editor->horz_si.nPos; + + if (~editor->styleFlags & ES_AUTOVSCROLL) + ME_HScrollAbs(editor, x); + } else { + if (~editor->styleFlags & ES_AUTOVSCROLL) + return; x = editor->horz_si.nPos; + } y = pPara->member.para.pt.y + pRow->member.row.pt.y; yheight = pRow->member.row.nHeight;

1 0

Jacek Caban : include: Added ntddndis.h.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: fe459ad85f9582948f062330ae2057fd7ec39d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe459ad85f9582948f062330a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 01:43:09 2009 +0200 include: Added ntddndis.h. --- include/Makefile.in | 1 + include/ntddndis.h | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 68e8974..71a20ac 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -346,6 +346,7 @@ SRCDIR_INCLUDES = \ npapi.h \ nspapi.h \ ntddcdrm.h \ + ntddndis.h \ ntddscsi.h \ ntddstor.h \ ntdsapi.h \ diff --git a/include/ntddndis.h b/include/ntddndis.h new file mode 100644 index 0000000..44566e8 --- /dev/null +++ b/include/ntddndis.h @@ -0,0 +1,168 @@ +/* + * Copyright 2009 Jacek Caban for CodeWeavers + * + * 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 + */ + +#ifndef _NTDDNDIS_ +#define _NTDDNDIS_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* #include <ifdef.h>*/ +/* #include <devpkey.h> */ +/* #include <pciprop.h> */ + +#define _NDIS_CONTROL_CODE(request, method) \ + CTL_CODE(FILE_DEVICE_PHYSICAL_NETCARD, request, method, FILE_ANY_ACCESS) + +#define IOCTL_NDIS_QUERY_GLOBAL_STATS _NDIS_CONTROL_CODE(0, METHOD_OUT_DIRECT) +#define IOCTL_NDIS_QUERY_ALL_STATS _NDIS_CONTROL_CODE(1, METHOD_OUT_DIRECT) +#define IOCTL_NDIS_DO_PNP_OPERATION _NDIS_CONTROL_CODE(2, METHOD_BUFFERED) +#define IOCTL_NDIS_QUERY_SELECTED_STATS _NDIS_CONTROL_CODE(3, METHOD_OUT_DIRECT) +#define IOCTL_NDIS_ENUMERATE_INTERFACES _NDIS_CONTROL_CODE(4, METHOD_BUFFERED) +#define IOCTL_NDIS_ADD_TDI_DEVICE _NDIS_CONTROL_CODE(5, METHOD_BUFFERED) +#define IOCTL_NDIS_GET_LOG_DATA _NDIS_CONTROL_CODE(7, METHOD_OUT_DIRECT) +#define IOCTL_NDIS_GET_VERSION _NDIS_CONTROL_CODE(8, METHOD_BUFFERED) + +#define IOCTL_NDIS_RESERVED1 _NDIS_CONTROL_CODE(0x09, METHOD_BUFFERED) +#define IOCTL_NDIS_RESERVED2 _NDIS_CONTROL_CODE(0x0a, METHOD_BUFFERED) +#define IOCTL_NDIS_RESERVED3 _NDIS_CONTROL_CODE(0x0b, METHOD_BUFFERED) +#define IOCTL_NDIS_RESERVED4 _NDIS_CONTROL_CODE(0x0c, METHOD_BUFFERED) +#define IOCTL_NDIS_RESERVED5 CTL_CODE(FILE_DEVICE_PHYSICAL_NETCARD, 0x0d, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_NDIS_RESERVED6 CTL_CODE(FILE_DEVICE_PHYSICAL_NETCARD, 0x0e, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_NDIS_RESERVED7 _NDIS_CONTROL_CODE(0x0f, METHOD_OUT_DIRECT) +#define IOCTL_NDIS_RESERVED8 _NDIS_CONTROL_CODE(0x10, METHOD_BUFFERED) +#define IOCTL_NDIS_RESERVED9 _NDIS_CONTROL_CODE(0x11, METHOD_BUFFERED) +#define IOCTL_NDIS_RESERVED10 _NDIS_CONTROL_CODE(0x12, METHOD_BUFFERED) +#define IOCTL_NDIS_RESERVED11 _NDIS_CONTROL_CODE(0x13, METHOD_BUFFERED) +#define IOCTL_NDIS_RESERVED12 _NDIS_CONTROL_CODE(0x14, METHOD_BUFFERED) +#define IOCTL_NDIS_RESERVED13 _NDIS_CONTROL_CODE(0x15, METHOD_BUFFERED) + + +#define OID_802_11_BSSID 0x0d010101 +#define OID_802_11_SSID 0x0d010102 +#define OID_802_11_NETWORK_TYPES_SUPPORTED 0x0d010203 +#define OID_802_11_NETWORK_TYPE_IN_USE 0x0d010204 +#define OID_802_11_TX_POWER_LEVEL 0x0d010205 +#define OID_802_11_RSSI 0x0d010206 +#define OID_802_11_RSSI_TRIGGER 0x0d010207 +#define OID_802_11_INFRASTRUCTURE_MODE 0x0d010108 +#define OID_802_11_FRAGMENTATION_THRESHOLD 0x0d010209 +#define OID_802_11_RTS_THRESHOLD 0x0d01020a +#define OID_802_11_NUMBER_OF_ANTENNAS 0x0d01020b +#define OID_802_11_RX_ANTENNA_SELECTED 0x0d01020c +#define OID_802_11_TX_ANTENNA_SELECTED 0x0d01020d +#define OID_802_11_SUPPORTED_RATES 0x0d01020e +#define OID_802_11_DESIRED_RATES 0x0d010210 +#define OID_802_11_CONFIGURATION 0x0d010211 +#define OID_802_11_STATISTICS 0x0d020212 +#define OID_802_11_ADD_WEP 0x0d010113 +#define OID_802_11_REMOVE_WEP 0x0d010114 +#define OID_802_11_DISASSOCIATE 0x0d010115 +#define OID_802_11_POWER_MODE 0x0d010216 +#define OID_802_11_BSSID_LIST 0x0d010217 +#define OID_802_11_AUTHENTICATION_MODE 0x0d010118 +#define OID_802_11_PRIVACY_FILTER 0x0d010119 +#define OID_802_11_BSSID_LIST_SCAN 0x0d01011a +#define OID_802_11_WEP_STATUS 0x0d01011b +#define OID_802_11_ENCRYPTION_STATUS OID_802_11_WEP_STATUS +#define OID_802_11_RELOAD_DEFAULTS 0x0d01011c +#define OID_802_11_ADD_KEY 0x0d01011d +#define OID_802_11_REMOVE_KEY 0x0d01011e +#define OID_802_11_ASSOCIATION_INFORMATION 0x0d01011f +#define OID_802_11_TEST 0x0d010120 +#define OID_802_11_MEDIA_STREAM_MODE 0x0d010121 +#define OID_802_11_CAPABILITY 0x0d010122 +#define OID_802_11_PMKID 0x0d010123 +#define OID_802_11_NON_BCAST_SSID_LIST 0x0d010124 +#define OID_802_11_RADIO_STATUS 0x0d010125 + +#define NDIS_802_11_LENGTH_SSID 32 +#define NDIS_802_11_LENGTH_RATES 8 +#define NDIS_802_11_LENGTH_RATES_EX 16 + +typedef LONG NDIS_802_11_RSSI; + +typedef struct _NDIS_802_11_CONFIGURATION_FH { + ULONG Length; + ULONG HopPattern; + ULONG HopSet; + ULONG DwellTime; +} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH; + +typedef struct _NDIS_802_11_CONFIGURATION { + ULONG Length; + ULONG BeaconPeriod; + ULONG ATIMWindow; + ULONG DSConfig; + NDIS_802_11_CONFIGURATION_FH FHConfig; +} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION; + +typedef UCHAR NDIS_802_11_MAC_ADDRESS[6]; + +typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE { + Ndis802_11IBSS, + Ndis802_11Infrastructure, + Ndis802_11AutoUnknown, + Ndis802_11InfrastructureMax +} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE; + +typedef enum _NDIS_802_11_NETWORK_TYPE { + Ndis802_11FH, + Ndis802_11DS, + Ndis802_11OFDM5, + Ndis802_11OFDM24, + Ndis802_11Automode, + Ndis802_11NetworkTypeMax +} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE; + +typedef UCHAR NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; +typedef UCHAR NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX]; + +typedef struct _NDIS_802_11_SSID { + ULONG SsidLength; + UCHAR Ssid[NDIS_802_11_LENGTH_SSID]; +} NDIS_802_11_SSID, *PNDIS_802_11_SSID; + +typedef struct _NDIS_WLAN_BSSID { + ULONG Length; + NDIS_802_11_MAC_ADDRESS MacAddress; + UCHAR Reserved[2]; + NDIS_802_11_SSID Ssid; + ULONG Privacy; + NDIS_802_11_RSSI Rssi; + NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; + NDIS_802_11_CONFIGURATION Configuration; + NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; + NDIS_802_11_RATES SupportedRates; +} NDIS_WLAN_BSSID, *PNDIS_WLAN_BSSID; + +typedef struct _NDIS_802_11_BSSID_LIST { + ULONG NumberOfItems; + NDIS_WLAN_BSSID Bssid[1]; +} NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST; + +#ifndef _NDIS_ +typedef int NDIS_STATUS, *PNDIS_STATUS; +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* _NTDDNDIS_ */

1 0

Jacek Caban : wininet: Code clean up by using heap_strdup* functions.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 97936252dd55fceaf9bbc85d74dd35d20d9afa80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97936252dd55fceaf9bbc85d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 01:17:13 2009 +0200 wininet: Code clean up by using heap_strdup* functions. --- dlls/wininet/http.c | 26 ++++++-------------------- 1 files changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 6197919..b4f7924 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1074,7 +1074,7 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, { LPWSTR szVerb = NULL, szObjectName = NULL; LPWSTR szVersion = NULL, szReferrer = NULL, *szAcceptTypes = NULL; - INT len, acceptTypesCount; + INT acceptTypesCount; HINTERNET rc = FALSE; LPCSTR *types; @@ -1085,38 +1085,30 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, if (lpszVerb) { - len = MultiByteToWideChar(CP_ACP, 0, lpszVerb, -1, NULL, 0 ); - szVerb = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR) ); + szVerb = heap_strdupAtoW(lpszVerb); if ( !szVerb ) goto end; - MultiByteToWideChar(CP_ACP, 0, lpszVerb, -1, szVerb, len); } if (lpszObjectName) { - len = MultiByteToWideChar(CP_ACP, 0, lpszObjectName, -1, NULL, 0 ); - szObjectName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR) ); + szObjectName = heap_strdupAtoW(lpszObjectName); if ( !szObjectName ) goto end; - MultiByteToWideChar(CP_ACP, 0, lpszObjectName, -1, szObjectName, len ); } if (lpszVersion) { - len = MultiByteToWideChar(CP_ACP, 0, lpszVersion, -1, NULL, 0 ); - szVersion = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + szVersion = heap_strdupAtoW(lpszVersion); if ( !szVersion ) goto end; - MultiByteToWideChar(CP_ACP, 0, lpszVersion, -1, szVersion, len ); } if (lpszReferrer) { - len = MultiByteToWideChar(CP_ACP, 0, lpszReferrer, -1, NULL, 0 ); - szReferrer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + szReferrer = heap_strdupAtoW(lpszReferrer); if ( !szReferrer ) goto end; - MultiByteToWideChar(CP_ACP, 0, lpszReferrer, -1, szReferrer, len ); } if (lpszAcceptTypes) @@ -1151,13 +1143,7 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, __TRY { if (*types && **types) - { - len = MultiByteToWideChar(CP_ACP, 0, *types, -1, NULL, 0 ); - szAcceptTypes[acceptTypesCount] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - - MultiByteToWideChar(CP_ACP, 0, *types, -1, szAcceptTypes[acceptTypesCount], len); - acceptTypesCount++; - } + szAcceptTypes[acceptTypesCount++] = heap_strdupAtoW(*types); } __EXCEPT_PAGE_FAULT {

1 0

Jacek Caban : wininet: Code clean up by using heap_strdup* functions.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 13974e9d5af1995ca133fa1e076c0369bed1b04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13974e9d5af1995ca133fa1e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 02:05:36 2009 +0200 wininet: Code clean up by using heap_strdup* functions. --- dlls/wininet/internet.c | 116 +++++++++++----------------------------------- 1 files changed, 28 insertions(+), 88 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0927e9c..236e1f6 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -693,30 +693,12 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, goto lend; } - if (NULL != lpszAgent) - { - lpwai->lpszAgent = HeapAlloc( GetProcessHeap(),0, - (strlenW(lpszAgent)+1)*sizeof(WCHAR)); - if (lpwai->lpszAgent) - lstrcpyW( lpwai->lpszAgent, lpszAgent ); - } + lpwai->lpszAgent = heap_strdupW(lpszAgent); if(dwAccessType == INTERNET_OPEN_TYPE_PRECONFIG) INTERNET_ConfigureProxy( lpwai ); - else if (NULL != lpszProxy) - { - lpwai->lpszProxy = HeapAlloc( GetProcessHeap(), 0, - (strlenW(lpszProxy)+1)*sizeof(WCHAR)); - if (lpwai->lpszProxy) - lstrcpyW( lpwai->lpszProxy, lpszProxy ); - } - - if (NULL != lpszProxyBypass) - { - lpwai->lpszProxyBypass = HeapAlloc( GetProcessHeap(), 0, - (strlenW(lpszProxyBypass)+1)*sizeof(WCHAR)); - if (lpwai->lpszProxyBypass) - lstrcpyW( lpwai->lpszProxyBypass, lpszProxyBypass ); - } + else + lpwai->lpszProxy = heap_strdupW(lpszProxy); + lpwai->lpszProxyBypass = heap_strdupW(lpszProxyBypass); lend: if( lpwai ) @@ -741,33 +723,15 @@ lend: HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent, DWORD dwAccessType, LPCSTR lpszProxy, LPCSTR lpszProxyBypass, DWORD dwFlags) { - HINTERNET rc = NULL; - INT len; - WCHAR *szAgent = NULL, *szProxy = NULL, *szBypass = NULL; + WCHAR *szAgent, *szProxy, *szBypass; + HINTERNET rc; TRACE("(%s, 0x%08x, %s, %s, 0x%08x)\n", debugstr_a(lpszAgent), dwAccessType, debugstr_a(lpszProxy), debugstr_a(lpszProxyBypass), dwFlags); - if( lpszAgent ) - { - len = MultiByteToWideChar(CP_ACP, 0, lpszAgent, -1, NULL, 0); - szAgent = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpszAgent, -1, szAgent, len); - } - - if( lpszProxy ) - { - len = MultiByteToWideChar(CP_ACP, 0, lpszProxy, -1, NULL, 0); - szProxy = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpszProxy, -1, szProxy, len); - } - - if( lpszProxyBypass ) - { - len = MultiByteToWideChar(CP_ACP, 0, lpszProxyBypass, -1, NULL, 0); - szBypass = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpszProxyBypass, -1, szBypass, len); - } + szAgent = heap_strdupAtoW(lpszAgent); + szProxy = heap_strdupAtoW(lpszProxy); + szBypass = heap_strdupAtoW(lpszProxyBypass); rc = InternetOpenW(szAgent, dwAccessType, szProxy, szBypass, dwFlags); @@ -1025,30 +989,13 @@ HINTERNET WINAPI InternetConnectA(HINTERNET hInternet, DWORD dwService, DWORD dwFlags, DWORD_PTR dwContext) { HINTERNET rc = NULL; - INT len = 0; - LPWSTR szServerName = NULL; - LPWSTR szUserName = NULL; - LPWSTR szPassword = NULL; - - if (lpszServerName) - { - len = MultiByteToWideChar(CP_ACP, 0, lpszServerName, -1, NULL, 0); - szServerName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpszServerName, -1, szServerName, len); - } - if (lpszUserName) - { - len = MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, NULL, 0); - szUserName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpszUserName, -1, szUserName, len); - } - if (lpszPassword) - { - len = MultiByteToWideChar(CP_ACP, 0, lpszPassword, -1, NULL, 0); - szPassword = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, lpszPassword, -1, szPassword, len); - } + LPWSTR szServerName; + LPWSTR szUserName; + LPWSTR szPassword; + szServerName = heap_strdupAtoW(lpszServerName); + szUserName = heap_strdupAtoW(lpszUserName); + szPassword = heap_strdupAtoW(lpszPassword); rc = InternetConnectW(hInternet, szServerName, nServerPort, szUserName, szPassword, dwService, dwFlags, dwContext); @@ -2590,16 +2537,12 @@ BOOL WINAPI InternetTimeToSystemTimeA( LPCSTR string, SYSTEMTIME* time, DWORD re { BOOL ret = FALSE; WCHAR *stringW; - int len; TRACE( "%s %p 0x%08x\n", debugstr_a(string), time, reserved ); - len = MultiByteToWideChar( CP_ACP, 0, string, -1, NULL, 0 ); - stringW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - + stringW = heap_strdupAtoW(string); if (stringW) { - MultiByteToWideChar( CP_ACP, 0, string, -1, stringW, len ); ret = InternetTimeToSystemTimeW( stringW, time, reserved ); HeapFree( GetProcessHeap(), 0, stringW ); } @@ -2806,17 +2749,18 @@ End: */ BOOL WINAPI InternetCheckConnectionA(LPCSTR lpszUrl, DWORD dwFlags, DWORD dwReserved) { - WCHAR *szUrl; - INT len; + WCHAR *url = NULL; BOOL rc; - len = MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, NULL, 0); - if (!(szUrl = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)))) - return FALSE; - MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, szUrl, len); - rc = InternetCheckConnectionW(szUrl, dwFlags, dwReserved); - HeapFree(GetProcessHeap(), 0, szUrl); - + if(lpszUrl) { + url = heap_strdupAtoW(lpszUrl); + if(!url) + return FALSE; + } + + rc = InternetCheckConnectionW(url, dwFlags, dwReserved); + + HeapFree(GetProcessHeap(), 0, url); return rc; } @@ -3018,20 +2962,16 @@ HINTERNET WINAPI InternetOpenUrlA(HINTERNET hInternet, LPCSTR lpszUrl, LPCSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext) { HINTERNET rc = NULL; - - INT lenUrl; - INT lenHeaders = 0; + DWORD lenHeaders = 0; LPWSTR szUrl = NULL; LPWSTR szHeaders = NULL; TRACE("\n"); if(lpszUrl) { - lenUrl = MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, NULL, 0 ); - szUrl = HeapAlloc(GetProcessHeap(), 0, lenUrl*sizeof(WCHAR)); + szUrl = heap_strdupAtoW(lpszUrl); if(!szUrl) return NULL; - MultiByteToWideChar(CP_ACP, 0, lpszUrl, -1, szUrl, lenUrl); } if(lpszHeaders) {

1 0

Jacek Caban : wininet: Rename WININET_strdup_WtoA to heap_strdupWtoA.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 5d6f01b76bbbc03cbc8da3786aa9664dd4053a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6f01b76bbbc03cbc8da3786… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 01:12:04 2009 +0200 wininet: Rename WININET_strdup_WtoA to heap_strdupWtoA. --- dlls/wininet/ftp.c | 2 +- dlls/wininet/internet.h | 15 ++++++++++----- dlls/wininet/utility.c | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ed7dbe8..dbb54cb 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2609,7 +2609,7 @@ static BOOL FTP_SendCommand(INT nSocket, FTP_COMMAND ftpCmd, LPCWSTR lpszParam, INTERNET_STATUS_CALLBACK lpfnStatusCB, object_header_t *hdr, DWORD_PTR dwContext) { BOOL ret; - LPSTR lpszParamA = lpszParam?WININET_strdup_WtoA(lpszParam):NULL; + LPSTR lpszParamA = heap_strdupWtoA(lpszParam); ret = FTP_SendCommandA(nSocket, ftpCmd, lpszParamA, lpfnStatusCB, hdr, dwContext); HeapFree(GetProcessHeap(), 0, lpszParamA); return ret; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e13e70b..39d8083 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -87,12 +87,17 @@ static inline WCHAR *heap_strdupAtoW(const char *str) return ret; } -static inline LPSTR WININET_strdup_WtoA( LPCWSTR str ) +static inline char *heap_strdupWtoA(LPCWSTR str) { - int len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); - LPSTR ret = HeapAlloc( GetProcessHeap(), 0, len ); - if (ret) - WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL); + char *ret = NULL; + + if(str) { + DWORD size = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, NULL, NULL); + ret = HeapAlloc(GetProcessHeap(), 0, size); + if(ret) + WideCharToMultiByte(CP_ACP, 0, str, -1, ret, size, NULL, NULL); + } + return ret; } diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 93c51cd..66fbecd 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -324,7 +324,7 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, break; case INTERNET_STATUS_RESOLVING_NAME: case INTERNET_STATUS_REDIRECT: - lpvNewInfo = WININET_strdup_WtoA(lpvStatusInfo); + lpvNewInfo = heap_strdupWtoA(lpvStatusInfo); break; } }

1 0

Jacek Caban : wininet: Rename WININET_strdup_AtoW to heap_strdupAtoW and handle NULL argument in its implementation .
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: e09dfcfa99b581a9421c91fb98dbf0ea63ecdd44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09dfcfa99b581a9421c91fb9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 01:11:24 2009 +0200 wininet: Rename WININET_strdup_AtoW to heap_strdupAtoW and handle NULL argument in its implementation. --- dlls/wininet/ftp.c | 32 ++++++++++++++++---------------- dlls/wininet/internet.h | 17 ++++++++++++----- dlls/wininet/utility.c | 2 +- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index c3e0287..ed7dbe8 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -228,8 +228,8 @@ BOOL WINAPI FtpPutFileA(HINTERNET hConnect, LPCSTR lpszLocalFile, LPWSTR lpwzNewRemoteFile; BOOL ret; - lpwzLocalFile = lpszLocalFile?WININET_strdup_AtoW(lpszLocalFile):NULL; - lpwzNewRemoteFile = lpszNewRemoteFile?WININET_strdup_AtoW(lpszNewRemoteFile):NULL; + lpwzLocalFile = heap_strdupAtoW(lpszLocalFile); + lpwzNewRemoteFile = heap_strdupAtoW(lpszNewRemoteFile); ret = FtpPutFileW(hConnect, lpwzLocalFile, lpwzNewRemoteFile, dwFlags, dwContext); HeapFree(GetProcessHeap(), 0, lpwzLocalFile); @@ -413,7 +413,7 @@ BOOL WINAPI FtpSetCurrentDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory) LPWSTR lpwzDirectory; BOOL ret; - lpwzDirectory = lpszDirectory?WININET_strdup_AtoW(lpszDirectory):NULL; + lpwzDirectory = heap_strdupAtoW(lpszDirectory); ret = FtpSetCurrentDirectoryW(hConnect, lpwzDirectory); HeapFree(GetProcessHeap(), 0, lpwzDirectory); return ret; @@ -559,7 +559,7 @@ BOOL WINAPI FtpCreateDirectoryA(HINTERNET hConnect, LPCSTR lpszDirectory) LPWSTR lpwzDirectory; BOOL ret; - lpwzDirectory = lpszDirectory?WININET_strdup_AtoW(lpszDirectory):NULL; + lpwzDirectory = heap_strdupAtoW(lpszDirectory); ret = FtpCreateDirectoryW(hConnect, lpwzDirectory); HeapFree(GetProcessHeap(), 0, lpwzDirectory); return ret; @@ -708,7 +708,7 @@ HINTERNET WINAPI FtpFindFirstFileA(HINTERNET hConnect, LPWIN32_FIND_DATAW lpFindFileDataW; HINTERNET ret; - lpwzSearchFile = lpszSearchFile?WININET_strdup_AtoW(lpszSearchFile):NULL; + lpwzSearchFile = heap_strdupAtoW(lpszSearchFile); lpFindFileDataW = lpFindFileData?&wfd:NULL; ret = FtpFindFirstFileW(hConnect, lpwzSearchFile, lpFindFileDataW, dwFlags, dwContext); HeapFree(GetProcessHeap(), 0, lpwzSearchFile); @@ -1034,7 +1034,7 @@ static BOOL FTP_FtpGetCurrentDirectoryW(ftp_session_t *lpwfs, LPWSTR lpszCurrent if (nResCode == 257) /* Extract directory name */ { DWORD firstpos, lastpos, len; - LPWSTR lpszResponseBuffer = WININET_strdup_AtoW(INTERNET_GetResponseBuffer()); + LPWSTR lpszResponseBuffer = heap_strdupAtoW(INTERNET_GetResponseBuffer()); for (firstpos = 0, lastpos = 0; lpszResponseBuffer[lastpos]; lastpos++) { @@ -1355,7 +1355,7 @@ HINTERNET WINAPI FtpOpenFileA(HINTERNET hFtpSession, LPWSTR lpwzFileName; HINTERNET ret; - lpwzFileName = lpszFileName?WININET_strdup_AtoW(lpszFileName):NULL; + lpwzFileName = heap_strdupAtoW(lpszFileName); ret = FtpOpenFileW(hFtpSession, lpwzFileName, fdwAccess, dwFlags, dwContext); HeapFree(GetProcessHeap(), 0, lpwzFileName); return ret; @@ -1469,8 +1469,8 @@ BOOL WINAPI FtpGetFileA(HINTERNET hInternet, LPCSTR lpszRemoteFile, LPCSTR lpszN LPWSTR lpwzNewFile; BOOL ret; - lpwzRemoteFile = lpszRemoteFile?WININET_strdup_AtoW(lpszRemoteFile):NULL; - lpwzNewFile = lpszNewFile?WININET_strdup_AtoW(lpszNewFile):NULL; + lpwzRemoteFile = heap_strdupAtoW(lpszRemoteFile); + lpwzNewFile = heap_strdupAtoW(lpszNewFile); ret = FtpGetFileW(hInternet, lpwzRemoteFile, lpwzNewFile, fFailIfExists, dwLocalFlagsAttribute, dwInternetFlags, dwContext); HeapFree(GetProcessHeap(), 0, lpwzRemoteFile); @@ -1676,7 +1676,7 @@ BOOL WINAPI FtpDeleteFileA(HINTERNET hFtpSession, LPCSTR lpszFileName) LPWSTR lpwzFileName; BOOL ret; - lpwzFileName = lpszFileName?WININET_strdup_AtoW(lpszFileName):NULL; + lpwzFileName = heap_strdupAtoW(lpszFileName); ret = FtpDeleteFileW(hFtpSession, lpwzFileName); HeapFree(GetProcessHeap(), 0, lpwzFileName); return ret; @@ -1821,7 +1821,7 @@ BOOL WINAPI FtpRemoveDirectoryA(HINTERNET hFtpSession, LPCSTR lpszDirectory) LPWSTR lpwzDirectory; BOOL ret; - lpwzDirectory = lpszDirectory?WININET_strdup_AtoW(lpszDirectory):NULL; + lpwzDirectory = heap_strdupAtoW(lpszDirectory); ret = FtpRemoveDirectoryW(hFtpSession, lpwzDirectory); HeapFree(GetProcessHeap(), 0, lpwzDirectory); return ret; @@ -1968,8 +1968,8 @@ BOOL WINAPI FtpRenameFileA(HINTERNET hFtpSession, LPCSTR lpszSrc, LPCSTR lpszDes LPWSTR lpwzDest; BOOL ret; - lpwzSrc = lpszSrc?WININET_strdup_AtoW(lpszSrc):NULL; - lpwzDest = lpszDest?WININET_strdup_AtoW(lpszDest):NULL; + lpwzSrc = heap_strdupAtoW(lpszSrc); + lpwzDest = heap_strdupAtoW(lpszDest); ret = FtpRenameFileW(hFtpSession, lpwzSrc, lpwzDest); HeapFree(GetProcessHeap(), 0, lpwzSrc); HeapFree(GetProcessHeap(), 0, lpwzDest); @@ -2131,7 +2131,7 @@ BOOL WINAPI FtpCommandA( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags return FALSE; } - if (!(cmdW = WININET_strdup_AtoW(lpszCommand))) + if (!(cmdW = heap_strdupAtoW(lpszCommand))) { INTERNET_SetLastError(ERROR_OUTOFMEMORY); return FALSE; @@ -3578,7 +3578,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT pszToken = strtok(NULL, szSpace); if(!pszToken) continue; - lpfp->lpszName = WININET_strdup_AtoW(pszToken); + lpfp->lpszName = heap_strdupAtoW(pszToken); TRACE("File: %s\n", debugstr_w(lpfp->lpszName)); } /* NT way of parsing ... : @@ -3627,7 +3627,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT pszToken = strtok(NULL, szSpace); if(!pszToken) continue; - lpfp->lpszName = WININET_strdup_AtoW(pszToken); + lpfp->lpszName = heap_strdupAtoW(pszToken); TRACE("Name: %s\n", debugstr_w(lpfp->lpszName)); } /* EPLF format - http://cr.yp.to/ftp/list/eplf.html */ diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c51fc93..e13e70b 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -71,12 +71,19 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } -static inline LPWSTR WININET_strdup_AtoW( LPCSTR str ) +static inline WCHAR *heap_strdupAtoW(const char *str) { - int len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0); - LPWSTR ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - if (ret) - MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len); + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + return ret; } diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index dc5041a..93c51cd 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -306,7 +306,7 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, case INTERNET_STATUS_NAME_RESOLVED: case INTERNET_STATUS_CONNECTING_TO_SERVER: case INTERNET_STATUS_CONNECTED_TO_SERVER: - lpvNewInfo = WININET_strdup_AtoW(lpvStatusInfo); + lpvNewInfo = heap_strdupAtoW(lpvStatusInfo); break; case INTERNET_STATUS_RESOLVING_NAME: case INTERNET_STATUS_REDIRECT:

1 0

Jacek Caban : wininet: Rename WININET_strdupW to standard heap_strdupW.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: f5987092120cdbb1e7e4e96b6667415261225276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5987092120cdbb1e7e4e96b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 01:10:41 2009 +0200 wininet: Rename WININET_strdupW to standard heap_strdupW. --- dlls/wininet/ftp.c | 36 ++++++++++++--------------- dlls/wininet/http.c | 63 +++++++++++++++++++++-------------------------- dlls/wininet/internet.c | 9 ++---- dlls/wininet/internet.h | 15 +++++++++-- dlls/wininet/utility.c | 2 +- 5 files changed, 60 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5987092120cdbb1e7e4e…

1 0

Ricardo Filipe : winefile: Fix Portuguese translation.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: b465a7daa5d9f5e0e010815917b30afe2ff71e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b465a7daa5d9f5e0e01081591… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Thu Jul 16 12:13:08 2009 -0700 winefile: Fix Portuguese translation. --- programs/winefile/Pt.rc | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git a/programs/winefile/Pt.rc b/programs/winefile/Pt.rc index 5bf0c6b..d95b0d5 100644 --- a/programs/winefile/Pt.rc +++ b/programs/winefile/Pt.rc @@ -385,7 +385,7 @@ STRINGTABLE } -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE { @@ -394,29 +394,12 @@ STRINGTABLE IDS_ROOT_FS "root fs" IDS_UNIXFS "unixfs" IDS_DESKTOP "Área de trabalho" - IDS_SHELL "Shell" - IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Ainda não implementado" - IDS_WINE_FILE "Wine File" -} - -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE - -STRINGTABLE -{ - IDS_WINEFILE "Winefile" - IDS_ERROR "Erro" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" - IDS_DESKTOP "Ecrã" - IDS_SHELL "Linha de Comandos" + IDS_SHELL "Linha de comandos" IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Ainda não implementado" IDS_WINE_FILE "Ficheiro Wine" } -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - STRINGTABLE { IDS_COL_NAME "Nome"

1 0

Vladimir Pankratov : cmd: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: e03b9197cb8abd7898dea64158d97eb349aa88bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03b9197cb8abd7898dea6415… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 16 22:53:50 2009 +0500 cmd: Convert the Russian resources to UTF-8. --- programs/cmd/Ru.rc | 365 ++++++++++++++++++++++++++-------------------------- 1 files changed, 184 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e03b9197cb8abd7898dea…

1 0

Ricardo Filipe : appwiz.cpl: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: f8f8783a43f5fac17052680ceacf750a924b3c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f8783a43f5fac17052680ce… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Thu Jul 16 12:06:52 2009 -0700 appwiz.cpl: Update Portuguese translation and convert to UTF8. --- dlls/appwiz.cpl/Pt.rc | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/appwiz.cpl/Pt.rc b/dlls/appwiz.cpl/Pt.rc index b62bcf2..4abcb50 100644 --- a/dlls/appwiz.cpl/Pt.rc +++ b/dlls/appwiz.cpl/Pt.rc @@ -21,23 +21,26 @@ #include "res.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE { IDS_CPL_TITLE, "Adicionar/Remover Programas" - IDS_CPL_DESC, "Permite a instala��o de novo software, ou a remo��o de software existente no seu computador." - IDS_TAB1_TITLE, "Aplica��es" + IDS_CPL_DESC, "Permite a instalação de novo software, ou a remoção de software existente no seu computador." + IDS_TAB1_TITLE, "Aplicações" - IDS_UNINSTALL_FAILED, "N�o foi poss�vel executar o desinstalador, '%s'. Deseja remover do registo a entrada de desinstala��o para este programa?" - IDS_NOT_SPECIFIED, "N�o especificado" + IDS_UNINSTALL_FAILED, "Não foi possível executar o desinstalador, '%s'. Deseja remover do registo a entrada de desinstalação para este programa?" + IDS_NOT_SPECIFIED, "Não especificado" IDS_COLUMN_NAME, "Nome" IDS_COLUMN_PUBLISHER, "Editor" - IDS_COLUMN_VERSION, "Vers�o" + IDS_COLUMN_VERSION, "Versão" + IDS_INSTALL_FILTER, "Programas de Instalação\0*instal*.exe;*setup*.exe;*.msi\0Programas (*.exe)\0*.exe\0Todos os ficheiros (*.*)\0*.*\0\0" IDS_REMOVE, "&Remover..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "&Modificar/Remover..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -45,33 +48,33 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Instalar/Desinstalar" FONT 8, "MS Shell Dlg" { - CONTROL "Para instalar um programa novo a partir de uma disquete, CD-ROM ou do seu disco r�gido clique em Instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Para instalar um programa novo a partir de uma disquete, CD-ROM ou do seu disco rígido clique em Instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Instalar...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 CONTROL "O software seguinte pode ser automaticamente removido. Para remover um programa ou modificar os seus componentes instalados seleccione-o da lista e clique em Adicionar/Remover.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "&Informa��o de Suporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Informação de Suporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Modificar...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "&Remover...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Informa��o de Suporte" +CAPTION "Informação de Suporte" FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 - CONTROL "A informa��o seguinte pode ser usada para obter suporte t�cnico para %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "A informação seguinte pode ser usada para obter suporte técnico para %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 CONTROL "Editor:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 - CONTROL "Vers�o:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Versão:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 CONTROL "Contacto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 - CONTROL "Informa��o de Suporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Informação de Suporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 CONTROL "Telefone de Suporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 CONTROL "Readme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 - CONTROL "Updates Producto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 - CONTROL "Coment�rios:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "Actualizações de Produto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Comentários:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8

1 0

Juan Lang : ws2_32: Make sure sockaddr is big enough when formatting an IPv6 address.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: 778a1d85c48fe41b70bfed48252de7ba2c05f337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=778a1d85c48fe41b70bfed482… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 16 08:48:32 2009 -0700 ws2_32: Make sure sockaddr is big enough when formatting an IPv6 address. --- dlls/ws2_32/socket.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 88b2b22..0df61c7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4933,12 +4933,13 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, TRACE( "(%p, %d, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); - if (!sockaddr || len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR; + if (!sockaddr) return SOCKET_ERROR; if (!string || !lenstr) return SOCKET_ERROR; switch(sockaddr->sa_family) { case WS_AF_INET: + if (len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR; sprintf( buffer, "%u.%u.%u.%u:%u", (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 24 & 0xff), (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 16 & 0xff), @@ -4954,6 +4955,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, { struct WS_sockaddr_in6 *sockaddr6 = (LPSOCKADDR_IN6) sockaddr; + if (len < sizeof(SOCKADDR_IN6)) return SOCKET_ERROR; if (!WS_inet_ntop(WS_AF_INET6, &sockaddr6->sin6_addr, buffer, sizeof(buffer))) { WSASetLastError(WSAEINVAL);

1 0

Juan Lang : ws2_32: Remove an unnecessary cast.
by Alexandre Julliard July 17, 2009

July 17, 2009

Module: wine Branch: master Commit: a9a1cd269c4d9a30a187ba723d25397d8117ed51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a1cd269c4d9a30a187ba723… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 16 08:46:20 2009 -0700 ws2_32: Remove an unnecessary cast. --- dlls/ws2_32/socket.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 464e890..88b2b22 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4936,8 +4936,7 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, if (!sockaddr || len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR; if (!string || !lenstr) return SOCKET_ERROR; - /* sin_family is guaranteed to be the first u_short */ - switch(((SOCKADDR_IN *)sockaddr)->sin_family) + switch(sockaddr->sa_family) { case WS_AF_INET: sprintf( buffer, "%u.%u.%u.%u:%u",

1 0

Alexandre Julliard : uuid: Include some more headers.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: f59a3097f296f05e5d132fa8ee4b0297a9c58423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59a3097f296f05e5d132fa8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 16:36:38 2009 +0200 uuid: Include some more headers. --- dlls/msctf/msctf.c | 1 - dlls/uuid/uuid.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 7f0349f..8277278 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -33,7 +33,6 @@ #include "shlwapi.h" #include "shlguid.h" #include "comcat.h" -#include "initguid.h" #include "msctf.h" #include "msctf_internal.h" diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index f7f4c3b..afb9abd 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -77,6 +77,10 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "objsafe.h" #include "perhist.h" #include "netcon.h" +#include "netfw.h" +#include "msctf.h" +#include "sensevts.h" +#include "ocmm.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

Joel Holdsworth : gdi32/tests: Added tests for BitBlt.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 91f458314b644fe6714cb38bd79961f5dff64706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f458314b644fe6714cb38bd… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Jul 15 22:08:45 2009 +0100 gdi32/tests: Added tests for BitBlt. --- dlls/gdi32/tests/bitmap.c | 79 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 660a145..8666da2 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2252,6 +2252,84 @@ static void test_get16dibits(void) ReleaseDC(NULL, screen_dc); } +static void check_BitBlt_pixel(HDC hdcDst, HDC hdcSrc, UINT32 *dstBuffer, UINT32 *srcBuffer, + DWORD dwRop, UINT32 expected, int line) +{ + *srcBuffer = 0xFEDCBA98; + *dstBuffer = 0x89ABCDEF; + Rectangle(hdcSrc, 0, 0, 1, 1); /* A null operation to ensure dibs are coerced to X11 */ + BitBlt(hdcDst, 0, 0, 1, 1, hdcSrc, 0, 0, dwRop); + ok(expected == *dstBuffer, + "BitBlt with dwRop %06X. Expected 0x%08X, got 0x%08X from line %d\n", + dwRop, expected, *dstBuffer, line); +} + +static void test_BitBlt(void) +{ + HBITMAP bmpDst, bmpSrc; + HBITMAP oldDst, oldSrc; + HDC hdcScreen, hdcDst, hdcSrc; + UINT32 *dstBuffer, *srcBuffer; + HBRUSH hBrush, hOldBrush; + BITMAPINFO bitmapInfo; + + memset(&bitmapInfo, 0, sizeof(BITMAPINFO)); + bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmapInfo.bmiHeader.biWidth = 1; + bitmapInfo.bmiHeader.biHeight = 1; + bitmapInfo.bmiHeader.biPlanes = 1; + bitmapInfo.bmiHeader.biBitCount = 32; + bitmapInfo.bmiHeader.biCompression = BI_RGB; + bitmapInfo.bmiHeader.biSizeImage = sizeof(UINT32); + + hdcScreen = CreateCompatibleDC(0); + hdcDst = CreateCompatibleDC(hdcScreen); + hdcSrc = CreateCompatibleDC(hdcDst); + + /* Setup the destination dib section */ + bmpDst = CreateDIBSection(hdcScreen, &bitmapInfo, DIB_RGB_COLORS, (void**)&dstBuffer, + NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); + + hBrush = CreateSolidBrush(0x012345678); + hOldBrush = SelectObject(hdcDst, hBrush); + + /* Setup the source dib section */ + bmpSrc = CreateDIBSection(hdcScreen, &bitmapInfo, DIB_RGB_COLORS, (void**)&srcBuffer, + NULL, 0); + oldSrc = SelectObject(hdcSrc, bmpSrc); + + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, SRCCOPY, 0xFEDCBA98, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, SRCPAINT, 0xFFFFFFFF, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, SRCAND, 0x88888888, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, SRCINVERT, 0x77777777, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, SRCERASE, 0x76543210, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, NOTSRCCOPY, 0x01234567, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, NOTSRCERASE, 0x00000000, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, MERGECOPY, 0x00581210, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, MERGEPAINT, 0x89ABCDEF, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, PATCOPY, 0x00785634, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, PATPAINT, 0x89FBDFFF, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, PATINVERT, 0x89D39BDB, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, DSTINVERT, 0x76543210, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, BLACKNESS, 0x00000000, __LINE__); + check_BitBlt_pixel(hdcDst, hdcSrc, dstBuffer, srcBuffer, WHITENESS, 0xFFFFFFFF, __LINE__); + + /* Tidy up */ + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + DeleteDC(hdcSrc); + + SelectObject(hdcDst, hOldBrush); + DeleteObject(hBrush); + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + DeleteDC(hdcDst); + + + DeleteDC(hdcScreen); +} + static void test_GdiAlphaBlend(void) { /* test out-of-bound parameters for GdiAlphaBlend */ @@ -2393,6 +2471,7 @@ START_TEST(bitmap) test_GetDIBits_BI_BITFIELDS(); test_select_object(); test_CreateBitmap(); + test_BitBlt(); test_GdiAlphaBlend(); test_bitmapinfoheadersize(); test_get16dibits();

1 0

Paul Vriens : winhttp: Fix a crash on Vista and higher.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 4e370f74f789164aa207e3fe0536fb8aeefde069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e370f74f789164aa207e3fe0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 16 15:47:38 2009 +0200 winhttp: Fix a crash on Vista and higher. --- dlls/winhttp/tests/winhttp.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 78c4777..bce91fe 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -905,10 +905,14 @@ static void test_set_default_proxy_config(void) len = get_default_proxy_reg_value( saved_proxy_settings, len, &type ); } - SetLastError(0xdeadbeef); - ret = WinHttpSetDefaultProxyConfiguration(NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + if (0) + { + /* Crashes on Vista and higher */ + SetLastError(0xdeadbeef); + ret = WinHttpSetDefaultProxyConfiguration(NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } /* test with invalid access type */ info.dwAccessType = 0xdeadbeef;

1 0

Vitaliy Margolen : shell32: Export IsUserAnAdmin by name as well.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: d2117c14ba72b3fb3160034e11d4e431f22f9c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2117c14ba72b3fb3160034e1… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Jul 16 07:15:22 2009 -0600 shell32: Export IsUserAnAdmin by name as well. --- dlls/shell32/shell32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 433ed3a..2eb5934 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -251,7 +251,7 @@ 654 stdcall @(long long) shell32_654 # ReadCabinetState(a)8 660 stdcall -noname FileIconInit(long) - 680 stdcall -noname IsUserAnAdmin() + 680 stdcall IsUserAnAdmin() 704 stdcall -noname GUIDFromStringW(wstr ptr)

1 0

Henri Verbeet : wined3d: Recognize the SM4 dp4 opcode.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 50f5abcad97def3cc0c47c8c5fbff62003bfcbce URL: http://source.winehq.org/git/wine.git/?a=commit;h=50f5abcad97def3cc0c47c8c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 13:08:25 2009 +0200 wined3d: Recognize the SM4 dp4 opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 30e9862..8686232 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -50,6 +50,7 @@ enum wined3d_sm4_opcode { WINED3D_SM4_OP_ADD = 0x00, WINED3D_SM4_OP_DP3 = 0x10, + WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MUL = 0x38, @@ -99,6 +100,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = { {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, + {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2},

1 0

Henri Verbeet : wined3d: Recognize the SM4 dp3 opcode.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 03acf9d2074a3335408fe5d9c85bfce356a7ff1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=03acf9d2074a3335408fe5d9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 13:08:24 2009 +0200 wined3d: Recognize the SM4 dp3 opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 418e7b2..30e9862 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); enum wined3d_sm4_opcode { WINED3D_SM4_OP_ADD = 0x00, + WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MUL = 0x38, @@ -97,6 +98,7 @@ struct sysval_map static const struct wined3d_sm4_opcode_info opcode_table[] = { {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, + {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2},

1 0

Henri Verbeet : wined3d: Recognize the SM4 rsq opcode.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 7539cd5c8554d4738cbbcd0c389ef59c7d70669a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7539cd5c8554d4738cbbcd0c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 13:08:23 2009 +0200 wined3d: Recognize the SM4 rsq opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f5c3e65..418e7b2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -53,6 +53,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_RET = 0x3e, + WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_SINCOS = 0x4d, }; @@ -100,6 +101,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0}, + {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 1, 2}, };

1 0

Henri Verbeet : wined3d: Recognize the SM4 constant buffer register type.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: d6ffe00cd271257e9c81cbf57fb5b3d4e3416cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ffe00cd271257e9c81cbf57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 13:08:22 2009 +0200 wined3d: Recognize the SM4 constant buffer register type. --- dlls/wined3d/baseshader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 23 ++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 4b9c445..e1e1f21 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -928,6 +928,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("l"); break; + case WINED3DSPR_CONSTBUFFER: + TRACE("cb"); + break; + default: TRACE("unhandled_rtype(%#x)", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 57a365b..f5c3e65 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -58,10 +58,11 @@ enum wined3d_sm4_opcode enum wined3d_sm4_register_type { - WINED3D_SM4_RT_TEMP = 0x0, - WINED3D_SM4_RT_INPUT = 0x1, - WINED3D_SM4_RT_OUTPUT = 0x2, - WINED3D_SM4_RT_IMMCONST = 0x4, + WINED3D_SM4_RT_TEMP = 0x0, + WINED3D_SM4_RT_INPUT = 0x1, + WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_IMMCONST = 0x4, + WINED3D_SM4_RT_CONSTBUFFER = 0x8, }; enum wined3d_sm4_immconst_type @@ -104,11 +105,15 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = { - /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, - /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, - /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, - /* UNKNOWN */ 0, - /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, + /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, + /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, + /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, }; static const struct sysval_map sysval_map[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e9aa93..ae09827 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -325,6 +325,7 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE WINED3DSPR_LABEL = 18, WINED3DSPR_PREDICATE = 19, WINED3DSPR_IMMCONST, + WINED3DSPR_CONSTBUFFER, } WINED3DSHADER_PARAM_REGISTER_TYPE; enum wined3d_immconst_type

1 0

Henri Verbeet : wined3d: Recognize SM4 arrays.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: c4f8845bc94dc6f26aed0bb62b98faba12a83a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f8845bc94dc6f26aed0bb62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 13:08:21 2009 +0200 wined3d: Recognize SM4 arrays. This is for SM4 constant buffers, which look like cb<x>[<y>]. At some later point we should probably translate pre-SM4 constants to constant buffers. --- dlls/wined3d/baseshader.c | 25 +++++++++++++++++++------ dlls/wined3d/shader_sm1.c | 2 ++ dlls/wined3d/shader_sm4.c | 28 +++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 0c2ede1..4b9c445 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -956,14 +956,27 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, } else if (reg->type != WINED3DSPR_RASTOUT && reg->type != WINED3DSPR_MISCTYPE) { - if (reg->rel_addr) + if (reg->array_idx != ~0U) { - TRACE("["); - shader_dump_src_param(reg->rel_addr, shader_version); - TRACE(" + "); + TRACE("%u[%u", offset, reg->array_idx); + if (reg->rel_addr) + { + TRACE(" + "); + shader_dump_src_param(reg->rel_addr, shader_version); + } + TRACE("]"); + } + else + { + if (reg->rel_addr) + { + TRACE("["); + shader_dump_src_param(reg->rel_addr, shader_version); + TRACE(" + "); + } + TRACE("%u", offset); + if (reg->rel_addr) TRACE("]"); } - TRACE("%u", offset); - if (reg->rel_addr) TRACE("]"); } } diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index a626d52..ead2769 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -349,6 +349,7 @@ static void shader_parse_src_param(DWORD param, const struct wined3d_shader_src_ src->reg.type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); src->reg.idx = param & WINED3DSP_REGNUM_MASK; + src->reg.array_idx = ~0U; src->swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; src->modifiers = (param & WINED3DSP_SRCMOD_MASK) >> WINED3DSP_SRCMOD_SHIFT; src->reg.rel_addr = rel_addr; @@ -360,6 +361,7 @@ static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_ dst->reg.type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); dst->reg.idx = param & WINED3DSP_REGNUM_MASK; + dst->reg.array_idx = ~0U; dst->write_mask = (param & WINED3D_SM1_WRITEMASK_MASK) >> WINED3D_SM1_WRITEMASK_SHIFT; dst->modifiers = (param & WINED3DSP_DSTMOD_MASK) >> WINED3DSP_DSTMOD_SHIFT; dst->shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5cc445d..57a365b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -28,6 +28,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3D_SM4_OPCODE_MASK 0xff +#define WINED3D_SM4_REGISTER_ORDER_SHIFT 20 +#define WINED3D_SM4_REGISTER_ORDER_MASK (0x3 << WINED3D_SM4_REGISTER_ORDER_SHIFT) + #define WINED3D_SM4_REGISTER_TYPE_SHIFT 12 #define WINED3D_SM4_REGISTER_TYPE_MASK (0xf << WINED3D_SM4_REGISTER_TYPE_SHIFT) @@ -265,6 +268,7 @@ static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wine struct wined3d_sm4_data *priv = data; DWORD token = *(*ptr)++; enum wined3d_sm4_register_type register_type; + DWORD order; register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)) @@ -277,6 +281,16 @@ static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wine src_param->reg.type = register_type_table[register_type]; } + order = (token & WINED3D_SM4_REGISTER_ORDER_MASK) >> WINED3D_SM4_REGISTER_ORDER_SHIFT; + + if (order < 1) src_param->reg.idx = ~0U; + else src_param->reg.idx = *(*ptr)++; + + if (order < 2) src_param->reg.array_idx = ~0U; + else src_param->reg.array_idx = *(*ptr)++; + + if (order > 2) FIXME("Unhandled order %u.\n", order); + if (register_type == WINED3D_SM4_RT_IMMCONST) { enum wined3d_sm4_immconst_type immconst_type = @@ -304,7 +318,6 @@ static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wine } else { - src_param->reg.idx = *(*ptr)++; src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; } @@ -319,8 +332,8 @@ static void shader_sm4_read_dst_param(void *data, const DWORD **ptr, struct wine { struct wined3d_sm4_data *priv = data; DWORD token = *(*ptr)++; - UINT register_idx = *(*ptr)++; enum wined3d_sm4_register_type register_type; + DWORD order; register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)) @@ -333,7 +346,16 @@ static void shader_sm4_read_dst_param(void *data, const DWORD **ptr, struct wine dst_param->reg.type = register_type_table[register_type]; } - dst_param->reg.idx = register_idx; + order = (token & WINED3D_SM4_REGISTER_ORDER_MASK) >> WINED3D_SM4_REGISTER_ORDER_SHIFT; + + if (order < 1) dst_param->reg.idx = ~0U; + else dst_param->reg.idx = *(*ptr)++; + + if (order < 2) dst_param->reg.array_idx = ~0U; + else dst_param->reg.array_idx = *(*ptr)++; + + if (order > 2) FIXME("Unhandled order %u.\n", order); + dst_param->write_mask = (token & WINED3D_SM4_WRITEMASK_MASK) >> WINED3D_SM4_WRITEMASK_SHIFT; dst_param->modifiers = 0; dst_param->shift = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 68f2e4c..1e9aa93 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -670,6 +670,7 @@ struct wined3d_shader_register { WINED3DSHADER_PARAM_REGISTER_TYPE type; UINT idx; + UINT array_idx; const struct wined3d_shader_src_param *rel_addr; enum wined3d_immconst_type immconst_type; DWORD immconst_data[4];

1 0

David Adam : d3dx9: Remove a failing test in Windows.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: f24bf3e4bd78f65f56a67df292c40864294693a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24bf3e4bd78f65f56a67df29… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Jul 15 21:14:00 2009 +0200 d3dx9: Remove a failing test in Windows. --- dlls/d3dx9_36/tests/math.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index d55a0d4..722198a 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -593,11 +593,6 @@ static void D3DXPlaneTest(void) expectedplane.a = 0.085914f; expectedplane.b = -0.704492f; expectedplane.c = 0.704492f; expectedplane.d = -0.790406f; D3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3); expect_plane(expectedplane, gotplane); - /* Test if 2 vectors are parallels */ - vec3.x = 1.0f; vec3.y = 1.0f; vec3.z = 2.0f; - expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; - D3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3); - expect_plane(expectedplane, gotplane); /*_______________D3DXPlaneIntersectLine___________*/ vec1.x = 9.0f; vec1.y = 6.0f; vec1.z = 3.0f;

1 0

David Adam : d3dx9: Fix D3DXQuaternionToAxisAngle to make tests pass in Windows.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: a3634e2ca32df3f2f284f086e241ed8b78dfeed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3634e2ca32df3f2f284f086e… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Jul 15 21:04:01 2009 +0200 d3dx9: Fix D3DXQuaternionToAxisAngle to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 21 ++++----------------- dlls/d3dx9_36/tests/math.c | 9 ++++----- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index b3f7906..f80a5db 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1373,23 +1373,10 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATE void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle) { - FLOAT norm; - - *pangle = 0.0f; - norm = D3DXQuaternionLength(pq); - if ( norm ) - { - paxis->x = pq->x / norm; - paxis->y = pq->y / norm; - paxis->z = pq->z / norm; - if ( fabs( pq->w ) <= 1.0f ) *pangle = 2.0f * acos(pq->w); - } - else - { - paxis->x = 1.0f; - paxis->y = 0.0f; - paxis->z = 0.0f; - } + paxis->x = pq->x; + paxis->y = pq->y; + paxis->z = pq->z; + *pangle = 2.0f * acos(pq->w); } /*_________________D3DXVec2_____________________*/ diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 1fe12c7..d55a0d4 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -938,20 +938,19 @@ static void D3DXQuaternionTest(void) /*_______________D3DXQuaternionToAxisAngle__________________*/ Nq.x = 1.0f/22.0f; Nq.y = 2.0f/22.0f; Nq.z = 4.0f/22.0f; Nq.w = 10.0f/22.0f; - expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f; + expectedvec.x = 1.0f/22.0f; expectedvec.y = 2.0f/22.0f; expectedvec.z = 4.0f/22.0f; expected = 2.197869f; D3DXQuaternionToAxisAngle(&Nq,&axis,&angle); expect_vec3(expectedvec,axis); ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); /* Test if |w|>1.0f */ - expectedvec.x = 1.0f/11.0f; expectedvec.y = 2.0f/11.0f; expectedvec.z = 4.0f/11.0f; + expectedvec.x = 1.0f; expectedvec.y = 2.0f; expectedvec.z = 4.0f; expected = 0.0f; D3DXQuaternionToAxisAngle(&q,&axis,&angle); expect_vec3(expectedvec,axis); - ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); /* Test the null quaternion */ - expectedvec.x = 1.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; - expected = 0.0f; + expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; + expected = 3.141593f; D3DXQuaternionToAxisAngle(&nul,&axis,&angle); expect_vec3(expectedvec,axis); ok(fabs( angle - expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle);

1 0

Andrew Nguyen : t2embed: Implement TTLoadEmbeddedFont as a stub.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 8f1836cbccbfa4c540d24cfaf36cf083f6fb6730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1836cbccbfa4c540d24cfaf… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jul 15 22:00:22 2009 -0500 t2embed: Implement TTLoadEmbeddedFont as a stub. --- dlls/t2embed/main.c | 18 +++++++++++++++++ dlls/t2embed/t2embed.spec | 2 +- include/Makefile.in | 1 + include/t2embapi.h | 46 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 8962248..c9c5dc5 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -24,6 +24,10 @@ #include "windef.h" #include "winbase.h" +#include "t2embapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(t2embed); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -41,3 +45,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +LONG WINAPI TTLoadEmbeddedFont(HANDLE *phFontReference, ULONG ulFlags, + ULONG *pulPrivStatus, ULONG ulPrivs, + ULONG *pulStatus, READEMBEDPROC lpfnReadFromStream, + LPVOID lpvReadStream, LPWSTR szWinFamilyName, + LPSTR szMacFamilyName, TTLOADINFO *pTTLoadInfo) +{ + FIXME("(%p 0x%08x %p 0x%08x %p %p %p %s %s %p) stub\n", phFontReference, + ulFlags, pulPrivStatus, ulPrivs, pulStatus, lpfnReadFromStream, + lpvReadStream, debugstr_w(szWinFamilyName), szMacFamilyName, + pTTLoadInfo); + + return E_API_NOTIMPL; +} diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index ed0c71f..ed5d25b 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -7,7 +7,7 @@ @ stub TTGetEmbeddingType @ stub TTIsEmbeddingEnabled @ stub TTIsEmbeddingEnabledForFacename -@ stub TTLoadEmbeddedFont +@ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stub TTRunValidationTests @ stub _TTCharToUnicode(a)24 @ stub _TTDeleteEmbeddedFont(a)12 diff --git a/include/Makefile.in b/include/Makefile.in index f238003..68e8974 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -415,6 +415,7 @@ SRCDIR_INCLUDES = \ sspi.h \ storage.h \ svrapi.h \ + t2embapi.h \ tapi.h \ tchar.h \ textserv.h \ diff --git a/include/t2embapi.h b/include/t2embapi.h new file mode 100644 index 0000000..f199764 --- /dev/null +++ b/include/t2embapi.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2009 Andrew Nguyen + * + * 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 + */ + +#ifndef __WINE_T2EMBAPI_H +#define __WINE_T2EMBAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Possible return values. */ +#define E_NONE 0x0000L +#define E_API_NOTIMPL 0x0001L + +typedef ULONG (WINAPIV * READEMBEDPROC)(void*,void*,ULONG); + +typedef struct +{ + unsigned short usStructSize; + unsigned short usRefStrSize; + unsigned short *pusRefStr; +} TTLOADINFO; + +LONG WINAPI TTLoadEmbeddedFont(HANDLE*,ULONG,ULONG*,ULONG,ULONG*,READEMBEDPROC, + LPVOID,LPWSTR,LPSTR,TTLOADINFO*); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Piotr Caban : jscript: Fix create_exec_ctx implementation.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: ea5c94f84d099b32701a5827bf8f1d6a3f252532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5c94f84d099b32701a5827b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 16 01:17:00 2009 +0200 jscript: Fix create_exec_ctx implementation. --- dlls/jscript/engine.c | 2 ++ dlls/jscript/function.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b744904..f3ea33f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -179,6 +179,8 @@ HRESULT create_exec_ctx(IDispatch *this_obj, DispatchEx *var_disp, scope_chain_t if(!ctx) return E_OUTOFMEMORY; + ctx->ref = 1; + IDispatch_AddRef(this_obj); ctx->this_obj = this_obj; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 3863f7d..dac8d3e 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -197,9 +197,10 @@ static HRESULT invoke_constructor(FunctionInstance *function, LCID lcid, DISPPAR return hres; hres = invoke_source(function, (IDispatch*)_IDispatchEx_(this_obj), lcid, dp, retv, ei, caller); - jsdisp_release(this_obj); - if(FAILED(hres)) + if(FAILED(hres)) { + jsdisp_release(this_obj); return hres; + } V_VT(retv) = VT_DISPATCH; V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(this_obj);

1 0

Piotr Caban : jscript: Remove broken tests.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 8e1233ec4817d6bcced1a4e0b1aa22d463a25b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1233ec4817d6bcced1a4e0b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 16 01:16:45 2009 +0200 jscript: Remove broken tests. --- dlls/jscript/tests/api.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 6af9bb8..a80bd9f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -619,9 +619,9 @@ for(i=2; i<10; i++) { equals(1.123, i); equals(2305843009200000000, i); equals(5.123, i); - equals(1/(1024*1024*1024*1024*1024*1024*1.9), i); + equals(21711, i); equals(1024*1024*1024*1024*1024*1024*1.9999, i); - equals(0.0000000000000000001, i); + equals(748382, i); equals(0.6, i); equals(4.65661287308e-10, i); ok((0).toString(i) === "0", "(0).toString("+i+") = " + (0).toString(i));

1 0

Piotr Caban : jscript: Improve Object_toString implementation.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: f5e678e8ddd22004ca40cf42f53a9882cb98e4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e678e8ddd22004ca40cf42f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 16 01:16:15 2009 +0200 jscript: Improve Object_toString implementation. --- dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 26 +++++++++++++++++++++++++- dlls/jscript/tests/api.js | 16 ++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index a6c34ba..370b3bd 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -68,6 +68,7 @@ typedef enum { JSCLASS_ARRAY, JSCLASS_BOOLEAN, JSCLASS_DATE, + JSCLASS_ERROR, JSCLASS_FUNCTION, JSCLASS_GLOBAL, JSCLASS_MATH, diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 0dca008..8e0aad6 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -35,13 +35,37 @@ static const WCHAR default_valueW[] = {'[','o','b','j','e','c','t',' ','O','b',' static HRESULT Object_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { + static const WCHAR formatW[] = {'[','o','b','j','e','c','t',' ','%','s',']',0}; + + static const WCHAR arrayW[] = {'A','r','r','a','y',0}; + static const WCHAR booleanW[] = {'B','o','o','l','e','a','n',0}; + static const WCHAR dateW[] = {'D','a','t','e',0}; + static const WCHAR errorW[] = {'E','r','r','o','r',0}; + static const WCHAR functionW[] = {'F','u','n','c','t','i','o','n',0}; + static const WCHAR mathW[] = {'M','a','t','h',0}; + static const WCHAR numberW[] = {'N','u','m','b','e','r',0}; + static const WCHAR objectW[] = {'O','b','j','e','c','t',0}; + static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; + static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; + /* Keep in sync with jsclass_t enum */ + static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, + functionW, NULL, mathW, numberW, objectW, regexpW, stringW}; + TRACE("\n"); + if(names[dispex->builtin_info->class] == NULL) { + ERR("dispex->builtin_info->class = %d\n", + dispex->builtin_info->class); + return E_FAIL; + } + if(retv) { V_VT(retv) = VT_BSTR; - V_BSTR(retv) = SysAllocString(default_valueW); + V_BSTR(retv) = SysAllocStringLen(NULL, 9+strlenW(names[dispex->builtin_info->class])); if(!V_BSTR(retv)) return E_OUTOFMEMORY; + + sprintfW(V_BSTR(retv), formatW, names[dispex->builtin_info->class]); } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b347846..6af9bb8 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -60,6 +60,22 @@ ok(tmp === "abc", "encodeURI('abc') = " + tmp); tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); +(tmp = new Array).f = Object.prototype.toString; +ok(tmp.f() === "[object Array]", "tmp.f() = " + tmp.f()); +(tmp = new Boolean).f = Object.prototype.toString; +ok(tmp.f() === "[object Boolean]", "tmp.f() = " + tmp.f()); +(tmp = new Date).f = Object.prototype.toString; +ok(tmp.f() === "[object Date]", "tmp.f() = " + tmp.f()); +(tmp = function() {}).f = Object.prototype.toString; +ok(tmp.f() === "[object Function]", "tmp.f() = " + tmp.f()); +Math.f = Object.prototype.toString; +ok(Math.f() === "[object Math]", "tmp.f() = " + tmp.f()); +(tmp = new Number).f = Object.prototype.toString; +ok(tmp.f() === "[object Number]", "tmp.f() = " + tmp.f()); +(tmp = new RegExp("")).f = Object.prototype.toString; +ok(tmp.f() === "[object RegExp]", "tmp.f() = " + tmp.f()); +(tmp = new String).f = Object.prototype.toString; +ok(tmp.f() === "[object String]", "tmp.f() = " + tmp.f()); ok("".length === 0, "\"\".length = " + "".length); ok(getVT("".length) == "VT_I4", "\"\".length = " + "".length);

1 0

Detlef Riekenberg : winemine: Add ellipses for IDM_CUSTOM.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 889d20f881257e38db3e5fceb6eee027f9b338ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=889d20f881257e38db3e5fceb… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jul 15 16:58:28 2009 +0200 winemine: Add ellipses for IDM_CUSTOM. --- programs/winemine/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemine/De.rc b/programs/winemine/De.rc index 63d1914..0b8fcc5 100644 --- a/programs/winemine/De.rc +++ b/programs/winemine/De.rc @@ -41,7 +41,7 @@ MENU_WINEMINE MENU DISCARDABLE MENUITEM "&Anfänger", IDM_BEGINNER MENUITEM "&Fortgeschrittene", IDM_ADVANCED MENUITEM "&Experten", IDM_EXPERT - MENUITEM "Benutzer&definiert", IDM_CUSTOM + MENUITEM "Benutzer&definiert...", IDM_CUSTOM MENUITEM SEPARATOR MENUITEM "&Beenden\tAlt+X", IDM_EXIT }

1 0

Ricardo Filipe : shdoclc: Fix Portuguese translation and convert to UTF8.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 4842b5c201b0bc0806347876390c1c2dc6dd7856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4842b5c201b0bc08063478763… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 07:16:33 2009 -0700 shdoclc: Fix Portuguese translation and convert to UTF8. --- dlls/shdoclc/Pt.rc | 57 ++++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/shdoclc/Pt.rc b/dlls/shdoclc/Pt.rc index 64379f4..d0bd1b7 100644 --- a/dlls/shdoclc/Pt.rc +++ b/dlls/shdoclc/Pt.rc @@ -18,11 +18,13 @@ #include "shdoclc.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { - IDS_MESSAGE_BOX_TITLE, "Wine Internet Explorer" + IDS_MESSAGE_BOX_TITLE, "Explorador de Internet Wine" } STRINGTABLE DISCARDABLE @@ -36,7 +38,7 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "Default" { MENUITEM "&Retroceder", IDM_GOBACKWARD - MENUITEM "&Avan�ar", IDM_GOFORWARD + MENUITEM "&Avançar", IDM_GOFORWARD MENUITEM SEPARATOR MENUITEM "&Guardar fundo como...", IDM_SAVEBACKGROUND MENUITEM "&Definir como fundo", IDM_SETWALLPAPER @@ -48,9 +50,9 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Criar &Atalho", IDM_CREATESHORTCUT MENUITEM "Adicionar aos &Favoritos", IDM_ADDFAVORITES - MENUITEM "&Ver C�digo Fonte", IDM_VIEWSOURCE + MENUITEM "&Ver Código Fonte", IDM_VIEWSOURCE MENUITEM SEPARATOR - MENUITEM "C&odifica��o", IDM_LANGUAGE + MENUITEM "C&odificação", IDM_LANGUAGE MENUITEM SEPARATOR MENUITEM "&Imprimir", IDM_PRINT MENUITEM "&Actualizar", _IDM_REFRESH @@ -61,10 +63,10 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "Imagem" { - MENUITEM "&Abrir liga��o", IDM_FOLLOWLINKC - MENUITEM "Abrir &liga��o numa nova janela", IDM_FOLLOWLINKN - MENUITEM "&Guardar liga��o como...", IDM_SAVETARGET - MENUITEM "&Imprimir liga��o", IDM_PRINTTARGET + MENUITEM "&Abrir ligação", IDM_FOLLOWLINKC + MENUITEM "Abrir &ligação numa nova janela", IDM_FOLLOWLINKN + MENUITEM "&Guardar ligação como...", IDM_SAVETARGET + MENUITEM "&Imprimir ligação", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "&Mostrar imagem", IDM_SHOWPICTURE MENUITEM "G&uardar imagem como...", IDM_SAVEPICTURE @@ -102,14 +104,14 @@ IDR_BROWSE_CONTEXT_MENU MENU { POPUP "&Seleccionar" { - MENUITEM "&C�lula", IDM_CELLSELECT + MENUITEM "&Célula", IDM_CELLSELECT MENUITEM "&Linha", IDM_ROWSELECT MENUITEM "C&oluna", IDM_COLUMNSELECT MENUITEM "&Tabela", IDM_TABLESELECT } MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "&Propriedades da C�lula", IDM_CELLPROPERTIES + MENUITEM "&Propriedades da Célula", IDM_CELLPROPERTIES MENUITEM "&Propriedades da Tabela", IDM_TABLEPROPERTIES } @@ -123,12 +125,12 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR } - POPUP "�ncora" + POPUP "Âncora" { MENUITEM "&Abrir", IDM_FOLLOWLINKC MENUITEM "A&brir numa nova janela", IDM_FOLLOWLINKN - MENUITEM "&Guardar liga��o como...", IDM_SAVETARGET - MENUITEM "&Imprimir liga��o", IDM_PRINTTARGET + MENUITEM "&Guardar ligação como...", IDM_SAVETARGET + MENUITEM "&Imprimir ligação", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "&Cortar", IDM_CUT MENUITEM "C&opiar", IDM_COPY @@ -148,10 +150,10 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "Imagem DYNSRC" { - MENUITEM "&Abrir liga��o", IDM_FOLLOWLINKC - MENUITEM "A&brir liga��o numa nova janela", IDM_FOLLOWLINKN - MENUITEM "&Guardar liga��o como...", IDM_SAVETARGET - MENUITEM "&Imprimir liga��o", IDM_PRINTTARGET + MENUITEM "&Abrir ligação", IDM_FOLLOWLINKC + MENUITEM "A&brir ligação numa nova janela", IDM_FOLLOWLINKN + MENUITEM "&Guardar ligação como...", IDM_SAVETARGET + MENUITEM "&Imprimir ligação", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "&Mostrar imagem", IDM_SHOWPICTURE MENUITEM "G&uardar video como...", IDM_SAVEPICTURE @@ -173,10 +175,10 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "Imagem ART" { - MENUITEM "&Abrir liga��o", IDM_FOLLOWLINKC - MENUITEM "A&brir liga��o numa nova janela", IDM_FOLLOWLINKN - MENUITEM "&Guardar liga��o como...", IDM_SAVETARGET - MENUITEM "&Imprimir liga��o", IDM_PRINTTARGET + MENUITEM "&Abrir ligação", IDM_FOLLOWLINKC + MENUITEM "A&brir ligação numa nova janela", IDM_FOLLOWLINKN + MENUITEM "&Guardar ligação como...", IDM_SAVETARGET + MENUITEM "&Imprimir ligação", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "&Mostrar imagem", IDM_SHOWPICTURE MENUITEM "G&uardar video como...", IDM_SAVEPICTURE @@ -190,10 +192,9 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Adicionar aos &Favoritos...", IDM_ADDFAVORITES MENUITEM SEPARATOR - MENUITEM SEPARATOR MENUITEM "I&niciar", IDM_DYNSRCPLAY MENUITEM "&Parar", IDM_DYNSRCSTOP - MENUITEM "&Recome�ar", IDM_IMGARTREWIND + MENUITEM "&Recomeçar", IDM_IMGARTREWIND MENUITEM SEPARATOR MENUITEM SEPARATOR MENUITEM "Propriedade&s", IDM_PROPERTIES @@ -226,8 +227,8 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Topo", IDM_SCROLL_TOP MENUITEM "Fundo", IDM_SCROLL_BOTTOM MENUITEM SEPARATOR - MENUITEM "P�gina Acima", IDM_SCROLL_PAGEUP - MENUITEM "P�gina abaixo", IDM_SCROLL_PAGEDOWN + MENUITEM "Página Acima", IDM_SCROLL_PAGEUP + MENUITEM "Página abaixo", IDM_SCROLL_PAGEDOWN MENUITEM SEPARATOR MENUITEM "Scroll Cima", IDM_SCROLL_UP MENUITEM "Scroll Baixo", IDM_SCROLL_DOWN @@ -240,8 +241,8 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Canto Esquerdo", IDM_SCROLL_LEFTEDGE MENUITEM "Canto Direito", IDM_SCROLL_RIGHTEDGE MENUITEM SEPARATOR - MENUITEM "P�gina esquerda", IDM_SCROLL_PAGELEFT - MENUITEM "P�gina direita", IDM_SCROLL_PAGERIGHT + MENUITEM "Página esquerda", IDM_SCROLL_PAGELEFT + MENUITEM "Página direita", IDM_SCROLL_PAGERIGHT MENUITEM SEPARATOR MENUITEM "Scroll Esquerda", IDM_SCROLL_LEFT MENUITEM "Scroll Direita", IDM_SCROLL_RIGHT

1 0

Ricardo Filipe : mshtml: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: ac67331d6dc794437b3e261530eed262ebbfd86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac67331d6dc794437b3e26153… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 07:05:42 2009 -0700 mshtml: Update Portuguese translation and convert to UTF8. --- dlls/mshtml/Pt.rc | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index 6a471e4..d9ebbb3 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -18,14 +18,16 @@ #include "resource.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "A interpreta��o de HTML est� desactivada." + IDS_HTMLDISABLED "A interpretação de HTML está desactivada." IDS_HTMLDOCUMENT "Documento HTML" - IDS_DOWNLOADING "Descarregando..." - IDS_INSTALLING "Instalando..." + IDS_DOWNLOADING "A descarregar..." + IDS_INSTALLING "A instalar..." } ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 @@ -33,8 +35,8 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Instalador Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Esta aplica��o est� a tentar mostrar uma p�gina HTML. O Wine precisa que o Gecko " \ - "(Motor HTML Mozilla) seja instalado para mostrar a p�gina. Clique em Instalar se deseja que o Wine " \ + LTEXT "Esta aplicação está a tentar mostrar uma página HTML. O Wine precisa que o Gecko " \ + "(Motor HTML Mozilla) seja instalado para mostrar a página. Clique em Instalar se deseja que o Wine " \ "descarregue e instale o Gecko automaticamente.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP @@ -43,10 +45,10 @@ FONT 8, "MS Shell Dlg" IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Hiperliga��o" +CAPTION "Hiperligação" FONT 8, "MS Shell Dlg" { - GROUPBOX "Informa��o da Hiperliga��o", -1, 5, 5, 190, 55 + GROUPBOX "Informação da Hiperligação", -1, 5, 5, 190, 55 LTEXT "&Tipo:", -1, 10, 22, 20, 10 COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS LTEXT "&URL:", -1, 10, 42, 20, 10 @@ -54,3 +56,14 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Ricardo Filipe : gphoto2.ds: Fix Portuguese translation and convert to UTF8 .
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 1656ddd06b5aeefe9e6209a9a69338b8635bdb8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1656ddd06b5aeefe9e6209a9a… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 06:49:34 2009 -0700 gphoto2.ds: Fix Portuguese translation and convert to UTF8. --- dlls/gphoto2.ds/gphoto2_Pt.rc | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Pt.rc b/dlls/gphoto2.ds/gphoto2_Pt.rc index c89d6ba..7e131f3 100644 --- a/dlls/gphoto2.ds/gphoto2_Pt.rc +++ b/dlls/gphoto2.ds/gphoto2_Pt.rc @@ -20,38 +20,40 @@ #include "resource.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ficheiros na C�mara" +CAPTION "Ficheiros na Câmara" MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 DEFPUSHBUTTON "Importar Seleccionado",IDC_IMPORT,152,252,72,14 - PUSHBUTTON "Pr�-visualizar",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Pré-visualizar",IDC_FETCH,7,252,64,14 PUSHBUTTON "Importar tudo",IDC_IMPORTALL,80,252,64,14 - CONTROL "Passar � frente",IDC_SKIP,"Bot�o", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + CONTROL "Passar à frente",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 PUSHBUTTON "Sair",IDC_EXIT,315,252,50,14 END IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND -CAPTION "Transferindo" +CAPTION "A transferir" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Transferindo... Por favor espere",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "A transferir... Por favor espere",IDC_STATIC,5,19,176,8, SS_CENTER END IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER -CAPTION "A ligar � c�mara" +CAPTION "A ligar à câmara" FONT 8, "MS Sans Serif" BEGIN - CONTROL "",IDC_BITMAP,"Est�tico",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 - LTEXT "A ligar � c�mara... Por favor espere",IDC_STATIC,128,58, + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "A ligar à câmara... Por favor espere",IDC_STATIC,128,58, 116,8 END

1 0

Andrew Nguyen : kernel32: Implement WTSGetActiveConsoleSessionId as a stub.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: f63f4026cf7a3e8c761095069a0a94c8ccde1a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63f4026cf7a3e8c761095069… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jul 15 22:00:13 2009 -0500 kernel32: Implement WTSGetActiveConsoleSessionId as a stub. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index fc3b6ae..2fd1b10 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1133,7 +1133,7 @@ @ stdcall VirtualQuery(ptr ptr long) @ stdcall VirtualQueryEx(long ptr ptr long) @ stdcall VirtualUnlock(ptr long) -# @ stub WTSGetActiveConsoleSessionId +@ stdcall WTSGetActiveConsoleSessionId() @ stdcall WaitCommEvent(long ptr ptr) @ stdcall WaitForDebugEvent(ptr long) @ stdcall WaitForMultipleObjects(long ptr long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4e74782..f90b294 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3324,3 +3324,12 @@ HRESULT WINAPI RegisterApplicationRestart(PCWSTR pwzCommandLine, DWORD dwFlags) return S_OK; } + +/********************************************************************** + * WTSGetActiveConsoleSessionId (KERNEL32.@) + */ +DWORD WINAPI WTSGetActiveConsoleSessionId(void) +{ + FIXME("stub\n"); + return 0; +} diff --git a/include/winbase.h b/include/winbase.h index d7d8773..613114c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2136,6 +2136,7 @@ WINBASEAPI BOOL WINAPI VirtualProtectEx(HANDLE,LPVOID,SIZE_T,DWORD,LPDWOR WINBASEAPI SIZE_T WINAPI VirtualQuery(LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T); WINBASEAPI SIZE_T WINAPI VirtualQueryEx(HANDLE,LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T); WINBASEAPI BOOL WINAPI VirtualUnlock(LPVOID,SIZE_T); +WINBASEAPI DWORD WINAPI WTSGetActiveConsoleSessionId(void); WINBASEAPI BOOL WINAPI WaitCommEvent(HANDLE,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI WaitForDebugEvent(LPDEBUG_EVENT,DWORD); WINBASEAPI DWORD WINAPI WaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DWORD);

1 0

Roderick Colenbrander : winex11: Add a function for retrieving the bitmap GC.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 618b410aa88d2614f767f2dbfc0751ae66f43c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=618b410aa88d2614f767f2dbf… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Jul 9 21:51:05 2009 +0200 winex11: Add a function for retrieving the bitmap GC. --- dlls/winex11.drv/bitmap.c | 20 ++++++++++++++++---- dlls/winex11.drv/brush.c | 11 ++++++----- dlls/winex11.drv/dib.c | 6 +++--- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/x11drv.h | 5 ++--- 5 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index facf405..4fb3ef0 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -36,6 +36,17 @@ X_PHYSBITMAP BITMAP_stock_phys_bitmap = { 0 }; /* phys bitmap for the default s static XContext bitmap_context; /* X context to associate a phys bitmap to a handle */ +GC get_bitmap_gc(int depth) +{ + switch(depth) + { + case 1: + return BITMAP_monoGC; + default: + return BITMAP_colorGC; + } +} + /*********************************************************************** * X11DRV_BITMAP_Init */ @@ -157,11 +168,12 @@ BOOL CDECL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID } else /* else clear the bitmap */ { + GC gc = get_bitmap_gc(physBitmap->pixmap_depth); wine_tsx11_lock(); - XSetFunction( gdi_display, BITMAP_GC(physBitmap), GXclear ); - XFillRectangle( gdi_display, physBitmap->pixmap, BITMAP_GC(physBitmap), 0, 0, + XSetFunction( gdi_display, gc, GXclear ); + XFillRectangle( gdi_display, physBitmap->pixmap, gc, 0, 0, bitmap.bmWidth, bitmap.bmHeight ); - XSetFunction( gdi_display, BITMAP_GC(physBitmap), GXcopy ); + XSetFunction( gdi_display, gc, GXcopy ); wine_tsx11_unlock(); } return TRUE; @@ -405,7 +417,7 @@ LONG CDECL X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ) FIXME("Unhandled bits:%d\n", bitmap.bmBitsPixel); } - XPutImage( gdi_display, physBitmap->pixmap, BITMAP_GC(physBitmap), + XPutImage( gdi_display, physBitmap->pixmap, get_bitmap_gc(physBitmap->pixmap_depth), image, 0, 0, 0, 0, bitmap.bmWidth, height ); HeapFree( GetProcessHeap(), 0, image->data ); image->data = NULL; diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 612968c..3368bbf 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -103,13 +103,14 @@ static const COLORREF WHITE = RGB(0xff, 0xff, 0xff); /*********************************************************************** * BRUSH_DitherColor */ -static Pixmap BRUSH_DitherColor( COLORREF color ) +static Pixmap BRUSH_DitherColor( COLORREF color, int depth) { /* X image for building dithered pixmap */ static XImage *ditherImage = NULL; static COLORREF prevColor = 0xffffffff; unsigned int x, y; Pixmap pixmap; + GC gc = get_bitmap_gc(depth); if (!ditherImage) { @@ -144,7 +145,7 @@ static Pixmap BRUSH_DitherColor( COLORREF color ) } pixmap = XCreatePixmap( gdi_display, root_window, MATRIX_SIZE, MATRIX_SIZE, screen_depth ); - XPutImage( gdi_display, pixmap, BITMAP_colorGC, ditherImage, 0, 0, + XPutImage( gdi_display, pixmap, gc, ditherImage, 0, 0, 0, 0, MATRIX_SIZE, MATRIX_SIZE ); wine_tsx11_unlock(); @@ -185,7 +186,7 @@ static void BRUSH_SelectSolidBrush( X11DRV_PDEVICE *physDev, COLORREF color ) if ((physDev->depth > 1) && (screen_depth <= 8) && !X11DRV_IsSolidColor( color )) { /* Dithered brush */ - physDev->brush.pixmap = BRUSH_DitherColor( color ); + physDev->brush.pixmap = BRUSH_DitherColor( color, physDev->depth ); physDev->brush.fillStyle = FillTiled; physDev->brush.pixel = 0; } @@ -222,7 +223,7 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) bitmap.bmWidth, bitmap.bmHeight, 1); /* FIXME: should probably convert to monochrome instead */ XCopyPlane( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - BITMAP_monoGC, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0, 1 ); + get_bitmap_gc(1), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0, 1 ); } else { @@ -230,7 +231,7 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) bitmap.bmWidth, bitmap.bmHeight, physBitmap->pixmap_depth ); XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - BITMAP_GC(physBitmap), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0 ); + get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0 ); } wine_tsx11_unlock(); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 6df4137..07ce9e1 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3984,7 +3984,7 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start descr.lines = tmpheight >= 0 ? lines : -lines; descr.depth = physBitmap->pixmap_depth; descr.drawable = physBitmap->pixmap; - descr.gc = BITMAP_GC(physBitmap); + descr.gc = get_bitmap_gc(physBitmap->pixmap_depth); descr.xSrc = 0; descr.ySrc = 0; descr.xDest = 0; @@ -4138,7 +4138,7 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start descr.lines = lines; descr.depth = physBitmap->pixmap_depth; descr.drawable = physBitmap->pixmap; - descr.gc = BITMAP_GC(physBitmap); + descr.gc = get_bitmap_gc(physBitmap->pixmap_depth); descr.width = dib.dsBm.bmWidth; descr.height = dib.dsBm.bmHeight; descr.xDest = 0; @@ -4353,7 +4353,7 @@ static void X11DRV_DIB_DoUpdateDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB) GetObjectW( physBitmap->hbitmap, sizeof(bitmap), &bitmap ); X11DRV_DIB_DoCopyDIBSection(physBitmap, toDIB, physBitmap->colorMap, physBitmap->nColorMap, - physBitmap->pixmap, BITMAP_GC(physBitmap), + physBitmap->pixmap, get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, 0, 0, bitmap.bmWidth, bitmap.bmHeight); } diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 8d74c77..abdd505 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1072,7 +1072,7 @@ X11DRV_GetPixel( X11DRV_PDEVICE *physDev, INT x, INT y ) /* to avoid a BadMatch error */ if (!pixmap) pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, physDev->depth ); - XCopyArea( gdi_display, physDev->drawable, pixmap, BITMAP_colorGC, + XCopyArea( gdi_display, physDev->drawable, pixmap, get_bitmap_gc(physDev->depth), physDev->dc_rect.left + pt.x, physDev->dc_rect.top + pt.y, 1, 1, 0, 0 ); image = XGetImage( gdi_display, pixmap, 0, 0, 1, 1, AllPlanes, ZPixmap ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 013a359..10af183 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -144,11 +144,10 @@ typedef struct } X11DRV_PDEVICE; - /* GCs used for B&W and color bitmap operations */ -extern GC BITMAP_monoGC, BITMAP_colorGC; extern X_PHYSBITMAP BITMAP_stock_phys_bitmap; /* phys bitmap for the default stock bitmap */ -#define BITMAP_GC(physBitmap) (((physBitmap)->pixmap_depth == 1) ? BITMAP_monoGC : BITMAP_colorGC) +/* Retrieve the GC used for bitmap operations */ +extern GC get_bitmap_gc(int depth); /* Wine driver X11 functions */

1 0

Stefan Dösinger : wined3d: Use the unmodified source in MOVA.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 9d14dcab6866f85e99bccb1b1848fd04ad38932e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d14dcab6866f85e99bccb1b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 15 20:57:58 2009 +0200 wined3d: Use the unmodified source in MOVA. The code removed by this patch was a leftover from the time when we tried to emulate MOVA with a plain ARL, which only supports one source in plain ARB. This breaks the more sophisticated MOVA and 4 component ADDR register we have now however. --- dlls/wined3d/arb_program_shader.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0c3ffa1..f0ea0b6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1603,15 +1603,13 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) char src0_param[256]; if(ins->handler_idx == WINED3DSIH_MOVA) { - struct wined3d_shader_src_param tmp_src = ins->src[0]; char write_mask[6]; if(ctx->target_version >= NV2) { shader_hw_map2gl(ins); return; } - tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; - shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); + shader_arb_get_src_param(ins, &ins->src[0], 0, src0_param); shader_arb_get_write_mask(ins, &ins->dst[0], write_mask); /* This implements the mova formula used in GLSL. The first two instructions

1 0

Stefan Dösinger : wined3d: Don' t call glGetError if nobody is listening.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 6a04c2d5cc7aa63bf5564f1c3d8813a436212749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a04c2d5cc7aa63bf5564f1c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 15 18:45:03 2009 +0200 wined3d: Don't call glGetError if nobody is listening. --- dlls/wined3d/wined3d_private.h | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60c363c..68f2e4c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -883,17 +883,19 @@ extern int num_lock; /* Checking of API calls */ /* --------------------- */ #ifndef WINE_NO_DEBUG_MSGS -#define checkGLcall(A) \ -do { \ - GLint err = glGetError(); \ - if (err == GL_NO_ERROR) { \ - TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ - \ - } else do { \ - FIXME(">>>>>>>>>>>>>>>>> %s (%#x) from %s @ %s / %d\n", \ - debug_glerror(err), err, A, __FILE__, __LINE__); \ - err = glGetError(); \ - } while (err != GL_NO_ERROR); \ +#define checkGLcall(A) \ +do { \ + GLint err; \ + if(!__WINE_IS_DEBUG_ON(_FIXME, __wine_dbch___default)) break; \ + err = glGetError(); \ + if (err == GL_NO_ERROR) { \ + TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ + \ + } else do { \ + FIXME(">>>>>>>>>>>>>>>>> %s (%#x) from %s @ %s / %d\n", \ + debug_glerror(err), err, A, __FILE__, __LINE__); \ + err = glGetError(); \ + } while (err != GL_NO_ERROR); \ } while(0) #else #define checkGLcall(A) do {} while(0)

1 0

Dmitry Timoshkov : comctl32: Explicitly initialize visible order of a newly added item, force visible order recalculation on redraw.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 1d265bcac2188ab14215af049c043ff7c9f31785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d265bcac2188ab14215af049… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jul 16 17:34:54 2009 +0900 comctl32: Explicitly initialize visible order of a newly added item, force visible order recalculation on redraw. --- dlls/comctl32/treeview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index fd20cef..8155aab 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1255,6 +1255,7 @@ TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL i newItem->parent = parentItem; newItem->iIntegral = 1; + newItem->visibleOrder = -1; if (!TREEVIEW_DoSetItemT(infoPtr, newItem, tvItem, isW)) return 0; @@ -1394,8 +1395,6 @@ TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL i } else { - newItem->visibleOrder = -1; - /* refresh treeview if newItem is the first item inserted under parentItem */ if (ISVISIBLE(parentItem) && newItem->prevSibling == newItem->nextSibling) { @@ -1594,6 +1593,7 @@ TREEVIEW_SetRedraw(TREEVIEW_INFO* infoPtr, WPARAM wParam) if (infoPtr->bRedraw) { TREEVIEW_UpdateSubTree(infoPtr, infoPtr->root); + TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL); TREEVIEW_UpdateScrollBars(infoPtr); TREEVIEW_Invalidate(infoPtr, NULL); }

1 0

Michael Stefaniuc : Set the encoding of the Romanian resources to UTF-8.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 2bf4acb56ca9524ff03acb521b88ddf604785e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf4acb56ca9524ff03acb521… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 16 01:12:03 2009 +0200 Set the encoding of the Romanian resources to UTF-8. --- dlls/iccvid/iccvid_Ro.rc | 2 ++ dlls/localspl/spl_Ro.rc | 2 ++ dlls/msvidc32/msvidc32_Ro.rc | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid_Ro.rc b/dlls/iccvid/iccvid_Ro.rc index ccd8ef7..d99a0b2 100644 --- a/dlls/iccvid/iccvid_Ro.rc +++ b/dlls/iccvid/iccvid_Ro.rc @@ -19,6 +19,8 @@ #include "iccvid_private.h" +#pragma code_page(65001) + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Ro.rc b/dlls/localspl/spl_Ro.rc index 499d75b..7f98800 100644 --- a/dlls/localspl/spl_Ro.rc +++ b/dlls/localspl/spl_Ro.rc @@ -20,6 +20,8 @@ #include "localspl_private.h" +#pragma code_page(65001) + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Ro.rc b/dlls/msvidc32/msvidc32_Ro.rc index 62bcef0..c001dd4 100644 --- a/dlls/msvidc32/msvidc32_Ro.rc +++ b/dlls/msvidc32/msvidc32_Ro.rc @@ -19,6 +19,8 @@ #include "msvidc32_private.h" +#pragma code_page(65001) + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE

1 0

Alexandre Julliard : wrc: Report an error when encountering non-ASCII characters.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: fc8c8a52517725f264071e60679b23a7ac6cd080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8c8a52517725f264071e606… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 11:15:15 2009 +0200 wrc: Report an error when encountering non-ASCII characters. --- tools/wrc/parser.l | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index d92e973..cafa35a 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -573,7 +573,7 @@ L\" { } {ws}+ want_id = wanted_id; /* Eat whitespace */ -<INITIAL>. return yytext[0]; +<INITIAL>[ -~] return yytext[0]; <*>.|\n { /* Catch all rule to find any unmatched text */ @@ -582,8 +582,8 @@ L\" { line_number++; char_number = 1; } - parser_warning("Unmatched text '%c' (0x%02x) YY_START=%d\n", - isprint(*yytext & 0xff) ? *yytext : '.', *yytext, YY_START); + parser_error("Unmatched text '%c' (0x%02x) YY_START=%d", + isprint((unsigned char)*yytext) ? *yytext : '.', *yytext, YY_START); } <<EOF>> current_codepage = -1; yyterminate();

1 0

Alexandre Julliard : wrc: Avoid a crash if a file didn' t contain any resources.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 5d5699569651acaafb4db84f2925368e92ad93f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5699569651acaafb4db84f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 11:15:00 2009 +0200 wrc: Avoid a crash if a file didn't contain any resources. --- tools/wrc/parser.y | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index f891f24..d905475 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -386,15 +386,17 @@ resource_file $1 = rsc; /* Final statements before were done */ - head = get_resource_head($1); - if (resource_top) /* append to existing resources */ + if ((head = get_resource_head($1)) != NULL) { - resource_t *tail = resource_top; - while (tail->next) tail = tail->next; - tail->next = head; - head->prev = tail; + if (resource_top) /* append to existing resources */ + { + resource_t *tail = resource_top; + while (tail->next) tail = tail->next; + tail->next = head; + head->prev = tail; + } + else resource_top = head; } - else resource_top = head; sttres = NULL; } ;

1 0

Ricardo Filipe : taskmgr: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 1eab4f2f3dd239d4874c52417e294755c8ef4bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eab4f2f3dd239d4874c52417… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 17:40:49 2009 -0700 taskmgr: Update Portuguese translation and convert to UTF8. --- programs/taskmgr/Pt.rc | 184 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 136 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1eab4f2f3dd239d4874c5…

1 0

Ricardo Filipe : reg: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 2f48c23e588293511f6e079c9d74ec2dc4b90a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f48c23e588293511f6e079c9… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 16:05:39 2009 -0700 reg: Update Portuguese translation and convert to UTF8. --- programs/reg/Pt.rc | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/programs/reg/Pt.rc b/programs/reg/Pt.rc index 6294408..0de0e33 100644 --- a/programs/reg/Pt.rc +++ b/programs/reg/Pt.rc @@ -22,7 +22,9 @@ #include "reg.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE { @@ -30,4 +32,9 @@ STRINGTABLE STRING_ADD_USAGE, "REG ADD nome_chave [/v nome_valor | /ve] [/t tipo] [/s separador] [/d dados] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nome_chave [/v nome_valor | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nome_chave [/v nome_valor | /ve] [/s]\n" + STRING_SUCCESS, "A operação foi completada com sucesso\n" + STRING_INVALID_KEY, "Erro: Nome de chave inválido\n" + STRING_INVALID_CMDLINE, "Erro: Parâmetros da linha de comandos inválidos\n" + STRING_NO_REMOTE, "Erro: Incapaz de adicionar chaves à máquina remota\n" + STRING_CANNOT_FIND, "Erro: O sistema foi incapaz de encontrar a chave de registo ou valor especificado\n" }

1 0

Nikolay Sivov : comctl32/dpa: Don' t use start index on searching sorted array.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 3373ed8fbb6aeaf2fd6fa484e5e05d9143b34fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3373ed8fbb6aeaf2fd6fa484e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 15 23:59:25 2009 +0400 comctl32/dpa: Don't use start index on searching sorted array. --- dlls/comctl32/dpa.c | 3 ++- dlls/comctl32/tests/dpa.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index bbad10d..43f2a3a 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -802,7 +802,8 @@ INT WINAPI DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart, INT l, r, x, n; LPVOID *lpPtr; - l = (nStart == -1) ? 0 : nStart; + /* for binary search ignore start index */ + l = 0; r = hdpa->nItemCount - 1; lpPtr = hdpa->ptrs; while (r >= l) { diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index ed28119..741aeb6 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -289,9 +289,9 @@ static void test_dpa(void) ok(j == DPA_ERR, "j=%d\n", j); /* ... but for a binary search it's ignored */ j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, i+1, CB_CmpLT, 0xdeadbeef, DPAS_SORTED); - todo_wine ok(j+1 == i, "j=%d i=%d\n", j, i); + ok(j+1 == i, "j=%d i=%d\n", j, i); } - + /* Try to get the index of a nonexistent item */ i = pDPA_GetPtrIndex(dpa, (PVOID)7); ok(i == DPA_ERR, "i=%d\n", i);

1 0

Aric Stewart : gdi32: In init_system_links, reinitialize val_len and data_len before continuing.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 6a5bb87e3a405bc8f8b410b283cbd364e2280cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5bb87e3a405bc8f8b410b28… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 15 14:31:17 2009 -0500 gdi32: In init_system_links, reinitialize val_len and data_len before continuing. --- dlls/gdi32/freetype.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6500601..96b197a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1663,7 +1663,7 @@ static BOOL init_system_links(void) if(psub) { TRACE("%s: SystemLink entry for substituted font, ignoring\n", debugstr_w(value)); - continue; + goto next; } font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link)); font_link->font_name = strdupW(value); @@ -1712,6 +1712,7 @@ static BOOL init_system_links(void) } } list_add_tail(&system_links, &font_link->entry); + next: val_len = max_val + 1; data_len = max_data; }

1 0

Jacek Caban : include: Added netcon.idl.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 3935c81b2120a6c46be9f043bb7132571d1c1321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3935c81b2120a6c46be9f043b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 00:58:25 2009 +0200 include: Added netcon.idl. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/netcon.idl | 412 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 415 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3935c81b2120a6c46be9f…

1 0