October 2013 - Wine-Commits

Henri Verbeet : d3d8: Don' t mask out internal wined3d usage flags in surface_init().
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 74759444547ba457e2eee9631c8179eaee10c7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74759444547ba457e2eee9631… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:24 2013 +0200 d3d8: Don't mask out internal wined3d usage flags in surface_init(). --- dlls/d3d8/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 2196011..a157c51 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -343,7 +343,7 @@ HRESULT surface_init(struct d3d8_surface *surface, struct d3d8_device *device, U wined3d_mutex_lock(); hr = wined3d_surface_create(device->wined3d_device, width, height, wined3dformat_from_d3dformat(format), - usage & WINED3DUSAGE_MASK, (enum wined3d_pool)pool, multisample_type, multisample_quality, + usage, (enum wined3d_pool)pool, multisample_type, multisample_quality, flags, surface, &d3d8_surface_wined3d_parent_ops, &surface->wined3d_surface); wined3d_mutex_unlock(); if (FAILED(hr))

1 0

Michael Stefaniuc : tests: Compile the tests by default with -D__WINESRC__.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

1 0

Michael Stefaniuc : tests: Readying some tests for the compilation with -D__WINESRC__.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 2e1708dc1beffeebef5e9b495046924f47ee1042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1708dc1beffeebef5e9b495… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 1 23:26:28 2013 +0200 tests: Readying some tests for the compilation with -D__WINESRC__. --- dlls/atl/tests/atl_ax.c | 4 ++-- dlls/dplayx/tests/dplayx.c | 2 +- dlls/fusion/tests/asmcache.c | 4 ++-- dlls/lz32/tests/lzexpand_main.c | 4 ++-- dlls/pdh/tests/pdh.c | 2 +- dlls/snmpapi/tests/util.c | 2 +- programs/wscript/tests/run.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index ea9ce32..f2dad74 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -51,12 +51,12 @@ static ATOM register_class(void) WNDCLASSA wndclassA; wndclassA.style = 0; - wndclassA.lpfnWndProc = DefWindowProc; + wndclassA.lpfnWndProc = DefWindowProcA; wndclassA.cbClsExtra = 0; wndclassA.cbWndExtra = 0; wndclassA.hInstance = GetModuleHandleA(NULL); wndclassA.hIcon = NULL; - wndclassA.hCursor = LoadCursorA(NULL, IDC_ARROW); + wndclassA.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); wndclassA.lpszMenuName = NULL; wndclassA.lpszClassName = "WineAtlTestClass"; diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 44c9b50..fb76c37 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -667,7 +667,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W /* IP address string */ addressElements[1].guidDataType = DPAID_INet; - addressElements[1].dwDataSize = lstrlen(strIPAddressString) + 1; + addressElements[1].dwDataSize = lstrlenA(strIPAddressString) + 1; addressElements[1].lpData = (LPVOID) strIPAddressString; /* Optional Port number */ diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index da39505..6fe72bf 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -944,7 +944,7 @@ static void test_InstallAssembly(void) GetWindowsDirectoryA(dllpath, MAX_PATH); strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); - attr = GetFileAttributes(dllpath); + attr = GetFileAttributesA(dllpath); ok(attr != INVALID_FILE_ATTRIBUTES, "Expected assembly to exist\n"); /* uninstall the assembly from the GAC */ @@ -954,7 +954,7 @@ static void test_InstallAssembly(void) ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - attr = GetFileAttributes(dllpath); + attr = GetFileAttributesA(dllpath); ok(attr == INVALID_FILE_ATTRIBUTES, "Expected assembly not to exist\n"); disp = 0xf00dbad; diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 41792d6..4980cf7 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -83,8 +83,8 @@ static void full_file_path_name_in_a_CWD(const char *src, char *dst, BOOL expect if(expect_short) { memcpy(shortname, dst, MAX_PATH); - retval = GetShortPathName(shortname, dst, MAX_PATH-1); - ok(retval > 0, "GetShortPathName returned %d for '%s', GLE=%d\n", + retval = GetShortPathNameA(shortname, dst, MAX_PATH-1); + ok(retval > 0, "GetShortPathNameA returned %d for '%s', GLE=%d\n", retval, dst, GetLastError()); } } diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 9690020..f492d5a 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -63,7 +63,7 @@ static BOOL is_lang_english(void) static void init_function_ptrs( void ) { - pdh = GetModuleHandle( "pdh" ); + pdh = GetModuleHandleA( "pdh" ); GETFUNCPTR( PdhAddEnglishCounterA ) GETFUNCPTR( PdhAddEnglishCounterW ) GETFUNCPTR( PdhCollectQueryDataWithTime ) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 908d5e2..0c517c1 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -32,7 +32,7 @@ static INT (WINAPI *pSnmpUtilOctetsNCmp)(AsnOctetString*, AsnOctetString*, UINT static void InitFunctionPtrs(void) { - HMODULE hSnmpapi = GetModuleHandle("snmpapi.dll"); + HMODULE hSnmpapi = GetModuleHandleA("snmpapi.dll"); #define SNMPAPI_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hSnmpapi, #func); \ diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 567bf45..75d8f6e 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -366,7 +366,7 @@ static void run_test(const char *file_name) CHECK_CALLED(reportSuccess); } -static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG_PTR param) +static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param) { const char *script_data, *ext; DWORD script_size, size; @@ -418,7 +418,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init) DWORD res; if(!init) { - RegDeleteKey(HKEY_CLASSES_ROOT, key_name); + RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name); return TRUE; }

1 0

Michael Stefaniuc : qedit/tests: Use the W version of FindResource().
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

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

Andrew Eikum : riched20: Continue interpreting data as UTF-8 after the first chunk boundary.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

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 Oct. 2, 2013

Oct. 2, 2013

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

Henri Verbeet : d3dcompiler: Get rid of the BWRITERVS_RASTOUT_OFFSETS typedef.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: f67af28261e5680a755b5b930b209f94d74b040e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f67af28261e5680a755b5b930… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:27 2013 +0200 d3dcompiler: Get rid of the BWRITERVS_RASTOUT_OFFSETS typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 284bf8f..5767e8b 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -481,12 +481,12 @@ enum bwritershader_param_register_type BWRITERSPR_PREDICATE }; -typedef enum _BWRITERVS_RASTOUT_OFFSETS +enum bwritervs_rastout_offsets { BWRITERSRO_POSITION, BWRITERSRO_FOG, BWRITERSRO_POINT_SIZE -} BWRITERVS_RASTOUT_OFFSETS; +}; #define BWRITERSP_WRITEMASK_0 0x1 /* .x r */ #define BWRITERSP_WRITEMASK_1 0x2 /* .y g */

1 0

Akihiro Sagawa : gdi32: Return fake BBox when requesting empty glyph metrics.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

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

Francois Gouget : cmd: Mention that the % must be doubled for FOR variables in batch files.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: b151052be4f783b1475face85a42ff96fe3f1816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b151052be4f783b1475face85… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 1 17:14:39 2013 +0200 cmd: Mention that the % must be doubled for FOR variables in batch files. Also standardize on the 'Usage:' prefix for usage messages. --- po/ar.po | 169 ++++++++++++++++++++++++++------------------------ po/bg.po | 164 ++++++++++++++++++++++++------------------------ po/ca.po | 169 ++++++++++++++++++++++++++------------------------ po/cs.po | 169 ++++++++++++++++++++++++++------------------------ po/da.po | 169 ++++++++++++++++++++++++++------------------------ po/de.po | 169 ++++++++++++++++++++++++++------------------------ po/el.po | 164 ++++++++++++++++++++++++------------------------ po/en.po | 168 +++++++++++++++++++++++++------------------------ po/en_US.po | 168 +++++++++++++++++++++++++------------------------ po/eo.po | 164 ++++++++++++++++++++++++------------------------ po/es.po | 169 ++++++++++++++++++++++++++------------------------ po/fa.po | 164 ++++++++++++++++++++++++------------------------ po/fi.po | 169 ++++++++++++++++++++++++++------------------------ po/fr.po | 169 ++++++++++++++++++++++++++------------------------ po/he.po | 169 ++++++++++++++++++++++++++------------------------ po/hi.po | 164 ++++++++++++++++++++++++------------------------ po/hr.po | 164 ++++++++++++++++++++++++------------------------ po/hu.po | 169 ++++++++++++++++++++++++++------------------------ po/it.po | 169 ++++++++++++++++++++++++++------------------------ po/ja.po | 169 ++++++++++++++++++++++++++------------------------ po/ko.po | 169 ++++++++++++++++++++++++++------------------------ po/lt.po | 169 ++++++++++++++++++++++++++------------------------ po/ml.po | 164 ++++++++++++++++++++++++------------------------ po/nb_NO.po | 169 ++++++++++++++++++++++++++------------------------ po/nl.po | 169 ++++++++++++++++++++++++++------------------------ po/or.po | 164 ++++++++++++++++++++++++------------------------ po/pa.po | 164 ++++++++++++++++++++++++------------------------ po/pl.po | 169 ++++++++++++++++++++++++++------------------------ po/pt_BR.po | 169 ++++++++++++++++++++++++++------------------------ po/pt_PT.po | 169 ++++++++++++++++++++++++++------------------------ po/rm.po | 164 ++++++++++++++++++++++++------------------------ po/ro.po | 169 ++++++++++++++++++++++++++------------------------ po/ru.po | 169 ++++++++++++++++++++++++++------------------------ po/sk.po | 164 ++++++++++++++++++++++++------------------------ po/sl.po | 169 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 164 ++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 164 ++++++++++++++++++++++++------------------------ po/sv.po | 169 ++++++++++++++++++++++++++------------------------ po/te.po | 164 ++++++++++++++++++++++++------------------------ po/th.po | 164 ++++++++++++++++++++++++------------------------ po/tr.po | 169 ++++++++++++++++++++++++++------------------------ po/uk.po | 169 ++++++++++++++++++++++++++------------------------ po/wa.po | 164 ++++++++++++++++++++++++------------------------ po/wine.pot | 164 ++++++++++++++++++++++++------------------------ po/zh_CN.po | 164 ++++++++++++++++++++++++------------------------ po/zh_TW.po | 169 ++++++++++++++++++++++++++------------------------ programs/cmd/cmd.rc | 4 +- 47 files changed, 3957 insertions(+), 3729 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b151052be4f783b1475fa…

1 0

Akihiro Sagawa : gdi32: Fix empty glyph handling in the dib driver.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

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