May 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Set the swapchain.c GLINFO_LOCATION to *gl_info.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: bcc4603125e85f30e0c041f6bec075289516b5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc4603125e85f30e0c041f6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 24 09:56:35 2010 +0200 wined3d: Set the swapchain.c GLINFO_LOCATION to *gl_info. --- dlls/wined3d/swapchain.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7dca253..485329c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(fps); -#define GLINFO_LOCATION This->device->adapter->gl_info +#define GLINFO_LOCATION (*gl_info) /*IWineD3DSwapChain parts follow: */ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) @@ -217,6 +217,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; + const struct wined3d_gl_info *gl_info; struct wined3d_context *context; RECT src_rect, dst_rect; BOOL render_to_fbo; @@ -233,6 +234,8 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO return WINED3D_OK; } + gl_info = context->gl_info; + /* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */ if (This->device->bCursorVisible && This->device->cursorTexture) { @@ -254,7 +257,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO cursor.resource.ref = 1; cursor.resource.device = This->device; cursor.resource.pool = WINED3DPOOL_SCRATCH; - cursor.resource.format_desc = getFormatDescEntry(WINED3DFMT_B8G8R8A8_UNORM, context->gl_info); + cursor.resource.format_desc = getFormatDescEntry(WINED3DFMT_B8G8R8A8_UNORM, gl_info); cursor.resource.resourceType = WINED3DRTYPE_SURFACE; cursor.texture_name = This->device->cursorTexture; cursor.texture_target = GL_TEXTURE_2D; @@ -485,7 +488,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO } if (This->presentParms.PresentationInterval != WINED3DPRESENT_INTERVAL_IMMEDIATE - && context->gl_info->supported[SGI_VIDEO_SYNC]) + && gl_info->supported[SGI_VIDEO_SYNC]) { retval = GL_EXTCALL(glXGetVideoSyncSGI(&sync)); if(retval != 0) {

1 0

Dylan Smith : richedit: Commit undo items after modifications in WM_IME_COMPOSITION.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: e809bc887d48700bfa8985b806eef674b35ac6f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e809bc887d48700bfa8985b80… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon May 24 01:04:53 2010 -0400 richedit: Commit undo items after modifications in WM_IME_COMPOSITION. ME_InsertTextFromCursor could previously follow the ME_CommitUndo call leaving uncommitted changes which would cause improper grouping of commits, or an assertion failure. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7764614..e93db65 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4256,7 +4256,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_Style *style = ME_GetInsertStyle(editor, 0); hIMC = ITextHost_TxImmGetContext(editor->texthost); ME_DeleteSelection(editor); - ME_CommitUndo(editor); ME_SaveTempStyle(editor); if (lParam & GCS_RESULTSTR) { @@ -4286,6 +4285,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); } ME_ReleaseStyle(style); + ME_CommitUndo(editor); ME_UpdateRepaint(editor); return 0; }

1 0

Marcus Meissner : ntdll: qsort: comparator must not get the same pointer.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 34d17c9ea18f43abfc7eefa48fa862a611dccfa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d17c9ea18f43abfc7eefa48… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 23 13:33:40 2010 +0200 ntdll: qsort: comparator must not get the same pointer. --- dlls/ntdll/misc.c | 2 +- dlls/ntdll/tests/string.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 621848e..2d7c0a7 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -272,7 +272,7 @@ NTDLL_mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const for (k=left; k<=right; k++) { /*arr[k]=(barr[i]<barr[j])?barr[i++]:barr[j--];*/ - if (compar(X(barr,i),X(barr,j))<0) { + if (i != j && compar(X(barr,i),X(barr,j))<0) { memcpy(X(arr,k),X(barr,i),elemsize); i++; } else { diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index cd362ed..3f7236a 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1145,16 +1145,19 @@ static void test_wcsrchr(void) static __cdecl int intcomparefunc(const void *a, const void*b) { + ok (a != b, "must never get the same pointer\n"); return (*(int*)a) - (*(int*)b); } static __cdecl int charcomparefunc(const void *a, const void*b) { + ok (a != b, "must never get the same pointer\n"); return (*(char*)a) - (*(char*)b); } static __cdecl int strcomparefunc(const void *a, const void*b) { + ok (a != b, "must never get the same pointer\n"); return lstrcmpA(*(char**)a,*(char**)b); }

1 0

Piotr Caban : msvcrt: Fix mbstowcs_l implementation.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 2ca3b9e0162fac9d2a09c8d92df08034c4cb6b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca3b9e0162fac9d2a09c8d92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 22 22:24:40 2010 +0200 msvcrt: Fix mbstowcs_l implementation. --- dlls/msvcrt/mbcs.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 837ac02..8fca06d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1725,22 +1725,29 @@ MSVCRT_size_t CDECL _mbstrlen(const char* str) MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { - MSVCRT_size_t tmp; + MSVCRT_size_t i, size; if(!locale) locale = get_locale(); - tmp = _mbstrlen_l(mbstr, locale); - if(tmp>count && wcstr) - tmp = count; + /* Ignore count parameter */ + if(!wcstr) + return MultiByteToWideChar(locale->locinfo->lc_codepage, 0, mbstr, -1, NULL, 0)-1; - tmp = MultiByteToWideChar(locale->locinfo->lc_codepage, 0, - mbstr, tmp, wcstr, count); + for(i=0, size=0; i<count; i++) { + if(mbstr[size] == '\0') + break; + + size += (MSVCRT_isleadbyte(mbstr[size]) ? 2 : 1); + } + + size = MultiByteToWideChar(locale->locinfo->lc_codepage, 0, + mbstr, size, wcstr, count); - if(tmp<count && wcstr) - wcstr[tmp] = '\0'; + if(size<count && wcstr) + wcstr[size] = '\0'; - return tmp; + return size; } /*********************************************************************

1 0

Sven Baars : taskmgr: Fix Dutch translation.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 7b8243e5e55ece9b152cbee580a6603bd89c00fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8243e5e55ece9b152cbee58… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat May 22 20:10:15 2010 +0200 taskmgr: Fix Dutch translation. --- programs/taskmgr/Nl.rc | 112 ++++++++++++++++++++++++------------------------ 1 files changed, 56 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b8243e5e55ece9b152cb…

1 0

Sven Baars : msi: Update Dutch translation.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 23f9b07d6aaba90c336cede38772075d1f7a41e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23f9b07d6aaba90c336cede38… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 21 20:17:23 2010 +0200 msi: Update Dutch translation. --- dlls/msi/msi_Nl.rc | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msi/msi_Nl.rc b/dlls/msi/msi_Nl.rc index e0ae9d6..306cfd7 100644 --- a/dlls/msi/msi_Nl.rc +++ b/dlls/msi/msi_Nl.rc @@ -1,5 +1,5 @@ /* - * Durch resources for MSI + * Dutch resources for MSI * * Copyright 2005 Hans Leidekker * @@ -28,30 +28,30 @@ STRINGTABLE DISCARDABLE 5 "Pad %s niet gevonden" 9 "Plaats disk %s" 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ + "Gebruik:\n" \ + "msiexec commando {vereiste parameter} [optionele parameter]\n\n" \ + "Installeer een product:\n" \ + "\t/i {pakket|productcode} [eigenschap]\n" \ + "\t/package {pakket|productcode} [eigenschap]\n" \ + "\t/a pakket [eigenschap]\n" \ + "Herstel een installatie:\n" \ + "\t/f[p|o|e|d|c|a|u|m|s|v] {pakket|productcode}\n" \ + "Verwijder een product:\n" \ + "\t/uninstall {pakket|productcode} [eigenschap]\n" \ + "\t/x {pakket|productcode} [eigenschap]\n" \ + "Adverteer een product:\n" \ + "\t/j[u|m] pakket [/t transform] [/g languageid]\n" \ + "Pas een patch toe:\n" \ + "\t/p patchpakket [eigenschap]\n" \ + "\t/p patchpakket /a pakket [eigenschap]\n" \ + "Log en UI Modifiers voor bovenstaande commando's:\n" \ + "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logbestand\n" \ "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ + "Registreer MSI Service:\n" \ "\t/y\n" \ - "Unregister MSI Service:\n" \ + "Maak registratie MSI Service ongedaan:\n" \ "\t/z\n" \ - "Display this help:\n" \ + "Laat dit helpvenster zien:\n" \ "\t/help\n" \ "\t/?\n" 11 "Voer de map in die %s bevat"

1 0

Maarten Lankhorst : winmm: Wake up timer after the timer list is empty.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 3e5f7f49fe12e87d7ecd30f0969e99814dfb0e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5f7f49fe12e87d7ecd30f09… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 21 21:31:26 2010 +0200 winmm: Wake up timer after the timer list is empty. --- dlls/winmm/time.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 3d45fd9..e692fb6 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -369,8 +369,11 @@ MMRESULT WINAPI timeKillEvent(UINT wID) break; } } - if (list_empty(&timer_list)) + if (list_empty(&timer_list)) { + char c = 'q'; TIME_TimeToDie = 1; + write(TIME_fdWake[1], &c, sizeof(c)); + } LeaveCriticalSection(&WINMM_cs); if (!lpSelf)

1 0

Aric Stewart : gdi32: Handle a BiDi string being shaped into more or less glyphs than characters in the string .
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: ec62c33d79dd99e4ced80a1f248b1d6d98366b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec62c33d79dd99e4ced80a1f2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 15:11:34 2010 -0500 gdi32: Handle a BiDi string being shaped into more or less glyphs than characters in the string. --- dlls/gdi32/bidi.c | 5 ++++- dlls/gdi32/font.c | 9 +++++++-- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 20fde13..82691ed 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -352,7 +352,8 @@ BOOL BIDI_Reorder( LPWSTR lpOutString, /* [out] Reordered string */ INT uCountOut, /* [in] Size of output buffer */ UINT *lpOrder, /* [out] Logical -> Visual order map */ - WORD **lpGlyphs /* [out] reordered, mirrored, shaped glyphs to display */ + WORD **lpGlyphs, /* [out] reordered, mirrored, shaped glyphs to display */ + INT *cGlyphs /* [out] number of glyphs generated */ ) { WORD *chartype; @@ -637,6 +638,8 @@ BOOL BIDI_Reorder( done += i; } + if (cGlyphs) + *cGlyphs = glyph_i; HeapFree(GetProcessHeap(), 0, chartype); HeapFree(GetProcessHeap(), 0, levels); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 963dadc..17fb381 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1702,16 +1702,21 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && count > 0 ) { + INT cGlyphs; reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR)); BIDI_Reorder( hdc, str, count, GCP_REORDER, ((flags&ETO_RTLREADING)!=0 || (GetTextAlign(hdc)&TA_RTLREADING)!=0)? WINE_GCPW_FORCE_RTL:WINE_GCPW_FORCE_LTR, - reordered_str, count, NULL, &glyphs ); + reordered_str, count, NULL, &glyphs, &cGlyphs); flags |= ETO_IGNORELANGUAGE; if (glyphs) + { flags |= ETO_GLYPH_INDEX; + if (cGlyphs != count) + count = cGlyphs; + } } else if(flags & ETO_GLYPH_INDEX) glyphs = reordered_str; @@ -2874,7 +2879,7 @@ GetCharacterPlacementW( } else { BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, - nSet, lpResults->lpOrder, NULL ); + nSet, lpResults->lpOrder, NULL, NULL ); } /* FIXME: Will use the placement chars */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 10ff13e..d1cb66b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -356,7 +356,7 @@ typedef struct tagBITMAPOBJ #define WINE_GCPW_LOOSE_MASK 2 extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags, - LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs ) DECLSPEC_HIDDEN; + LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs, INT* cGlyphs ) DECLSPEC_HIDDEN; /* bitmap.c */ extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN;

1 0

Aric Stewart : usp10: Handle Ligature Substitution Subtable from GSUB.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 6c73258725b7099f028a98443e676f8ed243f427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c73258725b7099f028a98443… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 15:12:03 2010 -0500 usp10: Handle Ligature Substitution Subtable from GSUB. This also involves a restructuring of the handling of glyph lookups from GSUB since Ligature Substitution can result in many glyphs being replaced with 1 glyph, and future looksup may result in one glyph being replaces with many glyphs. --- dlls/usp10/shape.c | 247 ++++++++++++++++++++++++++++++++---------- dlls/usp10/usp10.c | 2 +- dlls/usp10/usp10_internal.h | 2 +- 3 files changed, 190 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c73258725b7099f028a9…

1 0

Andrey Turkin : oleaut32: Don't rewrite name's hreftype.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 234afb88e8f62c6891a32b5848295cb8b84535ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=234afb88e8f62c6891a32b584… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat May 22 00:49:29 2010 +0400 oleaut32: Don't rewrite name's hreftype. --- dlls/oleaut32/typelib2.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index b5d85ff..aa14d22 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2239,7 +2239,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( iter->name = offset; namedata = This->typelib->typelib_segment_data[MSFT_SEG_NAME] + offset; - *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; + if (*((INT*)namedata) == -1) + *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; len = iter->u.data[0]/4 - iter->u.data[5]*3;

1 0