February 2013 - Wine-Commits

Akihiro Sagawa : gdi32: Ensure a fixed-pitch full-width character has double advance of a half-width character .
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 9aa8300f99965d2b66eb7016ff3e44a3d517ba8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa8300f99965d2b66eb7016f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Feb 7 22:13:04 2013 +0900 gdi32: Ensure a fixed-pitch full-width character has double advance of a half-width character. --- dlls/gdi32/freetype.c | 37 ++++++++++++++++++-- dlls/gdi32/tests/font.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 40cf080..b977b0d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5821,6 +5821,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, BOOL needsTransform = FALSE; BOOL tategaki = (font->GSUB_Table != NULL); UINT original_index; + FT_Fixed avgAdvance = 0; TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat); @@ -5957,10 +5958,26 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, return GDI_ERROR; } + if(FT_IS_SCALABLE(incoming_font->ft_face)) { + TEXTMETRICW tm; + if (get_text_metrics(incoming_font, &tm) && + !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH)) { + avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, + incoming_font->ft_face->size->metrics.x_scale); + if (avgAdvance && (ft_face->glyph->metrics.horiAdvance+63) >> 6 == (avgAdvance*2+63) >> 6) + TRACE("Fixed-pitch full-width character detected\n"); + else + avgAdvance = 0; /* cancel this feature */ + } + } + if(!needsTransform) { left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64; right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64; - adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6; + if (!avgAdvance) + adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6; + else + adv = (INT)((avgAdvance + 32) >> 6) * 2; top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; bottom = (ft_face->glyph->metrics.horiBearingY - @@ -6001,13 +6018,27 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = ft_face->glyph->metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); - lpgm->gmCellIncX = (vec.x+63) >> 6; lpgm->gmCellIncY = -((vec.y+63) >> 6); + if (!avgAdvance || vec.y) + lpgm->gmCellIncX = (vec.x+63) >> 6; + else { + vec.x = avgAdvance; + vec.y = 0; + pFT_Vector_Transform(&vec, &transMat); + lpgm->gmCellIncX = ((vec.x+32) >> 6) * 2; + } vec.x = ft_face->glyph->metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); - adv = (vec.x+63) >> 6; + if (!avgAdvance || vec.y) + adv = (vec.x+63) >> 6; + else { + vec.x = avgAdvance; + vec.y = 0; + pFT_Vector_Transform(&vec, &transMatUnrotated); + adv = ((vec.x+32) >> 6) * 2; + } } lpgm->gmBlackBoxX = (right - left) >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f234b62..943f584 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3552,6 +3552,38 @@ todo_wine DeleteDC(hdc); } +static int CALLBACK create_fixed_pitch_font_proc(const LOGFONT *lpelfe, + const TEXTMETRIC *lpntme, + DWORD FontType, LPARAM lParam) +{ + const NEWTEXTMETRICEX *lpntmex = (const NEWTEXTMETRICEX *)lpntme; + CHARSETINFO csi; + LOGFONT lf = *lpelfe; + HFONT hfont; + + /* skip bitmap, proportional or vertical font */ + if ((FontType & TRUETYPE_FONTTYPE) == 0 || + (lf.lfPitchAndFamily & 0xf) != FIXED_PITCH || + lf.lfFaceName[0] == '@') + return 1; + + /* skip linked font */ + if (!TranslateCharsetInfo((DWORD*)(INT_PTR)lpelfe->lfCharSet, &csi, TCI_SRCCHARSET) || + (lpntmex->ntmFontSig.fsCsb[0] & csi.fs.fsCsb[0]) == 0) + return 1; + + /* test with an odd height */ + lf.lfHeight = -19; + lf.lfWidth = 0; + hfont = CreateFontIndirect(&lf); + if (hfont) + { + *(HFONT *)lParam = hfont; + return 0; + } + return 1; +} + static void test_GetGlyphOutline(void) { HDC hdc; @@ -3640,6 +3672,8 @@ static void test_GetGlyphOutline(void) for (i = 0; i < sizeof c / sizeof c[0]; ++i) { + static const MAT2 rotate_mat = {{0, 0}, {0, -1}, {0, 1}, {0, 0}}; + lf.lfFaceName[0] = '\0'; lf.lfCharSet = c[i].cs; lf.lfPitchAndFamily = 0; @@ -3670,6 +3704,60 @@ static void test_GetGlyphOutline(void) ret2 = GetGlyphOutlineW(hdc, c[i].w, GGO_BITMAP, &gm2, 0, NULL, &mat); ok(ret == ret2 && memcmp(&gm, &gm2, sizeof gm) == 0, "%d %d\n", ret, ret2); + if (EnumFontFamiliesEx(hdc, &lf, create_fixed_pitch_font_proc, (LPARAM)&hfont, 0)) + { + skip("Fixed-pitch TrueType font for charset %u is not available\n", c[i].cs); + continue; + } + DeleteObject(SelectObject(hdc, hfont)); + if (c[i].a <= 0xff) + { + DeleteObject(SelectObject(hdc, old_hfont)); + continue; + } + + ret = GetObject(hfont, sizeof lf, &lf); + ok(ret > 0, "GetObject error %u\n", GetLastError()); + + ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + trace("Tests with height=%d,half=%d,full=%d,face=%s,charset=%d\n", + -lf.lfHeight, gm.gmCellIncX, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), + "expected %d, got %d (%s:%d)\n", + gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &rotate_mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ok(gm2.gmCellIncY == -lf.lfHeight, + "expected %d, got %d (%s:%d)\n", + -lf.lfHeight, gm2.gmCellIncY, lf.lfFaceName, lf.lfCharSet); + + lf.lfItalic = TRUE; + hfont = CreateFontIndirect(&lf); + ok(hfont != NULL, "CreateFontIndirect error %u\n", GetLastError()); + DeleteObject(SelectObject(hdc, hfont)); + ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), + "expected %d, got %d (%s:%d)\n", + gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + + lf.lfItalic = FALSE; + lf.lfEscapement = lf.lfOrientation = 2700; + hfont = CreateFontIndirect(&lf); + ok(hfont != NULL, "CreateFontIndirect error %u\n", GetLastError()); + DeleteObject(SelectObject(hdc, hfont)); + ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ok(gm2.gmCellIncY == -lf.lfHeight, + "expected %d, got %d (%s:%d)\n", + -lf.lfHeight, gm2.gmCellIncY, lf.lfFaceName, lf.lfCharSet); + hfont = SelectObject(hdc, old_hfont); DeleteObject(hfont); }

1 0

André Hentschel : ntdll: Set TPIDRURW to TEB on thread init for ARM.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: b288f7be1860c6373555b3d412fe849a656fe165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b288f7be1860c6373555b3d41… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 6 22:00:59 2013 +0100 ntdll: Set TPIDRURW to TEB on thread init for ARM. --- dlls/ntdll/signal_arm.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 5ad4016..6abd76b 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -832,6 +832,21 @@ void signal_free_thread( TEB *teb ) NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } +/********************************************************************** + * set_tpidrurw + * + * Win32/ARM applications expect the TEB pointer to be in the TPIDRURW register. + */ +#ifdef __ARM_ARCH_7A__ +extern void set_tpidrurw( TEB *teb ); +__ASM_GLOBAL_FUNC( set_tpidrurw, + "mcr p15, 0, r0, c13, c0, 2\n\t" /* TEB -> TPIDRURW */ + "blx lr" ) +#else +void set_tpidrurw( TEB *teb ) +{ +} +#endif /********************************************************************** * signal_init_thread @@ -845,6 +860,7 @@ void signal_init_thread( TEB *teb ) pthread_key_create( &teb_key, NULL ); init_done = 1; } + set_tpidrurw( teb ); pthread_setspecific( teb_key, teb ); }

1 0

Huw Davies : riched20: Move SplitRun to wrap.c and make it static.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 68d72f479288fc77436e4d7b4d64aa5f7d7d8218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d72f479288fc77436e4d7b4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 7 14:30:47 2013 +0000 riched20: Move SplitRun to wrap.c and make it static. --- dlls/riched20/editor.h | 1 - dlls/riched20/run.c | 48 ------------------------------------ dlls/riched20/wrap.c | 63 ++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 6562b8e..9722f36 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -146,7 +146,6 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) DECLSPEC_ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) DECLSPEC_HIDDEN; int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2) DECLSPEC_HIDDEN; void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) DECLSPEC_HIDDEN; -ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nChar) DECLSPEC_HIDDEN; ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run) DECLSPEC_HIDDEN; void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 54db370..aaa6300 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -243,54 +243,6 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) } /****************************************************************************** - * ME_SplitRun - * - * Splits a run into two in a given place. It also updates the screen position - * and size (extent) of the newly generated runs. - */ -ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar) -{ - ME_TextEditor *editor = wc->context->editor; - ME_Run *run, *run2; - ME_Paragraph *para = &wc->pPara->member.para; - ME_Cursor cursor = {wc->pPara, item, nVChar}; - - assert(item->member.run.nCharOfs != -1); - if(TRACE_ON(richedit)) - { - TRACE("Before check before split\n"); - ME_CheckCharOffsets(editor); - TRACE("After check before split\n"); - } - - run = &item->member.run; - - TRACE("Before split: %s(%d, %d)\n", debugstr_run( run ), - run->pt.x, run->pt.y); - - ME_SplitRunSimple(editor, &cursor); - - run2 = &cursor.pRun->member.run; - - ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); - - run2->pt.x = run->pt.x+run->nWidth; - run2->pt.y = run->pt.y; - - if(TRACE_ON(richedit)) - { - TRACE("Before check after split\n"); - ME_CheckCharOffsets(editor); - TRACE("After check after split\n"); - TRACE("After split: %s(%d, %d), %s(%d, %d)\n", - debugstr_run( run ), run->pt.x, run->pt.y, - debugstr_run( run2 ), run2->pt.x, run2->pt.y); - } - - return cursor.pRun; -} - -/****************************************************************************** * ME_SplitRunSimple * * Does the most basic job of splitting a run into two - it does not diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index b63697b..97598e7 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -32,6 +32,55 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); * - no tabs */ +/****************************************************************************** + * split_run_extents + * + * Splits a run into two in a given place. It also updates the screen position + * and size (extent) of the newly generated runs. + */ +static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *item, int nVChar) +{ + ME_TextEditor *editor = wc->context->editor; + ME_Run *run, *run2; + ME_Paragraph *para = &wc->pPara->member.para; + ME_Cursor cursor = {wc->pPara, item, nVChar}; + + assert(item->member.run.nCharOfs != -1); + if(TRACE_ON(richedit)) + { + TRACE("Before check before split\n"); + ME_CheckCharOffsets(editor); + TRACE("After check before split\n"); + } + + run = &item->member.run; + + TRACE("Before split: %s(%d, %d)\n", debugstr_run( run ), + run->pt.x, run->pt.y); + + ME_SplitRunSimple(editor, &cursor); + + run2 = &cursor.pRun->member.run; + + ME_CalcRunExtent(wc->context, para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run); + + run2->pt.x = run->pt.x+run->nWidth; + run2->pt.y = run->pt.y; + + if(TRACE_ON(richedit)) + { + TRACE("Before check after split\n"); + ME_CheckCharOffsets(editor); + TRACE("After check after split\n"); + TRACE("After split: %s(%d, %d), %s(%d, %d)\n", + debugstr_run( run ), run->pt.x, run->pt.y, + debugstr_run( run2 ), run2->pt.x, run2->pt.y); + } + + return cursor.pRun; +} + + static ME_DisplayItem *ME_MakeRow(int height, int baseline, int width) { ME_DisplayItem *item = ME_MakeDI(diStartRow); @@ -247,7 +296,7 @@ static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, i return NULL; j = reverse_find_non_whitespace( get_text( &p->member.run, 0 ), i); if (j>0) { - pp = ME_SplitRun(wc, piter, j); + pp = split_run_extents(wc, piter, j); wc->pt.x += piter->member.run.nWidth; return pp; } @@ -267,7 +316,7 @@ static ME_DisplayItem *ME_MaximizeSplit(ME_WrapContext *wc, ME_DisplayItem *p, i { i = reverse_find_non_whitespace( get_text( &piter->member.run, 0 ), piter->member.run.len ); - pp = ME_SplitRun(wc, piter, i); + pp = split_run_extents(wc, piter, i); wc->pt = pp->member.run.pt; return pp; } @@ -322,7 +371,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem if (i == len) i = reverse_find_non_whitespace( get_text( run, 0 ), len ); if (i) { - ME_DisplayItem *piter2 = ME_SplitRun(wc, piter, i); + ME_DisplayItem *piter2 = split_run_extents(wc, piter, i); wc->pt = piter2->member.run.pt; return piter2; } @@ -339,7 +388,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem TRACE("Backtracking failed, trying desperate: %s\n", debugstr_run( &p->member.run )); /* OK, no better idea, so assume we MAY split words if we can split at all*/ if (idesp) - return ME_SplitRun(wc, piter, idesp); + return split_run_extents(wc, piter, idesp); else if (wc->pRowStart && piter != wc->pRowStart) { @@ -353,7 +402,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem /* split point inside first character - no choice but split after that char */ if (len != 1) { /* the run is more than 1 char, so we may split */ - return ME_SplitRun(wc, piter, 1); + return split_run_extents(wc, piter, 1); } /* the run is one char, can't split it */ return piter; @@ -393,7 +442,7 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) black = find_non_whitespace( get_text( run, 0 ), run->len, 0 ); if (black) { wc->bOverflown = FALSE; - pp = ME_SplitRun(wc, p, black); + pp = split_run_extents(wc, p, black); ME_CalcRunExtent(wc->context, &wc->pPara->member.para, wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, &pp->member.run); @@ -444,7 +493,7 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) { /* we aren't sure if it's *really* necessary, it's a good start however */ int black = reverse_find_non_whitespace( get_text( run, 0 ), len ); - ME_SplitRun(wc, p, black); + split_run_extents(wc, p, black); /* handle both parts again */ return p; }

1 0

Michael Stefaniuc : d3d10core: Remove ERR() on HeapAlloc failure for small sizes known at compile time.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 1eff4669ff70ee74ed9b6d5237c9533ae1e5a54c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eff4669ff70ee74ed9b6d523… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 7 12:50:28 2013 +0100 d3d10core: Remove ERR() on HeapAlloc failure for small sizes known at compile time. --- dlls/d3d10core/device.c | 45 --------------------------------------------- 1 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index c45ebd8..f7b906d 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1068,10 +1068,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 buffer object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_buffer_init(object, This, desc, data); if (FAILED(hr)) @@ -1108,10 +1105,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device *ifac object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 texture2d object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_texture2d_init(object, This, desc); if (FAILED(hr)) @@ -1140,10 +1134,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device *ifac object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 texture3d object memory.\n"); return E_OUTOFMEMORY; - } hr = d3d10_texture3d_init(object, device, desc); if (FAILED(hr)) @@ -1169,10 +1160,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 shader resource view object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_shader_resource_view_init(object, resource, desc))) { @@ -1197,10 +1185,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 rendertarget view object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_rendertarget_view_init(object, resource, desc); if (FAILED(hr)) @@ -1226,10 +1211,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 depthstencil view object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_depthstencil_view_init(object, resource, desc))) { @@ -1260,10 +1242,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 input layout object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_input_layout_init(object, This, element_descs, element_count, shader_byte_code, shader_byte_code_length); @@ -1292,10 +1271,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 vertex shader object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_vertex_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) @@ -1323,10 +1299,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 geometry shader object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_geometry_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) @@ -1366,10 +1339,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 pixel shader object memory\n"); return E_OUTOFMEMORY; - } hr = d3d10_pixel_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) @@ -1411,10 +1381,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 blend state object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_blend_state_init(object, device, desc))) { @@ -1455,10 +1422,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 depthstencil state object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_depthstencil_state_init(object, device, desc))) { @@ -1500,10 +1464,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 rasterizer state object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_rasterizer_state_init(object, device, desc))) { @@ -1544,10 +1505,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 sampler state object memory.\n"); return E_OUTOFMEMORY; - } if (FAILED(hr = d3d10_sampler_state_init(object, device, desc))) { @@ -1572,10 +1530,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device *iface, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) - { - ERR("Failed to allocate D3D10 query object memory.\n"); return E_OUTOFMEMORY; - } hr = d3d10_query_init(object); if (FAILED(hr))

1 0

Ken Thomases : winemac: Add WineApplication methods to convert from Cocoa to Win32 coordinate space .
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 6289a612ae6bbe0fcd07d7a3c8ff802db10fc5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6289a612ae6bbe0fcd07d7a3c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 19:32:22 2013 -0600 winemac: Add WineApplication methods to convert from Cocoa to Win32 coordinate space. Cocoa coordinate space has its origin in the lower left of the primary screen and y increases up. --- dlls/winemac.drv/cocoa_app.h | 3 +++ dlls/winemac.drv/cocoa_app.m | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 2ccaec9..1166087 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -43,6 +43,9 @@ CGEventSourceKeyboardType keyboardType; NSEvent* lastFlagsChanged; + + CGFloat primaryScreenHeight; + BOOL primaryScreenHeightValid; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3853ec9..ae2353b 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -225,6 +225,32 @@ int macdrv_err_on; } } + - (CGFloat) primaryScreenHeight + { + if (!primaryScreenHeightValid) + { + NSArray* screens = [NSScreen screens]; + if ([screens count]) + { + primaryScreenHeight = NSHeight([[screens objectAtIndex:0] frame]); + primaryScreenHeightValid = TRUE; + } + else + return 1280; /* arbitrary value */ + } + + return primaryScreenHeight; + } + + - (NSPoint) flippedMouseLocation:(NSPoint)point + { + /* This relies on the fact that Cocoa's mouse location points are + actually off by one (precisely because they were flipped from + Quartz screen coordinates using this same technique). */ + point.y = [self primaryScreenHeight] - point.y; + return point; + } + /* * ---------- NSApplication method overrides ---------- @@ -241,6 +267,11 @@ int macdrv_err_on; /* * ---------- NSApplicationDelegate methods ---------- */ + - (void)applicationDidChangeScreenParameters:(NSNotification *)notification + { + primaryScreenHeightValid = FALSE; + } + - (void)applicationDidResignActive:(NSNotification *)notification { macdrv_event event;

1 0

Ken Thomases : winemac: Implement SysCommand() to prevent Alt keypresses from activating system menu.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 5f06bf80db714c1c355018cf7e3bd0e5eaa73ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f06bf80db714c1c355018cf7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 6 19:32:18 2013 -0600 winemac: Implement SysCommand() to prevent Alt keypresses from activating system menu. --- dlls/winemac.drv/window.c | 30 ++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 9d63912..7a7eda7 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1041,6 +1041,36 @@ done: /*********************************************************************** + * SysCommand (MACDRV.@) + * + * Perform WM_SYSCOMMAND handling. + */ +LRESULT CDECL macdrv_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam) +{ + struct macdrv_win_data *data; + LRESULT ret = -1; + + TRACE("%p, %x, %lx\n", hwnd, (unsigned)wparam, lparam); + + if (!(data = get_win_data(hwnd))) goto done; + if (!data->cocoa_window || !data->on_screen) goto done; + + /* prevent a simple ALT press+release from activating the system menu, + as that can get confusing */ + if ((wparam & 0xfff0) == SC_KEYMENU && !(WCHAR)lparam && !GetMenu(hwnd) && + (GetWindowLongW(hwnd, GWL_STYLE) & WS_SYSMENU)) + { + TRACE("ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam); + ret = 0; + } + +done: + release_win_data(data); + return ret; +} + + +/*********************************************************************** * UpdateLayeredWindow (MACDRV.@) */ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 30df9d6..57b1e5a 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -24,6 +24,7 @@ @ cdecl SetWindowStyle(ptr long ptr) macdrv_SetWindowStyle @ cdecl SetWindowText(long wstr) macdrv_SetWindowText @ cdecl ShowWindow(long long ptr long) macdrv_ShowWindow +@ cdecl SysCommand(long long long) macdrv_SysCommand @ cdecl ToUnicodeEx(long long ptr ptr long long long) macdrv_ToUnicodeEx @ cdecl UpdateLayeredWindow(long ptr ptr) macdrv_UpdateLayeredWindow @ cdecl VkKeyScanEx(long long) macdrv_VkKeyScanEx

1 0

Michael Stefaniuc : d3drm: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 9affa153fdc96dbeb36f502049a01e8cb1da9803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9affa153fdc96dbeb36f50204… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:10:01 2013 +0100 d3drm: Let C look like C. --- dlls/d3drm/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index f72dcaa..6ff4345 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -62,7 +62,7 @@ static HRESULT WINAPI IDirect3DRMTexture2Impl_QueryInterface(IDirect3DRMTexture2 { *object = &This->IDirect3DRMTexture2_iface; } - else if IsEqualGUID(riid, &IID_IDirect3DRMTexture3) + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) { *object = &This->IDirect3DRMTexture3_iface; } @@ -431,7 +431,7 @@ static HRESULT WINAPI IDirect3DRMTexture3Impl_QueryInterface(IDirect3DRMTexture3 { *object = &This->IDirect3DRMTexture2_iface; } - else if IsEqualGUID(riid, &IID_IDirect3DRMTexture3) + else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)) { *object = &This->IDirect3DRMTexture3_iface; }

1 0

Michael Stefaniuc : gphoto2.ds: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: f59d0ac743184a9f584cba405951361a575b9d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59d0ac743184a9f584cba405… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:11:23 2013 +0100 gphoto2.ds: Let C look like C. --- dlls/gphoto2.ds/ui.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index df79875..0b21f2e 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -175,7 +175,7 @@ static INT_PTR CALLBACK DialogProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP } break; case WM_COMMAND: - switch LOWORD(wParam) + switch (LOWORD(wParam)) { case IDC_SKIP: on_disable_dialog_clicked(hwnd);

1 0

Daniel Jelinski : comctl32/listview: Do not touch icon spacing if set explicitly.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: f9c3a612af058429ce92aff3bdd9b942efe0f998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c3a612af058429ce92aff3b… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Feb 4 20:49:55 2013 +0100 comctl32/listview: Do not touch icon spacing if set explicitly. --- dlls/comctl32/listview.c | 10 ++++++++-- dlls/comctl32/tests/listview.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 96863f9..bc8997a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -55,7 +55,6 @@ * -- LVA_SNAPTOGRID not implemented * -- LISTVIEW_ApproximateViewRect partially implemented * -- LISTVIEW_SetColumnWidth ignores header images & bitmap - * -- LISTVIEW_SetIconSpacing is incomplete * -- LISTVIEW_StyleChanged doesn't handle some changes too well * * Speedups @@ -290,6 +289,7 @@ typedef struct tagLISTVIEW_INFO HIMAGELIST himlSmall; HIMAGELIST himlState; SIZE iconSize; + BOOL autoSpacing; SIZE iconSpacing; SIZE iconStateSize; POINT currIconPos; /* this is the position next icon will be placed */ @@ -8594,11 +8594,15 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) /* set to defaults, if instructed to */ if (cx == -1 && cy == -1) { + infoPtr->autoSpacing = TRUE; if (infoPtr->himlNormal) ImageList_GetIconSize(infoPtr->himlNormal, &iconWidth, &iconHeight); cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON) + iconWidth; cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON) + iconHeight; } + else + infoPtr->autoSpacing = FALSE; + /* if 0 then keep width */ if (cx != 0) infoPtr->iconSpacing.cx = cx; @@ -8660,7 +8664,8 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG himlOld = infoPtr->himlNormal; infoPtr->himlNormal = himl; if (infoPtr->uView == LV_VIEW_ICON) set_icon_size(&infoPtr->iconSize, himl, FALSE); - LISTVIEW_SetIconSpacing(infoPtr, -1, -1); + if (infoPtr->autoSpacing) + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); break; case LVSIL_SMALL: @@ -9374,6 +9379,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->bRedraw = TRUE; infoPtr->bNoItemMetrics = TRUE; infoPtr->bDoChangeNotify = TRUE; + infoPtr->autoSpacing = TRUE; infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); infoPtr->nEditLabelItem = -1; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c46fe42..98ca495 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4643,6 +4643,23 @@ static void test_getitemspacing(void) SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + /* set size returned */ + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + /* spacing = 0 - keep previous value */ + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(0, -1)); + expect(100, LOWORD(ret)); + expect(100, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + + ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, -1); + expect(100, LOWORD(ret)); + expect(0xFFFF, HIWORD(ret)); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); /* spacing + icon size returned */ expect(cx + 40, LOWORD(ret)); expect(cy + 40, HIWORD(ret));

1 0

Michael Stefaniuc : iphlpapi: Let C look like C.
by Alexandre Julliard Feb. 7, 2013

Feb. 7, 2013

Module: wine Branch: master Commit: 1cc6710aee05c646684323ee266455947a10ddfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc6710aee05c646684323ee2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 6 23:13:02 2013 +0100 iphlpapi: Let C look like C. --- dlls/iphlpapi/ipstats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index f8191ba..966d24e 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -693,7 +693,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) } ret = GetIcmpStatistics(&ipv4stats); - if SUCCEEDED(ret) + if (SUCCEEDED(ret)) { stats->icmpInStats.dwMsgs = ipv4stats.stats.icmpInStats.dwMsgs; stats->icmpInStats.dwErrors = ipv4stats.stats.icmpInStats.dwErrors;

1 0