wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Kai Blin : secur32: Use NTLM2 instead of NTLMv2.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 9dd206d28e96a9e27ac7f204cab757cd3ec9db4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd206d28e96a9e27ac7f204c… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Apr 19 10:15:15 2010 +0200 secur32: Use NTLM2 instead of NTLMv2. In the current code NTLMv2 is used when talking about second generation NTLM crypto algorithms. Most other publiations call this NTLM2, and use NTLMv2 to describe a different crypto handshake that can be used by either NTLM1 or NTLM2 crypto. --- dlls/secur32/hmac_md5.c | 2 +- dlls/secur32/ntlm.c | 10 +++++----- dlls/secur32/secur32_priv.h | 6 +++--- dlls/secur32/util.c | 22 +++++++++++----------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/secur32/hmac_md5.c b/dlls/secur32/hmac_md5.c index 6dafa31..3479178 100644 --- a/dlls/secur32/hmac_md5.c +++ b/dlls/secur32/hmac_md5.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * This file implements RFC 2104 (HMAC) for the MD5 provider. - * It is needed for NTLMv2 signing and sealing. + * It is needed for NTLM2 signing and sealing. */ #include "hmac_md5.h" diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index a7330e2..0ef5b51 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -593,15 +593,15 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( MultiByteToWideChar(CP_ACP, 0, password ? password : ntlm_cred->password, password ? pwlen : ntlm_cred->pwlen, unicode_password, passwd_lenW); - SECUR32_CreateNTLMv1SessionKey((PBYTE)unicode_password, - passwd_lenW * sizeof(SEC_WCHAR), helper->session_key); + SECUR32_CreateNTLM1SessionKey((PBYTE)unicode_password, + passwd_lenW * sizeof(SEC_WCHAR), helper->session_key); HeapFree(GetProcessHeap(), 0, unicode_password); } else memset(helper->session_key, 0, 16); - /* Allocate space for a maximal string of + /* Allocate space for a maximal string of * "SF NTLMSSP_FEATURE_SIGN NTLMSSP_FEATURE_SEAL * NTLMSSP_FEATURE_SESSION_KEY" */ @@ -913,7 +913,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( helper->crypt.ntlm.a4i = SECUR32_arc4Alloc(); SECUR32_arc4Init(helper->crypt.ntlm.a4i, helper->session_key, 16); helper->crypt.ntlm.seq_num = 0l; - SECUR32_CreateNTLMv2SubKeys(helper); + SECUR32_CreateNTLM2SubKeys(helper); helper->crypt.ntlm2.send_a4i = SECUR32_arc4Alloc(); helper->crypt.ntlm2.recv_a4i = SECUR32_arc4Alloc(); SECUR32_arc4Init(helper->crypt.ntlm2.send_a4i, @@ -1471,7 +1471,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_RevertSecurityContext(PCtxtHandle phContex /*********************************************************************** * ntlm_CreateSignature * As both MakeSignature and VerifySignature need this, but different keys - * are needed for NTLMv2, the logic goes into a helper function. + * are needed for NTLM2, the logic goes into a helper function. * To ensure maximal reusability, we can specify the direction as NTLM_SEND for * signing/encrypting and NTLM_RECV for verfying/decrypting. When encrypting, * the signature is encrypted after the message was encrypted, so diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 7b4f3ff..e2b0cd0 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -138,7 +138,7 @@ void cleanup_helper(PNegoHelper helper); void check_version(PNegoHelper helper); /* Functions from base64_codec.c used elsewhere */ -SECURITY_STATUS encodeBase64(PBYTE in_buf, int in_len, char* out_buf, +SECURITY_STATUS encodeBase64(PBYTE in_buf, int in_len, char* out_buf, int max_len, int *out_len); SECURITY_STATUS decodeBase64(char *in_buf, int in_len, BYTE *out_buf, @@ -146,8 +146,8 @@ SECURITY_STATUS decodeBase64(char *in_buf, int in_len, BYTE *out_buf, /* Functions from util.c */ ULONG ComputeCrc32(const BYTE *pData, INT iLen, ULONG initial_crc); -SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE session_key); -SECURITY_STATUS SECUR32_CreateNTLMv2SubKeys(PNegoHelper helper); +SECURITY_STATUS SECUR32_CreateNTLM1SessionKey(PBYTE password, int len, PBYTE session_key); +SECURITY_STATUS SECUR32_CreateNTLM2SubKeys(PNegoHelper helper); arc4_info *SECUR32_arc4Alloc(void); void SECUR32_arc4Init(arc4_info *a4i, const BYTE *key, unsigned int keyLen); void SECUR32_arc4Process(arc4_info *a4i, BYTE *inoutString, unsigned int length); diff --git a/dlls/secur32/util.c b/dlls/secur32/util.c index a226bf5..ab52251 100644 --- a/dlls/secur32/util.c +++ b/dlls/secur32/util.c @@ -121,7 +121,7 @@ ULONG ComputeCrc32(const BYTE *pData, INT iLen, ULONG initial_crc) return ~crc; } -SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE session_key) +SECURITY_STATUS SECUR32_CreateNTLM1SessionKey(PBYTE password, int len, PBYTE session_key) { MD4_CTX ctx; BYTE ntlm_hash[16]; @@ -143,7 +143,7 @@ SECURITY_STATUS SECUR32_CreateNTLMv1SessionKey(PBYTE password, int len, PBYTE se return SEC_E_OK; } -static void SECUR32_CalcNTLMv2Subkey(const BYTE *session_key, const char *magic, PBYTE subkey) +static void SECUR32_CalcNTLM2Subkey(const BYTE *session_key, const char *magic, PBYTE subkey) { MD5_CTX ctx; @@ -155,7 +155,7 @@ static void SECUR32_CalcNTLMv2Subkey(const BYTE *session_key, const char *magic, } /* This assumes we do have a valid NTLM2 user session key */ -SECURITY_STATUS SECUR32_CreateNTLMv2SubKeys(PNegoHelper helper) +SECURITY_STATUS SECUR32_CreateNTLM2SubKeys(PNegoHelper helper) { helper->crypt.ntlm2.send_sign_key = HeapAlloc(GetProcessHeap(), 0, 16); helper->crypt.ntlm2.send_seal_key = HeapAlloc(GetProcessHeap(), 0, 16); @@ -164,24 +164,24 @@ SECURITY_STATUS SECUR32_CreateNTLMv2SubKeys(PNegoHelper helper) if(helper->mode == NTLM_CLIENT) { - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_sign_constant, helper->crypt.ntlm2.send_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_seal_constant, helper->crypt.ntlm2.send_seal_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_sign_constant, helper->crypt.ntlm2.recv_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_seal_constant, helper->crypt.ntlm2.recv_seal_key); } else { - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_sign_constant, helper->crypt.ntlm2.send_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, server_to_client_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, server_to_client_seal_constant, helper->crypt.ntlm2.send_seal_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_sign_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_sign_constant, helper->crypt.ntlm2.recv_sign_key); - SECUR32_CalcNTLMv2Subkey(helper->session_key, client_to_server_seal_constant, + SECUR32_CalcNTLM2Subkey(helper->session_key, client_to_server_seal_constant, helper->crypt.ntlm2.recv_seal_key); }

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_compatible_renderbuffer ().
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 92a44884c7b36bf70b1abdda7460a5e2c5b4e543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a44884c7b36bf70b1abdda7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:46 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_compatible_renderbuffer(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/surface.c | 29 ++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1a1a69d..870ab37 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -423,7 +423,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ unsigned int w = ((IWineD3DSurfaceImpl *)device->render_targets[0])->pow2Width; unsigned int h = ((IWineD3DSurfaceImpl *)device->render_targets[0])->pow2Height; - surface_set_compatible_renderbuffer(device->stencilBufferTarget, w, h); + surface_set_compatible_renderbuffer((IWineD3DSurfaceImpl *)device->stencilBufferTarget, w, h); } context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, (IWineD3DSurfaceImpl *)device->stencilBufferTarget, TRUE); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d2bdc9c..b7580c5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -873,15 +873,15 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct win * render target dimensions. With FBOs, the dimensions have to be an exact match. */ /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* GL locking is done by the caller */ -void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int width, unsigned int height) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; +void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned int width, unsigned int height) +{ + const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; renderbuffer_entry_t *entry; GLuint renderbuffer = 0; unsigned int src_width, src_height; - src_width = This->pow2Width; - src_height = This->pow2Height; + src_width = surface->pow2Width; + src_height = surface->pow2Height; /* A depth stencil smaller than the render target is not valid */ if (width > src_width || height > src_height) return; @@ -890,32 +890,35 @@ void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int wi if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || (width == src_width && height == src_height)) { - This->current_renderbuffer = NULL; + surface->current_renderbuffer = NULL; return; } /* Look if we've already got a renderbuffer of the correct dimensions */ - LIST_FOR_EACH_ENTRY(entry, &This->renderbuffers, renderbuffer_entry_t, entry) { - if (entry->width == width && entry->height == height) { + LIST_FOR_EACH_ENTRY(entry, &surface->renderbuffers, renderbuffer_entry_t, entry) + { + if (entry->width == width && entry->height == height) + { renderbuffer = entry->id; - This->current_renderbuffer = entry; + surface->current_renderbuffer = entry; break; } } - if (!renderbuffer) { + if (!renderbuffer) + { gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, - This->resource.format_desc->glInternal, width, height); + surface->resource.format_desc->glInternal, width, height); entry = HeapAlloc(GetProcessHeap(), 0, sizeof(renderbuffer_entry_t)); entry->width = width; entry->height = height; entry->id = renderbuffer; - list_add_head(&This->renderbuffers, &entry->entry); + list_add_head(&surface->renderbuffers, &entry->entry); - This->current_renderbuffer = entry; + surface->current_renderbuffer = entry; } checkGLcall("set_compatible_renderbuffer"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3594dfd..a0b398a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2680,7 +2680,7 @@ GLenum surface_get_gl_buffer(IWineD3DSurface *iface) DECLSPEC_HIDDEN; void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) DECLSPEC_HIDDEN; -void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, +void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned int width, unsigned int height) DECLSPEC_HIDDEN; void surface_set_texture_name(IWineD3DSurface *iface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(IWineD3DSurface *iface, GLenum target) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_is_offscreen().
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 03dc612c9c1c69aa599294bee948b0c5aeb877b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03dc612c9c1c69aa599294bee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:45 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_is_offscreen(). --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 17 ++++++++--------- dlls/wined3d/surface.c | 36 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 30 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03dc612c9c1c69aa59929…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_modify_ds_location() .
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: efb3993a3adcfce05489b62ad257da70ad1bdfe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb3993a3adcfce05489b62ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:44 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_modify_ds_location(). --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 16 +++++++--------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 547b109..1fb0dac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4513,7 +4513,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac if (Flags & WINED3DCLEAR_ZBUFFER) { /* Note that WINED3DCLEAR_ZBUFFER implies a depth stencil exists on the device */ DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; - surface_modify_ds_location(This->stencilBufferTarget, location); + surface_modify_ds_location(depth_stencil, location); } LEAVE_GL(); @@ -5920,11 +5920,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * if (This->stencilBufferTarget) { if (((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || ((IWineD3DSurfaceImpl *)This->stencilBufferTarget)->Flags & SFLAG_DISCARD) { - surface_modify_ds_location(This->stencilBufferTarget, SFLAG_DS_DISCARDED); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, SFLAG_DS_DISCARDED); } else { struct wined3d_context *context = context_acquire(This, This->render_targets[0], CTXUSAGE_RESOURCELOAD); surface_load_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, context, SFLAG_DS_OFFSCREEN); - surface_modify_ds_location(This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); context_release(context); } } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 03927c9..ed641a6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -614,7 +614,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT || This->stateBlock->renderState[WINED3DRS_ZENABLE]) surface_load_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, context, location); if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE]) - surface_modify_ds_location(This->stencilBufferTarget, location); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, location); } /* Ok, we will be updating the screen from here onwards so grab the lock */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d376e28..a91acb1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4054,17 +4054,15 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, const struct wined3d_gl device->shader_backend->shader_deselect_depth_blt((IWineD3DDevice *)device); } -void surface_modify_ds_location(IWineD3DSurface *iface, DWORD location) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - - TRACE("(%p) New location %#x\n", This, location); +void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) +{ + TRACE("surface %p, new location %#x.\n", surface, location); - if (location & ~SFLAG_DS_LOCATIONS) { - FIXME("(%p) Invalid location (%#x) specified\n", This, location); - } + if (location & ~SFLAG_DS_LOCATIONS) + FIXME("Invalid location (%#x) specified.\n", location); - This->Flags &= ~SFLAG_DS_LOCATIONS; - This->Flags |= location; + surface->Flags &= ~SFLAG_DS_LOCATIONS; + surface->Flags |= location; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8c78fac..934979b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -464,7 +464,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO if (This->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || ((IWineD3DSurfaceImpl *)This->device->stencilBufferTarget)->Flags & SFLAG_DISCARD) { - surface_modify_ds_location(This->device->stencilBufferTarget, SFLAG_DS_DISCARDED); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->device->stencilBufferTarget, SFLAG_DS_DISCARDED); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 42bafca..9bcfc7f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2679,7 +2679,7 @@ void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect) DECL GLenum surface_get_gl_buffer(IWineD3DSurface *iface) DECLSPEC_HIDDEN; void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void surface_modify_ds_location(IWineD3DSurface *iface, DWORD location) DECLSPEC_HIDDEN; +void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int width, unsigned int height) DECLSPEC_HIDDEN; void surface_set_texture_name(IWineD3DSurface *iface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_load_ds_location().
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: ae46589f535010e497965b97c5689841224b504c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae46589f535010e497965b97c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:43 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_load_ds_location(). --- dlls/wined3d/device.c | 4 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 69 ++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 44 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae46589f535010e497965…

1 0

Henri Verbeet : wined3d: Get rid of "myDevice".
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 10c5a8ac9e921f63df2c4d4565c87b5cf2e76f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c5a8ac9e921f63df2c4d456… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:42 2010 +0200 wined3d: Get rid of "myDevice". --- dlls/wined3d/surface.c | 162 ++++++++++++++++++++++++----------------------- 1 files changed, 83 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10c5a8ac9e921f63df2c4…

1 0

Davide Pizzetti : winedbg: Italian translation update.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: d084a6894743d99851448824aca8112398629b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d084a6894743d99851448824a… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Sat Apr 17 23:59:47 2010 +0200 winedbg: Italian translation update. --- programs/winedbg/rsrc_It.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/rsrc_It.rc b/programs/winedbg/rsrc_It.rc index 29a8005..b74c31c 100644 --- a/programs/winedbg/rsrc_It.rc +++ b/programs/winedbg/rsrc_It.rc @@ -43,10 +43,10 @@ BEGIN chiudersi. Siamo spiacenti per l'inconveniente.", IDC_STATIC_TXT1,27,10,224,30 LTEXT "Questo può essere causato da un problema nel programma o da una mancanza in Wine. \ - Potresti voler vedere http://appdb.winehq.org per consigli su \ + Potresti voler consultare http://appdb.winehq.org per consigli su \ questa applicazione.\n\n\ Se questo problema non è presente sotto Windows e non è stato ancora riportato, \ - puoi riportarlo a http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + puoi riportarlo su http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 DEFPUSHBUTTON "Chiudi", IDOK, 205, 151, 60, 16, WS_TABSTOP END

1 0

Davide Pizzetti : notepad: Italian translation update.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 7d1f26b16c78bfa218d7fd9502a5d1059b3b3fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1f26b16c78bfa218d7fd950… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Sat Apr 17 23:57:14 2010 +0200 notepad: Italian translation update. --- programs/notepad/It.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/notepad/It.rc b/programs/notepad/It.rc index ddd5b94..c4fce73 100644 --- a/programs/notepad/It.rc +++ b/programs/notepad/It.rc @@ -95,7 +95,7 @@ LTEXT "&Inferiore:", 0x14E,100, 73, 30, 10, WS_CHILD EDITTEXT IDC_PAGESETUP_BOTTOMVALUE, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "Cancella", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "Annulla", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP PUSHBUTTON "&Aiuto", IDHELP, 180, 39, 40, 15, WS_TABSTOP } @@ -112,7 +112,7 @@ STRINGTABLE DISCARDABLE STRING_PAGESETUP_HEADERVALUE, "&f" STRING_PAGESETUP_FOOTERVALUE, "Page &p" -STRING_NOTEPAD, "Blocco note" +STRING_NOTEPAD, "Blocco Note" STRING_ERROR, "ERRORE" STRING_WARNING, "ATTENZIONE" STRING_INFO, "Info" @@ -139,7 +139,7 @@ STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -Questo file contiene caratteri Unicode che verranno persi se\n\ +Questo file contiene caratteri Unicode che andranno persi se\n\ salvi questo file nella codifica %s.\n\ Per mantenere questi caratteri, clicca Annulla e scegli\n\ una delle opzioni Unicode nel menu a tendina Codifica.\n\

1 0

Davide Pizzetti : winemine: Italian translation update.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: d84d885050e6ed81ac374ff7c18cc8920251a2cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84d885050e6ed81ac374ff7c… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Sat Apr 17 23:52:52 2010 +0200 winemine: Italian translation update. --- programs/winemine/It.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemine/It.rc b/programs/winemine/It.rc index a799fa4..50d25b3 100644 --- a/programs/winemine/It.rc +++ b/programs/winemine/It.rc @@ -47,7 +47,7 @@ MENU_WINEMINE MENU DISCARDABLE } POPUP "&Informazioni" { MENUITEM "&Tempi migliori", IDM_TIMES - MENUITEM "&Informazioni su WineMine", IDM_ABOUT + MENUITEM "&Riguardo a WineMine", IDM_ABOUT } } @@ -82,7 +82,7 @@ CAPTION "Congratulazioni!" DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Custom Game" +CAPTION "Gioco Personalizzato" { LTEXT "Righe", -1, 5, 5, 30, 10 LTEXT "Colonne", -1, 5, 35, 30, 10

1 0

Davide Pizzetti : wineboot: Italian translation update.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 029f4527645b0bdbf04f13c9d792b6838938afaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=029f4527645b0bdbf04f13c9d… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Sat Apr 17 23:43:01 2010 +0200 wineboot: Italian translation update. --- programs/wineboot/wineboot_It.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot_It.rc b/programs/wineboot/wineboot_It.rc index 452f60a..a3c3f64 100644 --- a/programs/wineboot/wineboot_It.rc +++ b/programs/wineboot/wineboot_It.rc @@ -33,7 +33,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Annulla",IDCANCEL,129,49,50,15 PUSHBUTTON "Termina il processo",IDOK,51,49,71,15 - LTEXT "Un log-off o uno spegimento simulato è in corso, ma questo programma non risponde.", + LTEXT "Una disconnessione o uno spegnimento simulato sono in corso, ma questo programma non risponde.", IDC_STATIC,7,7,172,19 LTEXT "Se termini il processo, rischi di perdere tutti i dati non salvati.", IDC_STATIC,7,28,172,15

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010