wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Michael Stefaniuc : msvcr90/tests: Use the W form of CreateEvent().
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: d37c7ecacfbe45e98ff9c33a8af0dbf76746777b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37c7ecacfbe45e98ff9c33a8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 1 23:20:56 2013 +0200 msvcr90/tests: Use the W form of CreateEvent(). --- dlls/msvcr90/tests/msvcr90.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 2a3124d..a1b0f5f 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1175,10 +1175,10 @@ static void test_nonblocking_file_access(void) arg.read = filer; arg.write = filew; - arg.init = CreateEvent(NULL, FALSE, FALSE, NULL); - arg.finish = CreateEvent(NULL, FALSE, FALSE, NULL); - ok(arg.init != NULL, "CreateEvent failed\n"); - ok(arg.finish != NULL, "CreateEvent failed\n"); + arg.init = CreateEventW(NULL, FALSE, FALSE, NULL); + arg.finish = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(arg.init != NULL, "CreateEventW failed\n"); + ok(arg.finish != NULL, "CreateEventW failed\n"); thread = CreateThread(NULL, 0, block_file, (void*)&arg, 0, NULL); ok(thread != NULL, "CreateThread failed\n"); WaitForSingleObject(arg.init, INFINITE);

1 0

Michael Stefaniuc : iphlpapi/tests: Use the W form of CreateEvent().
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: c6946ff653f54b54ddd05f70cc2dbfe3dc090aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6946ff653f54b54ddd05f70c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 1 23:17:55 2013 +0200 iphlpapi/tests: Use the W form of CreateEvent(). --- dlls/iphlpapi/tests/iphlpapi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 032ac06..0d99e3c 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1062,7 +1062,7 @@ static void testNotifyAddrChange(void) handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); - overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + overlapped.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); ret = pNotifyAddrChange(&handle, &overlapped); ok(ret == ERROR_IO_PENDING, "NotifyAddrChange returned %d, expected ERROR_IO_PENDING\n", ret); todo_wine ok(handle != INVALID_HANDLE_VALUE, "NotifyAddrChange returned invalid file handle\n"); @@ -1077,7 +1077,7 @@ static void testNotifyAddrChange(void) { handle = NULL; ZeroMemory(&overlapped, sizeof(overlapped)); - overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + overlapped.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); trace("Testing asynchronous ipv4 address change notification. Please " "change the ipv4 address of one of your network interfaces\n"); ret = pNotifyAddrChange(&handle, &overlapped);

1 0

Michael Stefaniuc : qedit/tests: Use the W version of FindResource().
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: b5840db3e62310a9ae03cdf4dcd9121271d0df13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5840db3e62310a9ae03cdf4d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 1 23:16:31 2013 +0200 qedit/tests: Use the W version of FindResource(). --- dlls/qedit/tests/mediadet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 42a1184..42ac7dc 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -84,7 +84,7 @@ static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH]) DWORD size, written; HANDLE fh; - res = FindResource(NULL, MAKEINTRESOURCE(id), MAKEINTRESOURCE(AVI_RES_TYPE)); + res = FindResourceW(NULL, MAKEINTRESOURCEW(id), MAKEINTRESOURCEW(AVI_RES_TYPE)); if (!res) return FALSE;

1 0

Michael Stefaniuc : tests: Use the explicit LoadLibraryA function.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 9463dba8307f7a9937bcd4f11c05164a58945300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9463dba8307f7a9937bcd4f11… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 1 23:09:53 2013 +0200 tests: Use the explicit LoadLibraryA function. --- dlls/advpack/tests/files.c | 2 +- dlls/apphelp/tests/apphelp.c | 2 +- dlls/comctl32/tests/imagelist.c | 2 +- dlls/ddrawex/tests/ddrawex.c | 2 +- dlls/ddrawex/tests/surface.c | 2 +- dlls/dsound/tests/capture.c | 2 +- dlls/dsound/tests/ds3d.c | 2 +- dlls/dsound/tests/ds3d8.c | 2 +- dlls/dsound/tests/dsound.c | 4 ++-- dlls/dsound/tests/dsound8.c | 2 +- dlls/dsound/tests/duplex.c | 2 +- dlls/dsound/tests/propset.c | 2 +- dlls/kernel32/tests/loader.c | 14 +++++++------- dlls/msvcrt/tests/time.c | 2 +- dlls/netapi32/tests/ds.c | 2 +- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/tests/richole.c | 2 +- dlls/riched20/tests/txtsrv.c | 2 +- dlls/riched32/tests/editor.c | 2 +- dlls/shlwapi/tests/istream.c | 2 +- dlls/sti/tests/sti.c | 2 +- dlls/user32/tests/input.c | 2 +- dlls/user32/tests/msg.c | 2 +- dlls/winspool.drv/tests/info.c | 4 ++-- 24 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9463dba8307f7a9937bcd…

1 0

Andrew Eikum : riched20: Continue interpreting data as UTF-8 after the first chunk boundary.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 360afb93b57460ed113607a970504de1f86651e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=360afb93b57460ed113607a97… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 1 12:58:53 2013 -0500 riched20: Continue interpreting data as UTF-8 after the first chunk boundary. --- dlls/riched20/editor.c | 56 +++++++++++++++++++++++++++++++++++++++-- dlls/riched20/tests/editor.c | 39 +++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9af8a23..42f5770 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -286,6 +286,9 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea WCHAR *pText; LRESULT total_bytes_read = 0; BOOL is_read = FALSE; + DWORD cp = CP_ACP, copy = 0; + char conv_buf[4 + STREAMIN_BUFFER_SIZE]; /* up to 4 additional UTF-8 bytes */ + static const char bom_utf8[] = {0xEF, 0xBB, 0xBF}; TRACE("%08x %p\n", dwFormat, stream); @@ -307,8 +310,7 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea if (!(dwFormat & SF_UNICODE)) { char * buf = stream->buffer; - DWORD size = stream->dwSize; - DWORD cp = CP_ACP; + DWORD size = stream->dwSize, end; if (!is_read) { @@ -321,8 +323,56 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea } } - nWideChars = MultiByteToWideChar(cp, 0, buf, size, wszText, STREAMIN_BUFFER_SIZE); + if (cp == CP_UTF8) + { + if (copy) + { + memcpy(conv_buf + copy, buf, size); + buf = conv_buf; + size += copy; + } + end = size; + while ((buf[end-1] & 0xC0) == 0x80) + { + --end; + --total_bytes_read; /* strange, but seems to match windows */ + } + if (buf[end-1] & 0x80) + { + DWORD need = 0; + if ((buf[end-1] & 0xE0) == 0xC0) + need = 1; + if ((buf[end-1] & 0xF0) == 0xE0) + need = 2; + if ((buf[end-1] & 0xF8) == 0xF0) + need = 3; + + if (size - end >= need) + { + /* we have enough bytes for this sequence */ + end = size; + } + else + { + /* need more bytes, so don't transcode this sequence */ + --end; + } + } + } + else + end = size; + + nWideChars = MultiByteToWideChar(cp, 0, buf, end, wszText, STREAMIN_BUFFER_SIZE); pText = wszText; + + if (cp == CP_UTF8) + { + if (end != size) + { + memcpy(conv_buf, buf + end, size - end); + copy = size - end; + } + } } else { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 15e1132..3c2e471 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5035,6 +5035,29 @@ static DWORD CALLBACK test_EM_STREAMIN_esCallback(DWORD_PTR dwCookie, return 0; } +static DWORD CALLBACK test_EM_STREAMIN_esCallback_UTF8Split(DWORD_PTR dwCookie, + LPBYTE pbBuff, + LONG cb, + LONG *pcb) +{ + DWORD *phase = (DWORD *)dwCookie; + + if(*phase == 0){ + static const char first[] = "\xef\xbb\xbf\xc3\x96\xc3"; + *pcb = sizeof(first) - 1; + memcpy(pbBuff, first, *pcb); + }else if(*phase == 1){ + static const char second[] = "\x8f\xc3\x8b"; + *pcb = sizeof(second) - 1; + memcpy(pbBuff, second, *pcb); + }else + *pcb = 0; + + ++*phase; + + return 0; +} + struct StringWithLength { int length; char *buffer; @@ -5063,6 +5086,7 @@ static DWORD CALLBACK test_EM_STREAMIN_esCallback2(DWORD_PTR dwCookie, static void test_EM_STREAMIN(void) { HWND hwndRichEdit = new_richedit(NULL); + DWORD phase; LRESULT result; EDITSTREAM es; char buffer[1024] = {0}; @@ -5204,6 +5228,21 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test UTF8WithBOM set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test UTF8WithBOM set error %d, expected %d\n", es.dwError, 0); + phase = 0; + es.dwCookie = (DWORD_PTR)&phase; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback_UTF8Split; + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + ok(result == 8, "got %ld\n", result); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(result == 3, + "EM_STREAMIN: Test UTF8Split returned %ld\n", result); + result = memcmp (buffer,"\xd6\xcf\xcb", 3); + ok(result == 0, + "EM_STREAMIN: Test UTF8Split set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test UTF8Split set error %d, expected %d\n", es.dwError, 0); + es.dwCookie = (DWORD_PTR)&cookieForStream4; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback2;

1 0

Ken Thomases : winemac: Reapply display modes when switching back to app after "escaping" with Command-Tab.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: b7709771d1be742b04cb3b53c20a14c499e961fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7709771d1be742b04cb3b53c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 1 23:24:13 2013 -0500 winemac: Reapply display modes when switching back to app after "escaping" with Command-Tab. The Mac driver captures the displays when the program changes the display mode. If the user types Command-Tab to switch away, it resets the displays to their original modes and releases them. However, if they switched back, it didn't restore the mode to what the program had set, so the program often showed the game window in a corner of the screen with the top behind the Mac menu bar. --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 58 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 25f60f6..a398bf1 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -67,6 +67,7 @@ enum { NSUInteger unmatchedMouseDowns; NSMutableDictionary* originalDisplayModes; + NSMutableDictionary* latentDisplayModes; BOOL displaysCapturedForFullscreen; NSArray* cursorFrames; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 4b5d1ff..632a1bb 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -149,11 +149,12 @@ int macdrv_err_on; keyWindows = [[NSMutableArray alloc] init]; originalDisplayModes = [[NSMutableDictionary alloc] init]; + latentDisplayModes = [[NSMutableDictionary alloc] init]; warpRecords = [[NSMutableArray alloc] init]; if (!requests || !requestsManipQueue || !eventQueues || !eventQueuesLock || - !keyWindows || !originalDisplayModes || !warpRecords) + !keyWindows || !originalDisplayModes || !latentDisplayModes || !warpRecords) { [self release]; return nil; @@ -176,6 +177,7 @@ int macdrv_err_on; [warpRecords release]; [cursorTimer release]; [cursorFrames release]; + [latentDisplayModes release]; [originalDisplayModes release]; [keyWindows release]; [eventQueues release]; @@ -686,10 +688,14 @@ int macdrv_err_on; - (BOOL) setMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID { BOOL ret = FALSE; + BOOL active = [NSApp isActive]; NSNumber* displayIDKey = [NSNumber numberWithUnsignedInt:displayID]; - CGDisplayModeRef currentMode, originalMode; + CGDisplayModeRef currentMode = NULL, originalMode; - currentMode = CGDisplayCopyDisplayMode(displayID); + if (!active) + currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]); + if (!currentMode) + currentMode = CGDisplayCopyDisplayMode(displayID); if (!currentMode) // Invalid display ID return FALSE; @@ -714,34 +720,47 @@ int macdrv_err_on; { if ([originalDisplayModes count] == 1) // If this is the last changed display, do a blanket reset { - CGRestorePermanentDisplayConfiguration(); - if (!displaysCapturedForFullscreen) - CGReleaseAllDisplays(); + if (active) + { + CGRestorePermanentDisplayConfiguration(); + if (!displaysCapturedForFullscreen) + CGReleaseAllDisplays(); + } [originalDisplayModes removeAllObjects]; + [latentDisplayModes removeAllObjects]; ret = TRUE; } else // ... otherwise, try to restore just the one display { - if (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) + if (active) + ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); + else { - [originalDisplayModes removeObjectForKey:displayIDKey]; + [latentDisplayModes removeObjectForKey:displayIDKey]; ret = TRUE; } + if (ret) + [originalDisplayModes removeObjectForKey:displayIDKey]; } } else { if ([originalDisplayModes count] || displaysCapturedForFullscreen || - CGCaptureAllDisplays() == CGDisplayNoErr) + !active || CGCaptureAllDisplays() == CGDisplayNoErr) { - if (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) + if (active) + ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); + else { - [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey]; + [latentDisplayModes setObject:(id)mode forKey:displayIDKey]; ret = TRUE; } + if (ret) + [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey]; else if (![originalDisplayModes count]) { CGRestorePermanentDisplayConfiguration(); + [latentDisplayModes removeAllObjects]; if (!displaysCapturedForFullscreen) CGReleaseAllDisplays(); } @@ -890,6 +909,14 @@ int macdrv_err_on; if ([originalDisplayModes count] || displaysCapturedForFullscreen) { + NSNumber* displayID; + for (displayID in originalDisplayModes) + { + CGDisplayModeRef mode = CGDisplayCopyDisplayMode([displayID unsignedIntValue]); + [latentDisplayModes setObject:(id)mode forKey:displayID]; + CGDisplayModeRelease(mode); + } + CGRestorePermanentDisplayConfiguration(); CGReleaseAllDisplays(); [originalDisplayModes removeAllObjects]; @@ -1894,6 +1921,15 @@ int macdrv_err_on; */ - (void)applicationDidBecomeActive:(NSNotification *)notification { + NSNumber* displayID; + + for (displayID in latentDisplayModes) + { + CGDisplayModeRef mode = (CGDisplayModeRef)[latentDisplayModes objectForKey:displayID]; + [self setMode:mode forDisplay:[displayID unsignedIntValue]]; + } + [latentDisplayModes removeAllObjects]; + [self activateCursorClipping]; [self updateFullscreenWindows];

1 0

Ken Thomases : winemac: Remove a too-early attempt to set the process' s Dock icon.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 7c55e912da3a488c8681678241d68d7033d85f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c55e912da3a488c868167824… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Sep 30 22:18:30 2013 -0500 winemac: Remove a too-early attempt to set the process's Dock icon. --- dlls/winemac.drv/cocoa_app.m | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e6e5c2e..4b5d1ff 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -878,7 +878,6 @@ int macdrv_err_on; } self.applicationIcon = nsimage; - [NSApp setApplicationIconImage:nsimage]; } - (void) handleCommandTab

1 0

Akihiro Sagawa : gdi32: Return fake BBox when requesting empty glyph metrics.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: db86409db66362c56031429ec124e65064e4f0bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=db86409db66362c56031429ec… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 1 22:03:18 2013 +0900 gdi32: Return fake BBox when requesting empty glyph metrics. --- dlls/gdi32/freetype.c | 4 ++-- dlls/gdi32/tests/font.c | 24 ++++++++---------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bd4c895..15f401a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6520,8 +6520,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, width = (right - left) >> 6; height = (top - bottom) >> 6; - lpgm->gmBlackBoxX = width; - lpgm->gmBlackBoxY = height; + lpgm->gmBlackBoxX = width ? width : 1; + lpgm->gmBlackBoxY = height ? height : 1; lpgm->gmptGlyphOrigin.x = origin_x >> 6; lpgm->gmptGlyphOrigin.y = origin_y >> 6; abc->abcA = left >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a6f439b..f6e4d07 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4120,10 +4120,8 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); else ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); - todo_wine { - ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); - } + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } memset(&gm, 0xab, sizeof(gm)); @@ -4135,10 +4133,8 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); else ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); - todo_wine { - ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); - } + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } memset(&gm, 0xab, sizeof(gm)); @@ -4150,10 +4146,8 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); else ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); - todo_wine { - ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); - } + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } memset(&gm, 0xab, sizeof(gm)); @@ -4163,10 +4157,8 @@ static void test_GetGlyphOutline(void) { if (fmt[i] == GGO_METRICS) { ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); - todo_wine { - ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); - } + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } else ok(ret == GDI_ERROR, "%2d:GetGlyphOutlineW should return GDI_ERROR, got %d\n", fmt[i], ret);

1 0

Akihiro Sagawa : gdi32: Fix empty glyph handling in the dib driver.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: b138c36c1137b8cc7111d88b7debbd15d9b59fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b138c36c1137b8cc7111d88b7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 1 22:03:16 2013 +0900 gdi32: Fix empty glyph handling in the dib driver. --- dlls/gdi32/dibdrv/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index f3aaeb6..2c865c0 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -694,13 +694,14 @@ static struct cached_glyph *cache_glyph_bitmap( HDC hdc, struct cached_font *fon if (ret != GDI_ERROR) break; } if (ret == GDI_ERROR) return NULL; + if (!ret) metrics.gmBlackBoxX = metrics.gmBlackBoxY = 0; /* empty glyph */ bit_count = get_glyph_depth( font->aa_flags ); stride = get_dib_stride( metrics.gmBlackBoxX, bit_count ); size = metrics.gmBlackBoxY * stride; glyph = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct cached_glyph, bits[size] )); if (!glyph) return NULL; - if (!ret) goto done; /* zero-size glyph */ + if (!size) goto done; /* empty glyph */ if (bit_count == 8) pad = padding[ metrics.gmBlackBoxX % 4 ];

1 0

Akihiro Sagawa : gdi32/tests: Fix copy&paste issues related to gmBlackBoxY.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 24e0e4d1509d7370649e44532feaa08ab3ae3fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e0e4d1509d7370649e44532… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 1 22:03:14 2013 +0900 gdi32/tests: Fix copy&paste issues related to gmBlackBoxY. --- dlls/gdi32/tests/font.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9f8d970..a6f439b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4122,7 +4122,7 @@ static void test_GetGlyphOutline(void) ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } @@ -4137,7 +4137,7 @@ static void test_GetGlyphOutline(void) ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } @@ -4152,7 +4152,7 @@ static void test_GetGlyphOutline(void) ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } @@ -4165,7 +4165,7 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } else

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013