October 2014 - Wine-commits

Piotr Caban : user32: Don' t move mouse hardware messages to other threads queues.
by Alexandre Julliard 17 Oct '14

17 Oct '14

Module: wine Branch: master Commit: f747e5c8c982d76e160d67b8f5a1c784585e4c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f747e5c8c982d76e160d67b8f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 14 13:29:06 2014 +0200 user32: Don't move mouse hardware messages to other threads queues. --- dlls/user32/message.c | 15 +++++++-------- server/protocol.def | 1 - server/queue.c | 33 ++++----------------------------- 3 files changed, 11 insertions(+), 38 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index fd82498..b75c7e9 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2266,13 +2266,12 @@ static void send_parent_notify( HWND hwnd, WORD event, WORD idChild, POINT pt ) * Tell the server we have passed the message to the app * (even though we may end up dropping it later on) */ -static void accept_hardware_message( UINT hw_id, BOOL remove, HWND new_hwnd ) +static void accept_hardware_message( UINT hw_id, BOOL remove ) { SERVER_START_REQ( accept_hardware_message ) { req->hw_id = hw_id; req->remove = remove; - req->new_win = wine_server_user_handle( new_hwnd ); if (wine_server_call( req )) FIXME("Failed to reply to MSG_HARDWARE message. Message may not be removed from queue.\n"); } @@ -2460,10 +2459,10 @@ static BOOL process_keyboard_message( MSG *msg, UINT hw_id, HWND hwnd_filter, { /* skip this message */ HOOK_CallHooks( WH_CBT, HCBT_KEYSKIPPED, LOWORD(msg->wParam), msg->lParam, TRUE ); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } - accept_hardware_message( hw_id, remove, 0 ); + accept_hardware_message( hw_id, remove ); if ( remove && msg->message == WM_KEYDOWN ) if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam, 0) ) @@ -2507,7 +2506,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd )) { - accept_hardware_message( hw_id, TRUE, msg->hwnd ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } @@ -2596,7 +2595,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H hook.wHitTestCode = hittest; hook.dwExtraInfo = extra_info; HOOK_CallHooks( WH_CBT, HCBT_CLICKSKIPPED, message, (LPARAM)&hook, TRUE ); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } @@ -2604,11 +2603,11 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H { SendMessageW( msg->hwnd, WM_SETCURSOR, (WPARAM)msg->hwnd, MAKELONG( hittest, msg->message )); - accept_hardware_message( hw_id, TRUE, 0 ); + accept_hardware_message( hw_id, TRUE ); return FALSE; } - accept_hardware_message( hw_id, remove, 0 ); + accept_hardware_message( hw_id, remove ); if (!remove || info.hwndCapture) { diff --git a/server/protocol.def b/server/protocol.def index c9270ea..4854e3d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2156,7 +2156,6 @@ enum message_type @REQ(accept_hardware_message) unsigned int hw_id; /* id of the hardware message */ int remove; /* should we remove the message? */ - user_handle_t new_win; /* new destination window for current message */ @END diff --git a/server/queue.c b/server/queue.c index 71dfc11..5f87203 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1281,7 +1281,7 @@ static void update_input_key_state( struct desktop *desktop, unsigned char *keys /* release the hardware message currently being processed by the given thread */ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_id, - int remove, user_handle_t new_win ) + int remove ) { struct thread_input *input = queue->input; struct message *msg; @@ -1293,7 +1293,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i if (&msg->entry == &input->msg_list) return; /* not found */ /* clear the queue bit for that message */ - if (remove || new_win) + if (remove) { struct message *other; int clr_bit; @@ -1308,32 +1308,7 @@ static void release_hardware_message( struct msg_queue *queue, unsigned int hw_i } } if (clr_bit) clear_queue_bits( queue, clr_bit ); - } - if (new_win) /* set the new window */ - { - struct thread *owner = get_window_thread( new_win ); - if (owner) - { - msg->win = new_win; - if (owner->queue->input != input) - { - list_remove( &msg->entry ); - if (merge_message( owner->queue->input, msg )) - { - free_message( msg ); - release_object( owner ); - return; - } - list_add_tail( &owner->queue->input->msg_list, &msg->entry ); - } - set_queue_bits( owner->queue, get_hardware_msg_bit( msg )); - remove = 0; - release_object( owner ); - } - } - if (remove) - { update_input_key_state( input->desktop, input->keystate, msg ); list_remove( &msg->entry ); free_message( msg ); @@ -1980,7 +1955,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user data->hw_id = msg->unique_id; set_reply_data( msg->data, msg->data_size ); if (msg->msg == WM_INPUT && (flags & PM_REMOVE)) - release_hardware_message( current->queue, data->hw_id, 1, 0 ); + release_hardware_message( current->queue, data->hw_id, 1 ); return 1; } /* nothing found, clear the hardware queue bits */ @@ -2471,7 +2446,7 @@ DECL_HANDLER(reply_message) DECL_HANDLER(accept_hardware_message) { if (current->queue) - release_hardware_message( current->queue, req->hw_id, req->remove, req->new_win ); + release_hardware_message( current->queue, req->hw_id, req->remove ); else set_error( STATUS_ACCESS_DENIED ); }

1 0

YongHao Hu : msvcp90/tests: Add istream::operator>>(float) and double test.
by Alexandre Julliard 17 Oct '14

17 Oct '14

Module: wine Branch: master Commit: b94fe44e7957e476962132ccfce9f1f954e725dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b94fe44e7957e476962132ccf… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Oct 14 18:05:01 2014 +0800 msvcp90/tests: Add istream::operator>>(float) and double test. --- dlls/msvcp90/tests/ios.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 470dc37..fd27ce5 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -442,6 +442,7 @@ static void (*__thiscall p_basic_fstream_wchar_vbase_dtor)(basic_fstream_wchar*) /* istream */ static basic_istream_char* (*__thiscall p_basic_istream_char_read_uint64)(basic_istream_char*, unsigned __int64*); +static basic_istream_char* (*__thiscall p_basic_istream_char_read_float)(basic_istream_char*, float*); static basic_istream_char* (*__thiscall p_basic_istream_char_read_double)(basic_istream_char*, double*); static int (*__thiscall p_basic_istream_char_get)(basic_istream_char*); static MSVCP_bool (*__thiscall p_basic_istream_char_ipfx)(basic_istream_char*, MSVCP_bool); @@ -648,6 +649,8 @@ static BOOL init(void) SET(p_basic_istream_char_read_uint64, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)AEA_K@Z"); + SET(p_basic_istream_char_read_float, + "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)AEAM@Z"); SET(p_basic_istream_char_read_double, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)AEAN@Z"); SET(p_basic_istream_char_get, @@ -765,6 +768,8 @@ static BOOL init(void) SET(p_basic_istream_char_read_uint64, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)AA_K@Z"); + SET(p_basic_istream_char_read_float, + "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)AAM@Z"); SET(p_basic_istream_char_read_double, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)AAN@Z"); SET(p_basic_istream_char_get, @@ -881,6 +886,8 @@ static BOOL init(void) SET(p_basic_istream_char_read_uint64, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)AA_K@Z"); + SET(p_basic_istream_char_read_float, + "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)AAM@Z"); SET(p_basic_istream_char_read_double, "??5?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)AAN@Z"); SET(p_basic_istream_char_get, @@ -2027,6 +2034,46 @@ static void test_ostream_wchar_print_double(void) call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); } +static void test_istream_read_float(void) +{ + basic_stringstream_char ss; + basic_string_char str; + const char *test_str; + float val, correct_val; + + test_str = "3.14159"; + call_func2(p_basic_string_char_ctor_cstr, &str, test_str); + call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_in, TRUE); + + val = 0; + call_func2(p_basic_istream_char_read_float, &ss.base.base1, &val); + correct_val = 3.14159; + ok(correct_val == val, "wrong val, expected = %g found %g\n", correct_val, val); + + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + call_func1(p_basic_string_char_dtor, &str); +} + +static void test_istream_read_double(void) +{ + basic_stringstream_char ss; + basic_string_char str; + const char *test_str; + double val, correct_val; + + test_str = "3.14159"; + call_func2(p_basic_string_char_ctor_cstr, &str, test_str); + call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_in, TRUE); + + val = 0; + call_func2(p_basic_istream_char_read_double, &ss.base.base1, &val); + correct_val = 3.14159; + ok(correct_val == val, "wrong val, expected = %g found %g\n", correct_val, val); + + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + call_func1(p_basic_string_char_dtor, &str); +} + START_TEST(ios) { if(!init()) @@ -2046,6 +2093,8 @@ START_TEST(ios) test_ostream_print_float(); test_ostream_print_double(); test_ostream_wchar_print_double(); + test_istream_read_float(); + test_istream_read_double(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Sebastian Lackner : server: Fix invalid memory access when copying KeyNameInformation data.
by Alexandre Julliard 17 Oct '14

17 Oct '14

Module: wine Branch: master Commit: add67b6f8d37122b329f83fa90094ef4a8adf883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=add67b6f8d37122b329f83fa9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 17 06:08:20 2014 +0200 server: Fix invalid memory access when copying KeyNameInformation data. --- server/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/registry.c b/server/registry.c index 4aaaf03..43527df 100644 --- a/server/registry.c +++ b/server/registry.c @@ -950,10 +950,10 @@ static void enum_key( const struct key *key, int index, int info_class, for (k = key; k != root_key; k = k->parent) { pos -= k->namelen; - if (pos < len) memcpy( data + namelen, k->name, + if (pos < len) memcpy( data + pos, k->name, min( k->namelen, len - pos ) ); pos -= sizeof(backslash); - if (pos < len) memcpy( data + namelen, backslash, + if (pos < len) memcpy( data + pos, backslash, min( sizeof(backslash), len - pos ) ); } memcpy( data, root_name, min( sizeof(root_name) - sizeof(backslash), len ) );

1 0

Nikolay Sivov : dwrite: Hide BiDi helpers.
by Alexandre Julliard 17 Oct '14

17 Oct '14

Module: wine Branch: master Commit: 571307edc208ffde43933b6dd05125b6b8b8feb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571307edc208ffde43933b6dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 09:27:01 2014 +0400 dwrite: Hide BiDi helpers. --- dlls/dwrite/dwrite_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4c9aeef..4b54a35 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -112,8 +112,8 @@ extern void opentype_cmap_get_glyphindex(void*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; extern VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) DECLSPEC_HIDDEN; -extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*); -extern WCHAR bidi_get_mirrored_char(WCHAR); +extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; +extern WCHAR bidi_get_mirrored_char(WCHAR) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY

1 0

Nikolay Sivov : dwrite: Added a helper to get IDWriteFontFace from IDWriteFont.
by Alexandre Julliard 17 Oct '14

17 Oct '14

Module: wine Branch: master Commit: 460363535e331a37c96fc285ee2c7573d7a4fe8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=460363535e331a37c96fc285e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 09:36:13 2014 +0400 dwrite: Added a helper to get IDWriteFontFace from IDWriteFont. --- dlls/dwrite/font.c | 54 ++++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0b287ff..9a2c636 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -736,6 +736,21 @@ HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) return S_OK; } +static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace **fontface) +{ + *fontface = NULL; + + if (!font->face) { + HRESULT hr = font->is_system ? create_system_fontface(font, &font->face) : + font_create_fontface(NULL, font->data->face_data->type, font->data->face_data->file_count, font->data->face_data->files, + font->data->face_data->index, font->data->face_data->simulations, &font->face); + if (FAILED(hr)) return hr; + } + + *fontface = font->face; + return S_OK; +} + static HRESULT WINAPI dwritefont_QueryInterface(IDWriteFont2 *iface, REFIID riid, void **obj) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); @@ -861,13 +876,12 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, *exists = FALSE; - hr = IDWriteFont2_CreateFontFace(iface, &fontface); + hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) return hr; index = 0; hr = IDWriteFontFace_GetGlyphIndices(fontface, &value, 1, &index); - IDWriteFontFace_Release(fontface); if (FAILED(hr)) return hr; @@ -878,37 +892,15 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont2 *iface, IDWriteFontFace **face) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); + HRESULT hr; - if (This->is_system) - { - TRACE("(%p)->(%p)\n", This, face); - - if (!This->face) - { - HRESULT hr = create_system_fontface(This, &This->face); - if (FAILED(hr)) return hr; - } - - *face = This->face; - IDWriteFontFace_AddRef(*face); - - return S_OK; - } - else - { - TRACE("(%p)->(%p)\n", This, face); + TRACE("(%p)->(%p)\n", This, face); - if (!This->face) - { - HRESULT hr = font_create_fontface(NULL, This->data->face_data->type, This->data->face_data->file_count, This->data->face_data->files, This->data->face_data->index, This->data->face_data->simulations, &This->face); - if (FAILED(hr)) return hr; - } - - *face = This->face; + hr = get_fontface_from_font(This, face); + if (hr == S_OK) IDWriteFontFace_AddRef(*face); - return S_OK; - } + return hr; } static void WINAPI dwritefont1_GetMetrics(IDWriteFont2 *iface, DWRITE_FONT_METRICS1 *metrics) @@ -932,13 +924,11 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont2 *iface, UINT32 m TRACE("(%p)->(%u %p %p)\n", This, max_count, ranges, count); - hr = IDWriteFont2_CreateFontFace(iface, &fontface); + hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) return hr; IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); - IDWriteFontFace_Release(fontface); - hr = IDWriteFontFace2_GetUnicodeRanges(fontface2, max_count, ranges, count); IDWriteFontFace2_Release(fontface2);

1 0

Nikolay Sivov : dwrite: Create IDWriteFontFace2 instance for IDWriteFont.
by Alexandre Julliard 17 Oct '14

17 Oct '14

Module: wine Branch: master Commit: d02d35a7b1ed3805390213a19fb5b83082cac1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d02d35a7b1ed3805390213a19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 09:47:43 2014 +0400 dwrite: Create IDWriteFontFace2 instance for IDWriteFont. --- dlls/dwrite/analyzer.c | 2 -- dlls/dwrite/bidi.c | 1 - dlls/dwrite/dwrite_private.h | 4 +++- dlls/dwrite/font.c | 31 ++++++++++++------------------- dlls/dwrite/gdiinterop.c | 1 - dlls/dwrite/layout.c | 1 - dlls/dwrite/main.c | 4 +--- dlls/dwrite/opentype.c | 1 - dlls/dwrite/shape.c | 1 - 9 files changed, 16 insertions(+), 30 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 1a05335..46cf3b5 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -21,8 +21,6 @@ #define COBJMACROS -#include "dwrite.h" -#include "dwrite_2.h" #include "dwrite_private.h" #include "scripts.h" diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 8e8daf6..48a7a06 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -48,7 +48,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "dwrite_1.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(bidi); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4b54a35..88ca127 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "dwrite_2.h" + #include "wine/debug.h" #include "wine/unicode.h" @@ -103,7 +105,7 @@ extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDE extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; -extern HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace **font_face) DECLSPEC_HIDDEN; +extern HRESULT font_create_fontface(IDWriteFactory*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2 **) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9a2c636..fc13941 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -20,8 +20,6 @@ #define COBJMACROS -#include "dwrite.h" -#include "dwrite_2.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); @@ -93,7 +91,7 @@ struct dwrite_font { BOOL is_system; IDWriteFontFamily *family; - IDWriteFontFace *face; + IDWriteFontFace2 *face; struct dwrite_font_data *data; }; @@ -689,7 +687,7 @@ static const IDWriteFontFace2Vtbl dwritefontfacevtbl = { dwritefontface2_GetRecommendedRenderingMode }; -static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace **face) +static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace2 **face) { struct dwrite_fontface *This; @@ -722,7 +720,7 @@ static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace This->logfont.lfWeight = font->data->weight; strcpyW(This->logfont.lfFaceName, font->data->facename); - *face = (IDWriteFontFace*)&This->IDWriteFontFace2_iface; + *face = &This->IDWriteFontFace2_iface; return S_OK; } @@ -736,7 +734,7 @@ HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) return S_OK; } -static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace **fontface) +static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 **fontface) { *fontface = NULL; @@ -788,7 +786,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont2 *iface) if (!ref) { - if (This->face) IDWriteFontFace_Release(This->face); + if (This->face) IDWriteFontFace2_Release(This->face); if (This->family) IDWriteFontFamily_Release(This->family); _free_font_data(This->data); heap_free(This); @@ -868,7 +866,7 @@ static void WINAPI dwritefont_GetMetrics(IDWriteFont2 *iface, DWRITE_FONT_METRIC static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, BOOL *exists) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - IDWriteFontFace *fontface; + IDWriteFontFace2 *fontface; UINT16 index; HRESULT hr; @@ -881,7 +879,7 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont2 *iface, UINT32 value, return hr; index = 0; - hr = IDWriteFontFace_GetGlyphIndices(fontface, &value, 1, &index); + hr = IDWriteFontFace2_GetGlyphIndices(fontface, &value, 1, &index); if (FAILED(hr)) return hr; @@ -896,7 +894,7 @@ static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont2 *iface, IDWriteFont TRACE("(%p)->(%p)\n", This, face); - hr = get_fontface_from_font(This, face); + hr = get_fontface_from_font(This, (IDWriteFontFace2**)face); if (hr == S_OK) IDWriteFontFace_AddRef(*face); @@ -918,8 +916,7 @@ static void WINAPI dwritefont1_GetPanose(IDWriteFont2 *iface, DWRITE_PANOSE *pan static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont2 *iface, UINT32 max_count, DWRITE_UNICODE_RANGE *ranges, UINT32 *count) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - IDWriteFontFace2 *fontface2; - IDWriteFontFace *fontface; + IDWriteFontFace2 *fontface; HRESULT hr; TRACE("(%p)->(%u %p %p)\n", This, max_count, ranges, count); @@ -928,11 +925,7 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont2 *iface, UINT32 m if (FAILED(hr)) return hr; - IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); - hr = IDWriteFontFace2_GetUnicodeRanges(fontface2, max_count, ranges, count); - IDWriteFontFace2_Release(fontface2); - - return hr; + return IDWriteFontFace2_GetUnicodeRanges(fontface, max_count, ranges, count); } static HRESULT WINAPI dwritefont1_IsMonospacedFont(IDWriteFont2 *iface) @@ -1652,7 +1645,7 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } -HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace **font_face) +HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace2 **font_face) { int i; struct dwrite_fontface *This; @@ -1706,7 +1699,7 @@ HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facety This->data->simulations = sim_flags; This->is_system = FALSE; - *font_face = (IDWriteFontFace*)&This->IDWriteFontFace2_iface; + *font_face = &This->IDWriteFontFace2_iface; return S_OK; } diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 7c20110..c3c2b11 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "dwrite_1.h" #include "dwrite_private.h" #include "wine/debug.h" diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0afd466..86ddf3c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "dwrite_2.h" #include "dwrite_private.h" #include "wine/list.h" diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 0e0f5c5..50ad539 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -27,8 +27,6 @@ #include "winuser.h" #include "initguid.h" -#include "dwrite.h" -#include "dwrite_2.h" #include "dwrite_private.h" #include "wine/debug.h" @@ -609,7 +607,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, { struct dwritefactory *This = impl_from_IDWriteFactory(iface); TRACE("(%p)->(%d %u %p %u 0x%x %p)\n", This, facetype, files_number, font_files, index, sim_flags, font_face); - return font_create_fontface(iface, facetype, files_number, font_files, index, sim_flags, font_face); + return font_create_fontface(iface, facetype, files_number, font_files, index, sim_flags, (IDWriteFontFace2**)font_face); } static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, IDWriteRenderingParams **params) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b17e8ac..a11b2fb 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "dwrite_1.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite); diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index ba306c7..00c9548 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -21,7 +21,6 @@ #define COBJMACROS -#include "dwrite_1.h" #include "dwrite_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dwrite);

1 0

Nikolay Sivov : dwrite: Return on first found glyph.
by Alexandre Julliard 17 Oct '14

17 Oct '14

Module: wine Branch: master Commit: e3c514f6d555a4772160b49f1d0e4ee49f92b8f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c514f6d555a4772160b49f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 11:59:55 2014 +0400 dwrite: Return on first found glyph. --- dlls/dwrite/opentype.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index a11b2fb..487f56b 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -377,7 +377,7 @@ void opentype_cmap_get_glyphindex(void *data, UINT32 utf32c, UINT16 *pgi) table = (WORD*)(((BYTE*)CMAP_Table) + GET_BE_DWORD(CMAP_Table->tables[i].offset)); type = GET_BE_WORD(*table); TRACE("table type %i\n", type); - /* Break when we find a handled type */ + switch (type) { case OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING: @@ -389,6 +389,8 @@ void opentype_cmap_get_glyphindex(void *data, UINT32 utf32c, UINT16 *pgi) default: TRACE("table type %i unhandled.\n", type); } + + if (*pgi) return; } }

1 0

Nikolay Sivov : dwrite: Some tests for IDWriteFontColletion methods.
by Alexandre Julliard 17 Oct '14

17 Oct '14

Module: wine Branch: master Commit: bb23664ee98fd99b5e5c99fae973fcdbea9397de URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb23664ee98fd99b5e5c99fae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 17 08:39:41 2014 +0400 dwrite: Some tests for IDWriteFontColletion methods. --- dlls/dwrite/tests/font.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 411b249..3305cdb 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1189,6 +1189,93 @@ static void test_GetUnicodeRanges(void) IDWriteFontFace1_Release(fontface1); } +static void test_GetFontFromFontFace(void) +{ + IDWriteFontFace *fontface, *fontface2; + IDWriteFontCollection *collection; + IDWriteFont *font, *font2, *font3; + IDWriteFontFamily *family; + HRESULT hr; + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + font2 = NULL; + hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font2); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(font2 != font, "got %p, %p\n", font2, font); + + font3 = NULL; + hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font3); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(font3 != font && font3 != font2, "got %p, %p, %p\n", font3, font2, font); +} + +if (font2) { + hr = IDWriteFont_CreateFontFace(font2, &fontface2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fontface2 == fontface, "got %p, %p\n", fontface2, fontface); + IDWriteFontFace_Release(fontface2); +} + +if (font3) { + hr = IDWriteFont_CreateFontFace(font3, &fontface2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fontface2 == fontface, "got %p, %p\n", fontface2, fontface); + IDWriteFontFace_Release(fontface2); +} + +if (font) + IDWriteFont_Release(font); +if (font2) + IDWriteFont_Release(font2); +if (font3) + IDWriteFont_Release(font3); + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + IDWriteFontCollection_Release(collection); +} + +static void test_GetFirstMatchingFont(void) +{ + IDWriteFontCollection *collection; + IDWriteFont *font, *font2; + IDWriteFontFamily *family; + HRESULT hr; + + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFamily(collection, 0, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(font != font2, "got %p, %p\n", font, font2); + + IDWriteFont_Release(font); + IDWriteFont_Release(font2); + IDWriteFontFamily_Release(family); + IDWriteFontCollection_Release(collection); +} + START_TEST(font) { HRESULT hr; @@ -1214,6 +1301,8 @@ START_TEST(font) test_CreateFontFileReference(); test_shared_isolated(); test_GetUnicodeRanges(); + test_GetFontFromFontFace(); + test_GetFirstMatchingFont(); IDWriteFactory_Release(factory); }

1 0

Ken Thomases : wined3d: Fix subtraction of resource size from used adapter memory.
by Alexandre Julliard 17 Oct '14

17 Oct '14

Module: wine Branch: master Commit: bd460bca1ccade89400515fa004c5e3204e55d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd460bca1ccade89400515fa0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 16 22:03:22 2014 -0500 wined3d: Fix subtraction of resource size from used adapter memory. Properly negate an unsigned value while promoting it from 32- to 64-bit. --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index d40af56..0ab55dc 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -151,7 +151,7 @@ void resource_cleanup(struct wined3d_resource *resource) if (resource->pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) { TRACE("Decrementing device memory pool by %u.\n", resource->size); - adapter_adjust_memory(resource->device->adapter, 0 - resource->size); + adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size); } wined3d_resource_free_sysmem(resource);

1 0

Ken Thomases : configure: For Mac, link wineloader with -no_pie if it' s available.
by Alexandre Julliard 17 Oct '14

17 Oct '14

Module: wine Branch: master Commit: 5ddaf34d69fe9608e45abb65a48854b22fa3610a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ddaf34d69fe9608e45abb65a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 16 22:03:11 2014 -0500 configure: For Mac, link wineloader with -no_pie if it's available. This is necessary for the specified image base and WINE_DOS and WINE_SHAREDHEAP segment addresses to be respected. The latter are necessary to reserve the correct ranges of the address space. --- configure | 28 +++++++++++++++++++++++++--- configure.ac | 5 ++--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 2228ce3..f57c9ad 100755 --- a/configure +++ b/configure @@ -7719,9 +7719,31 @@ uninstall:: APPKIT_LIBS="-framework AppKit" LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" - case $host_os in - darwin11*) LDEXECFLAGS="-Wl,-macosx_version_min,10.6 $LDEXECFLAGS" ;; - esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_pie" >&5 +$as_echo_n "checking whether the compiler supports -Wl,-no_pie... " >&6; } +if ${ac_cv_cflags__Wl__no_pie+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-no_pie" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wl__no_pie=yes +else + ac_cv_cflags__Wl__no_pie=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__no_pie" >&5 +$as_echo "$ac_cv_cflags__Wl__no_pie" >&6; } +if test "x$ac_cv_cflags__Wl__no_pie" = xyes; then : + LDEXECFLAGS="-Wl,-no_pie $LDEXECFLAGS" +fi if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then DISKARBITRATION_LIBS="-framework DiskArbitration -framework CoreFoundation" diff --git a/configure.ac b/configure.ac index 240ce29..5ebc2c3 100644 --- a/configure.ac +++ b/configure.ac @@ -760,9 +760,8 @@ uninstall:: AC_SUBST(CORESERVICES_LIBS,"-framework CoreServices") AC_SUBST(APPKIT_LIBS,"-framework AppKit") LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" - case $host_os in - darwin11*) LDEXECFLAGS="-Wl,-macosx_version_min,10.6 $LDEXECFLAGS" ;; - esac + WINE_TRY_CFLAGS([-Wl,-no_pie], + [LDEXECFLAGS="-Wl,-no_pie $LDEXECFLAGS"]) if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found

1 0