June 2012 - Wine-commits - list.winehq.org

Daniel Jelinski : kernel32: Make SetThreadStackGuarantee stub return TRUE.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 53b551440cdf9f79cd56ac7b7cca267f0f6916b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b551440cdf9f79cd56ac7b7… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu May 31 21:43:23 2012 +0200 kernel32: Make SetThreadStackGuarantee stub return TRUE. --- dlls/kernel32/thread.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index bdaaee8..c56e1d3 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -378,8 +378,7 @@ BOOL WINAPI SetThreadPriorityBoost( BOOL WINAPI SetThreadStackGuarantee(PULONG stacksize) { FIXME("(%p): stub\n", stacksize); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + return TRUE; } /**********************************************************************

1 0

Stefan Leichter : setupapi: Add stub for SetupAddToSourceListA.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: b3b78b337ea6ba0cf96ddc37161fe71844440851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b78b337ea6ba0cf96ddc371… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu May 31 23:31:07 2012 +0200 setupapi: Add stub for SetupAddToSourceListA. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 6397ab2..f8f8fab 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -248,7 +248,7 @@ @ stub SetupAddSectionToDiskSpaceListW @ stdcall SetupAddToDiskSpaceListA(long str int64 long ptr long) @ stdcall SetupAddToDiskSpaceListW(long wstr int64 long ptr long) -@ stub SetupAddToSourceListA +@ stdcall SetupAddToSourceListA(long str) @ stub SetupAddToSourceListW @ stub SetupAdjustDiskSpaceListA @ stub SetupAdjustDiskSpaceListW diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index f4e6959..db05e64 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -232,6 +232,15 @@ BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_bu } /*********************************************************************** + * SetupAddToSourceListA (SETUPAPI.@) + */ +BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source) +{ + FIXME("0x%08x %s\n", flags, debugstr_a(source)); + return TRUE; +} + +/*********************************************************************** * SetupSetSourceListA (SETUPAPI.@) */ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count)

1 0

Dmitry Timoshkov : gdi32/tests: GetGlyphOutline should fail for a bitmap font.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 4fa2945544e0ee1e00b5a9ae283a527e023dcb5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fa2945544e0ee1e00b5a9ae2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 1 13:49:05 2012 +0900 gdi32/tests: GetGlyphOutline should fail for a bitmap font. --- dlls/gdi32/tests/font.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f50d1bc..e15ba6f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -876,6 +876,7 @@ static void test_bitmap_font_metrics(void) for(bit = 0; bit < 32; bit++) { + GLYPHMETRICS gm; DWORD fs[2]; BOOL bRet; @@ -904,16 +905,11 @@ static void test_bitmap_font_metrics(void) hfont = create_font(lf.lfFaceName, &lf); old_hfont = SelectObject(hdc, hfont); - bRet = GetTextMetrics(hdc, &tm); - ok(bRet, "GetTextMetrics error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetTextFace(hdc, sizeof(face_name), face_name); ok(ret, "GetTextFace error %u\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = GetTextCharset(hdc); - if (lstrcmp(face_name, fd[i].face_name) != 0) { ok(ret != ANSI_CHARSET, "font charset should not be ANSI_CHARSET\n"); @@ -924,6 +920,19 @@ static void test_bitmap_font_metrics(void) continue; } + memset(&gm, 0, sizeof(gm)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutline(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); + todo_wine { + ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n"); + ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError()); + } + + bRet = GetTextMetrics(hdc, &tm); + ok(bRet, "GetTextMetrics error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetTextCharset(hdc); ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs); trace("created %s, height %d charset %x dpi %d\n", face_name, tm.tmHeight, tm.tmCharSet, tm.tmDigitizedAspectX);

1 0

Alexandre Julliard : winex11: Use XGetKeyboardMapping instead of XKeycodeToKeysym.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: c8a22a4d1f13c9b4f91084a2eed5b60083c82c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a22a4d1f13c9b4f91084a2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 1 14:29:02 2012 +0200 winex11: Use XGetKeyboardMapping instead of XKeycodeToKeysym. --- dlls/winex11.drv/keyboard.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7e49ffb..82fd26a 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -61,6 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(keyboard); WINE_DECLARE_DEBUG_CHANNEL(key); static int min_keycode, max_keycode, keysyms_per_keycode; +static KeySym *key_mapping; static WORD keyc2vkey[256], keyc2scan[256]; static int NumLockMask, ScrollLockMask, AltGrMask; /* mask in the XKeyEvent state */ @@ -1106,7 +1107,7 @@ static inline KeySym keycode_to_keysym( Display *display, KeyCode keycode, int i #ifdef HAVE_XKB if (use_xkb) return XkbKeycodeToKeysym(display, keycode, 0, index); #endif - return XKeycodeToKeysym(display, keycode, index); + return key_mapping[(keycode - min_keycode) * keysyms_per_keycode + index]; } /* Returns the Windows virtual key code associated with the X event <e> */ @@ -1612,7 +1613,6 @@ static void set_kbd_layout_preload_key(void) */ void X11DRV_InitKeyboard( Display *display ) { - KeySym *ksp; XModifierKeymap *mmp; KeySym keysym; KeyCode *kcp; @@ -1645,11 +1645,9 @@ void X11DRV_InitKeyboard( Display *display ) wine_tsx11_lock(); XDisplayKeycodes(display, &min_keycode, &max_keycode); - ksp = XGetKeyboardMapping(display, min_keycode, - max_keycode + 1 - min_keycode, &keysyms_per_keycode); - /* We are only interested in keysyms_per_keycode. - There is no need to hold a local copy of the keysyms table */ - XFree(ksp); + if (key_mapping) XFree( key_mapping ); + key_mapping = XGetKeyboardMapping(display, min_keycode, + max_keycode + 1 - min_keycode, &keysyms_per_keycode); mmp = XGetModifierMapping(display); kcp = mmp->modifiermap;

1 0

Ken Thomases : winex11: Be more conservative when matching keys from built-in layout tables.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 43984f355a2905e16075a9df3d7fbe463761e853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43984f355a2905e16075a9df3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 31 15:33:23 2012 -0500 winex11: Be more conservative when matching keys from built-in layout tables. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 82fd26a..a2237e2 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1729,7 +1729,7 @@ void X11DRV_InitKeyboard( Display *display ) * with appropriate ShiftMask and Mode_switch, use XLookupString * to get character in the local encoding. */ - ckey[i] = keysym & 0xFF; + ckey[i] = (keysym <= 0x7F) ? keysym : 0; } } else { ckey[i] = KEYBOARD_MapDeadKeysym(keysym);

1 0

Dmitry Timoshkov : oleaut32: Recognize icon and cursor in the being loaded data.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: c1136218e23d0fd480f5c5bf0e5f302b98b2430e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1136218e23d0fd480f5c5bf0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 31 17:32:54 2012 +0900 oleaut32: Recognize icon and cursor in the being loaded data. --- dlls/oleaut32/olepicture.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index beb1477..0e3fd21 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1402,6 +1402,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) !memcmp(&(header[0]), "BM", 2) || /* BMP header */ !memcmp(&(header[0]), "\xff\xd8", 2) || /* JPEG header */ (header[0] == EMR_HEADER) || /* EMF header */ + (header[0] == 0x10000) || /* icon: idReserved 0, idType 1 */ + (header[0] == 0x20000) || /* cursor: idReserved 0, idType 2 */ (header[1] > statstg.cbSize.QuadPart)|| /* invalid size */ (header[1]==0) ) {/* Found start of bitmap data */

1 0

Dmitry Timoshkov : oleaut32: Explicitly initialize idReserved field in the icon directory header.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 4c882397423284e97ff2fab9c1094bb2fc1275c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c882397423284e97ff2fab9c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 1 15:36:59 2012 +0900 oleaut32: Explicitly initialize idReserved field in the icon directory header. --- dlls/oleaut32/olepicture.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 0e3fd21..246114c 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1642,6 +1642,7 @@ static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) pIconDir = (CURSORICONFILEDIR *)pIconData; pIconDir->idType = 1; pIconDir->idCount = 1; + pIconDir->idReserved = 0; /* Fill out the CURSORICONFILEDIRENTRY */ pIconEntry = (CURSORICONFILEDIRENTRY *)(pIconData + 3 * sizeof(WORD));

1 0

Dmitry Timoshkov : oleaut32: Simplify bitmap saving code.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 7493fdcc4d42a2f4922096e8456cea10a0e845bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7493fdcc4d42a2f4922096e84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 1 15:37:11 2012 +0900 oleaut32: Simplify bitmap saving code. --- dlls/oleaut32/olepicture.c | 46 +++++++++++++++---------------------------- 1 files changed, 16 insertions(+), 30 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 246114c..d838920 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1749,6 +1749,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( HRESULT hResult = E_NOTIMPL; void * pIconData; unsigned int iDataSize; + DWORD header[2]; ULONG dummy; int iSerializeResult = 0; OLEPictureImpl *This = impl_from_IPersistStream(iface); @@ -1797,38 +1798,23 @@ static HRESULT WINAPI OLEPictureImpl_Save( FIXME("(%p,%p,%d), PICTYPE_BITMAP (format UNKNOWN, using BMP?) not implemented!\n",This,pStm,fClearDirty); break; } - if (iSerializeResult) { - /* - if (This->loadtime_magic != 0xdeadbeef) { - */ - if (1) { - DWORD header[2]; - - header[0] = (This->loadtime_magic != 0xdeadbeef) ? This->loadtime_magic : 0x0000746c; - header[1] = iDataSize; - IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); - } - IStream_Write(pStm, pIconData, iDataSize, &dummy); - - HeapFree(GetProcessHeap(), 0, This->data); - This->data = pIconData; - This->datalen = iDataSize; - hResult = S_OK; - } - } else { - /* - if (This->loadtime_magic != 0xdeadbeef) { - */ - if (1) { - DWORD header[2]; - - header[0] = (This->loadtime_magic != 0xdeadbeef) ? This->loadtime_magic : 0x0000746c; - header[1] = This->datalen; - IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); + + if (!iSerializeResult) + { + hResult = E_FAIL; + break; } - IStream_Write(pStm, This->data, This->datalen, &dummy); - hResult = S_OK; + + HeapFree(GetProcessHeap(), 0, This->data); + This->data = pIconData; + This->datalen = iDataSize; } + + header[0] = (This->loadtime_magic != 0xdeadbeef) ? This->loadtime_magic : 0x0000746c; + header[1] = This->datalen; + IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); + IStream_Write(pStm, This->data, This->datalen, &dummy); + hResult = S_OK; break; case PICTYPE_METAFILE: FIXME("(%p,%p,%d), PICTYPE_METAFILE not implemented!\n",This,pStm,fClearDirty);

1 0

Dmitry Timoshkov : oleaut32: Always write header to stream when saving an icon.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: de4c297cf79bbeaf39779788479cfeec08d4f034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4c297cf79bbeaf397797884… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 1 15:37:29 2012 +0900 oleaut32: Always write header to stream when saving an icon. --- dlls/oleaut32/olepicture.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index d838920..db3b852 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1768,15 +1768,11 @@ static HRESULT WINAPI OLEPictureImpl_Save( This->data = pIconData; This->datalen = iDataSize; } - if (This->loadtime_magic != 0xdeadbeef) { - DWORD header[2]; - header[0] = This->loadtime_magic; - header[1] = This->datalen; - IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); - } + header[0] = (This->loadtime_magic != 0xdeadbeef) ? This->loadtime_magic : 0x0000746c; + header[1] = This->datalen; + IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); IStream_Write(pStm, This->data, This->datalen, &dummy); - hResult = S_OK; break; case PICTYPE_BITMAP:

1 0

Dmitry Timoshkov : oleaut32: Add a test for saving an icon into a stream.
by Alexandre Julliard 01 Jun '12

01 Jun '12

Module: wine Branch: master Commit: 78d6a8ca04968362aba41b49fab3e5dfb039632a URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d6a8ca04968362aba41b49f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 1 15:37:47 2012 +0900 oleaut32: Add a test for saving an icon into a stream. --- dlls/oleaut32/tests/olepicture.c | 56 +++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 353334c..b214d76 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -2,7 +2,7 @@ * OLEPICTURE test program * * Copyright 2005 Marcus Meissner - * + * Copyright 2012 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1006,6 +1006,59 @@ static void test_load_save_bmp(void) IPicture_Release(pic); } +static void test_load_save_icon(void) +{ + IPicture *pic; + PICTDESC desc; + short type; + OLE_HANDLE handle; + HGLOBAL hmem; + DWORD *mem; + IPersistStream *src_stream; + IStream *dst_stream; + HRESULT hr; + + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_ICON; + desc.u.icon.hicon = LoadIcon(0, IDI_APPLICATION); + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); + + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_ICON,"expected picture type PICTYPE_ICON, got %d\n", type); + + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(IntToPtr(handle) == desc.u.icon.hicon, "get_Handle returned wrong handle %#x\n", handle); + + hmem = GlobalAlloc(GMEM_ZEROINIT, 8192); + hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); + ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); + ok(hr == S_OK, "Saveerror %#x\n", hr); + + IPersistStream_Release(src_stream); + IStream_Release(dst_stream); + + mem = GlobalLock(hmem); + ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); +todo_wine + ok(mem[1] == 766, "expected stream size 766, got %u\n", mem[1]); + ok(mem[2] == 0x00010000, "got wrong icon header %04x\n", mem[2]); + + GlobalUnlock(hmem); + GlobalFree(hmem); + + DeleteObject(desc.u.bmp.hbitmap); + IPicture_Release(pic); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -1043,6 +1096,7 @@ START_TEST(olepicture) test_OleLoadPicturePath(); test_himetric(); test_load_save_bmp(); + test_load_save_icon(); }

1 0