August 2016 - Wine-commits - list.winehq.org

Jacek Caban : rbtree.h: Rewrite wine_rb_put to use parent pointers instead of stack.
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: e3a19d3b2f512fa9aa8e27c708408dc8fc39af36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a19d3b2f512fa9aa8e27c70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 15 21:54:08 2016 +0200 rbtree.h: Rewrite wine_rb_put to use parent pointers instead of stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 108 ++++++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 57 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index a549a87..361766c 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -94,7 +94,7 @@ static inline int wine_rb_is_red(struct wine_rb_entry *entry) return entry && (entry->flags & WINE_RB_FLAG_RED); } -static inline void wine_rb_rotate_left(struct wine_rb_tree *tree, struct wine_rb_entry *e, int change_color) +static inline void wine_rb_rotate_left(struct wine_rb_tree *tree, struct wine_rb_entry *e) { struct wine_rb_entry *right = e->right; @@ -110,15 +110,9 @@ static inline void wine_rb_rotate_left(struct wine_rb_tree *tree, struct wine_rb right->left = e; right->parent = e->parent; e->parent = right; - if (change_color) - { - right->flags &= ~WINE_RB_FLAG_RED; - right->flags |= e->flags & WINE_RB_FLAG_RED; - e->flags |= WINE_RB_FLAG_RED; - } } -static inline void wine_rb_rotate_right(struct wine_rb_tree *tree, struct wine_rb_entry *e, int change_color) +static inline void wine_rb_rotate_right(struct wine_rb_tree *tree, struct wine_rb_entry *e) { struct wine_rb_entry *left = e->left; @@ -134,12 +128,6 @@ static inline void wine_rb_rotate_right(struct wine_rb_tree *tree, struct wine_r left->right = e; left->parent = e->parent; e->parent = left; - if (change_color) - { - left->flags &= ~WINE_RB_FLAG_RED; - left->flags |= e->flags & WINE_RB_FLAG_RED; - e->flags |= WINE_RB_FLAG_RED; - } } static inline void wine_rb_flip_color(struct wine_rb_entry *entry) @@ -149,25 +137,6 @@ static inline void wine_rb_flip_color(struct wine_rb_entry *entry) entry->right->flags ^= WINE_RB_FLAG_RED; } -static inline void wine_rb_fixup(struct wine_rb_tree *tree, struct wine_rb_stack *stack) -{ - while (stack->count) - { - struct wine_rb_entry **entry = stack->entries[stack->count - 1]; - - if ((*entry)->flags & WINE_RB_FLAG_STOP) - { - (*entry)->flags &= ~WINE_RB_FLAG_STOP; - return; - } - - if (wine_rb_is_red((*entry)->right) && !wine_rb_is_red((*entry)->left)) wine_rb_rotate_left(tree, *entry, 1); - if (wine_rb_is_red((*entry)->left) && wine_rb_is_red((*entry)->left->left)) wine_rb_rotate_right(tree, *entry, 1); - if (wine_rb_is_red((*entry)->left) && wine_rb_is_red((*entry)->right)) wine_rb_flip_color(*entry); - --stack->count; - } -} - static inline struct wine_rb_entry *wine_rb_postorder_head(struct wine_rb_entry *iter) { if (!iter) return NULL; @@ -243,41 +212,66 @@ static inline struct wine_rb_entry *wine_rb_get(const struct wine_rb_tree *tree, static inline int wine_rb_put(struct wine_rb_tree *tree, const void *key, struct wine_rb_entry *entry) { struct wine_rb_entry **iter = &tree->root, *parent = tree->root; - size_t black_height = 1; while (*iter) { int c; - if (!wine_rb_is_red(*iter)) ++black_height; - - wine_rb_stack_push(&tree->stack, iter); - parent = *iter; c = tree->functions->compare(key, parent); - if (!c) - { - wine_rb_stack_clear(&tree->stack); - return -1; - } + if (!c) return -1; else if (c < 0) iter = &parent->left; else iter = &parent->right; } - /* After insertion, the path length to any node should be <= (black_height + 1) * 2. */ - if (wine_rb_ensure_stack_size(tree, black_height << 1) == -1) - { - wine_rb_stack_clear(&tree->stack); - return -1; - } - entry->flags = WINE_RB_FLAG_RED; entry->parent = parent; entry->left = NULL; entry->right = NULL; *iter = entry; - wine_rb_fixup(tree, &tree->stack); + while (wine_rb_is_red(entry->parent)) + { + if (entry->parent == entry->parent->parent->left) + { + if (wine_rb_is_red(entry->parent->parent->right)) + { + wine_rb_flip_color(entry->parent->parent); + entry = entry->parent->parent; + } + else + { + if (entry == entry->parent->right) + { + entry = entry->parent; + wine_rb_rotate_left(tree, entry); + } + entry->parent->flags &= ~WINE_RB_FLAG_RED; + entry->parent->parent->flags |= WINE_RB_FLAG_RED; + wine_rb_rotate_right(tree, entry->parent->parent); + } + } + else + { + if (wine_rb_is_red(entry->parent->parent->left)) + { + wine_rb_flip_color(entry->parent->parent); + entry = entry->parent->parent; + } + else + { + if (entry == entry->parent->left) + { + entry = entry->parent; + wine_rb_rotate_right(tree, entry); + } + entry->parent->flags &= ~WINE_RB_FLAG_RED; + entry->parent->parent->flags |= WINE_RB_FLAG_RED; + wine_rb_rotate_left(tree, entry->parent->parent); + } + } + } + tree->root->flags &= ~WINE_RB_FLAG_RED; return 0; @@ -335,7 +329,7 @@ static inline void wine_rb_remove(struct wine_rb_tree *tree, const void *key) { w->flags &= ~WINE_RB_FLAG_RED; parent->flags |= WINE_RB_FLAG_RED; - wine_rb_rotate_left(tree, parent, 0); + wine_rb_rotate_left(tree, parent); w = parent->right; } if (wine_rb_is_red(w->left) || wine_rb_is_red(w->right)) @@ -344,14 +338,14 @@ static inline void wine_rb_remove(struct wine_rb_tree *tree, const void *key) { w->left->flags &= ~WINE_RB_FLAG_RED; w->flags |= WINE_RB_FLAG_RED; - wine_rb_rotate_right(tree, w, 0); + wine_rb_rotate_right(tree, w); w = parent->right; } w->flags = (w->flags & ~WINE_RB_FLAG_RED) | (parent->flags & WINE_RB_FLAG_RED); parent->flags &= ~WINE_RB_FLAG_RED; if (w->right) w->right->flags &= ~WINE_RB_FLAG_RED; - wine_rb_rotate_left(tree, parent, 0); + wine_rb_rotate_left(tree, parent); child = NULL; break; } @@ -363,7 +357,7 @@ static inline void wine_rb_remove(struct wine_rb_tree *tree, const void *key) { w->flags &= ~WINE_RB_FLAG_RED; parent->flags |= WINE_RB_FLAG_RED; - wine_rb_rotate_right(tree, parent, 0); + wine_rb_rotate_right(tree, parent); w = parent->left; } if (wine_rb_is_red(w->left) || wine_rb_is_red(w->right)) @@ -372,14 +366,14 @@ static inline void wine_rb_remove(struct wine_rb_tree *tree, const void *key) { w->right->flags &= ~WINE_RB_FLAG_RED; w->flags |= WINE_RB_FLAG_RED; - wine_rb_rotate_left(tree, w, 0); + wine_rb_rotate_left(tree, w); w = parent->left; } w->flags = (w->flags & ~WINE_RB_FLAG_RED) | (parent->flags & WINE_RB_FLAG_RED); parent->flags &= ~WINE_RB_FLAG_RED; if (w->left) w->left->flags &= ~WINE_RB_FLAG_RED; - wine_rb_rotate_right(tree, parent, 0); + wine_rb_rotate_right(tree, parent); child = NULL; break; }

1 0

Jacek Caban : rbtree.h: Get rid of no longer needed wine_rb_stack.
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: 69f571dbebeae3ade039e659165855ddcfc74ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f571dbebeae3ade039e6591… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 15 21:54:20 2016 +0200 rbtree.h: Get rid of no longer needed wine_rb_stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index 361766c..f13592e 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -3,6 +3,7 @@ * * Copyright 2009 Henri Verbeet * Copyright 2009 Andrew Riedi + * Copyright 2016 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,13 +34,6 @@ struct wine_rb_entry unsigned int flags; }; -struct wine_rb_stack -{ - struct wine_rb_entry ***entries; - size_t count; - size_t size; -}; - struct wine_rb_functions { void *(*alloc)(size_t size); @@ -52,42 +46,11 @@ struct wine_rb_tree { const struct wine_rb_functions *functions; struct wine_rb_entry *root; - struct wine_rb_stack stack; }; typedef void (wine_rb_traverse_func_t)(struct wine_rb_entry *entry, void *context); #define WINE_RB_FLAG_RED 0x1 -#define WINE_RB_FLAG_STOP 0x2 - -static inline void wine_rb_stack_clear(struct wine_rb_stack *stack) -{ - stack->count = 0; -} - -static inline void wine_rb_stack_push(struct wine_rb_stack *stack, struct wine_rb_entry **entry) -{ - stack->entries[stack->count++] = entry; -} - -static inline int wine_rb_ensure_stack_size(struct wine_rb_tree *tree, size_t size) -{ - struct wine_rb_stack *stack = &tree->stack; - - if (size > stack->size) - { - size_t new_size = stack->size << 1; - struct wine_rb_entry ***new_entries = tree->functions->realloc(stack->entries, - new_size * sizeof(*stack->entries)); - - if (!new_entries) return -1; - - stack->entries = new_entries; - stack->size = new_size; - } - - return 0; -} static inline int wine_rb_is_red(struct wine_rb_entry *entry) { @@ -171,11 +134,6 @@ static inline int wine_rb_init(struct wine_rb_tree *tree, const struct wine_rb_f tree->functions = functions; tree->root = NULL; - tree->stack.entries = functions->alloc(16 * sizeof(*tree->stack.entries)); - if (!tree->stack.entries) return -1; - tree->stack.size = 16; - tree->stack.count = 0; - return 0; } @@ -194,7 +152,6 @@ static inline void wine_rb_clear(struct wine_rb_tree *tree, wine_rb_traverse_fun static inline void wine_rb_destroy(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) { wine_rb_clear(tree, callback, context); - tree->functions->free(tree->stack.entries); } static inline struct wine_rb_entry *wine_rb_get(const struct wine_rb_tree *tree, const void *key)

1 0

Alexandre Julliard : user32: Fix InSendMessage return value.
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: 7594afeb6cf30228e551155a4b4ac636950cd942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7594afeb6cf30228e551155a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 14:38:15 2016 +0900 user32: Fix InSendMessage return value. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 2 +- dlls/user32/tests/msg.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index bc6b661..9bfb453 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3612,7 +3612,7 @@ BOOL WINAPI ReplyMessage( LRESULT result ) */ BOOL WINAPI InSendMessage(void) { - return (InSendMessageEx(NULL) & (ISMEX_SEND|ISMEX_REPLIED)) == ISMEX_SEND; + return (InSendMessageEx( NULL ) & (ISMEX_SEND | ISMEX_NOTIFY | ISMEX_CALLBACK)) != 0; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9dc1120..ebd1c45 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15822,6 +15822,98 @@ todo_wine_if (thread_n == 2) flush_sequence(); } +static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + DWORD flags = InSendMessageEx( NULL ); + BOOL ret; + + switch (msg) + { + case WM_USER: + ok( flags == ISMEX_SEND, "wrong flags %x\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %u\n", GetLastError() ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED), "wrong flags %x\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 1: + ok( flags == ISMEX_NOTIFY, "wrong flags %x\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %u\n", GetLastError() ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOTIFY, "wrong flags %x\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 2: + ok( flags == ISMEX_CALLBACK, "wrong flags %x\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %u\n", GetLastError() ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_CALLBACK | ISMEX_REPLIED) || flags == ISMEX_SEND, "wrong flags %x\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 3: + ok( flags == ISMEX_NOSEND, "wrong flags %x\n", flags ); + ok( !InSendMessage(), "InSendMessage returned true\n" ); + ret = ReplyMessage( msg ); + ok( !ret, "ReplyMessage succeeded\n" ); + break; + } + + return DefWindowProcA( hwnd, msg, wp, lp ); +} + +static void CALLBACK msg_callback( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT result ) +{ + ok( msg == WM_USER + 2, "wrong msg %x\n", msg ); + ok( result == WM_USER + 2, "wrong result %lx\n", result ); +} + +static DWORD WINAPI send_message_thread( void *arg ) +{ + HWND win = arg; + + SendMessageA( win, WM_USER, 0, 0 ); + SendNotifyMessageA( win, WM_USER + 1, 0, 0 ); + SendMessageCallbackA( win, WM_USER + 2, 0, 0, msg_callback, 0 ); + PostMessageA( win, WM_USER + 3, 0, 0 ); + PostMessageA( win, WM_QUIT, 0, 0 ); + return 0; +} + +static void test_InSendMessage(void) +{ + WNDCLASSA cls; + HWND win; + MSG msg; + HANDLE thread; + DWORD tid; + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = insendmessage_wnd_proc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = "InSendMessage_test"; + RegisterClassA(&cls); + + win = CreateWindowA( "InSendMessage_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0 ); + ok( win != NULL, "CreateWindow failed: %d\n", GetLastError() ); + + thread = CreateThread( NULL, 0, send_message_thread, win, 0, &tid ); + ok( thread != NULL, "CreateThread failed: %d\n", GetLastError() ); + + while (GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA( &msg ); + + ok( WaitForSingleObject( thread, 30000 ) == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + CloseHandle( thread ); + + DestroyWindow( win ); + UnregisterClassA( "InSendMessage_test", GetModuleHandleA(NULL) ); +} + static const struct message DoubleSetCaptureSeq[] = { { WM_CAPTURECHANGED, sent }, @@ -15930,6 +16022,7 @@ START_TEST(msg) test_SendMessage_other_thread(1); test_SendMessage_other_thread(2); + test_InSendMessage(); test_SetFocus(); test_SetParent(); test_PostMessage();

1 0

Łukasz Wojniłowicz : Polish translation for release 1.8.4
by Jeremy Newman 30 Aug '16

30 Aug '16

Module: website Branch: master Commit: 5f39c57728faa7406d6b7452a2579f4a94f39067 URL: http://source.winehq.org/git/website.git/?a=commit;h=5f39c57728faa7406d6b74… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Aug 27 07:15:55 2016 +0200 Polish translation for release 1.8.4 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016082201.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/pl/2016082201.xml b/news/pl/2016082201.xml new file mode 100644 index 0000000..5c66065 --- /dev/null +++ b/news/pl/2016082201.xml @@ -0,0 +1,13 @@ +<news> +<date>Sierpień 22, 2016</date> +<title>Wydano Wine 1.8.4</title> +<body> + Poprawione wydanie Wine 1.8.4 jest już dostępne. + <a href="{$root}/announce/1.8.4">Co nowego</a> w tym wydaniu: +<ul> + <li>Rozmaite poprawki błędów.</li> + <li>Dodano kilka kart do tabeli opisu procesorów GPU.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.4.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.17
by Jeremy Newman 30 Aug '16

30 Aug '16

Module: website Branch: master Commit: 1924b4bf8efe2f30e99b27db592185fe0d483288 URL: http://source.winehq.org/git/website.git/?a=commit;h=1924b4bf8efe2f30e99b27… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Aug 27 07:15:54 2016 +0200 Polish translation for release 1.9.17 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016081901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2016081901.xml b/news/pl/2016081901.xml new file mode 100644 index 0000000..eb7f4c5 --- /dev/null +++ b/news/pl/2016081901.xml @@ -0,0 +1,17 @@ +<news> +<date>Sierpień 19, 2016</date> +<title>Wydano Wine 1.9.17</title> +<body> + Wydanie rozwojowe Wine 1.9.17 jest już dostępne. + <a href="{$root}/announce/1.9.17">Co nowego</a> w tym wydaniu: +<ul> + <li>Lepsza obsługa wyjątków na 64-bitach.</li> + <li>Rozmaite ulepszenia w obsłudze joysticka.</li> + <li>Szersze wsparcie strumieni w bibliotece uruchomieniowej C++.</li> + <li>Ulepszenia w osadzaniu czcionek.</li> + <li>Szersze wsparcie metaplików w GDI+.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.17.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Simone Giustetti : The Slackware release number was upgraded to 14.2
by Jeremy Newman 30 Aug '16

30 Aug '16

Module: website Branch: master Commit: b44d8c18cd630ec9d6d4a149df652304e538bec0 URL: http://source.winehq.org/git/website.git/?a=commit;h=b44d8c18cd630ec9d6d4a1… Author: Simone Giustetti <studiosg(a)giustetti.net> Date: Mon Aug 29 16:07:30 2016 +0200 The Slackware release number was upgraded to 14.2 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/fr/download.template | 2 +- templates/pl/download.template | 2 +- templates/pt/download.template | 2 +- templates/tr/download.template | 2 +- templates/uk/download.template | 2 +- templates/zh-cn/download.template | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index f43a266..ce6a318 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -112,7 +112,7 @@ für das Hosten der Wine-Webseite erbeten hat. <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a> - Binärpakete (.txz) für Slackware 14.1 und (.tgz) für ältere Versionen</td> + Binärpakete (.txz) für Slackware 14.2 und (.tgz) für ältere Versionen</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index c3913cc..04283a0 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -113,7 +113,7 @@ </div> <div class="col-xs-10"> <a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a> - - binary txz (Slackware 14.1), and tgz (for older versions) + - binary txz (Slackware 14.2), and tgz (for older versions) Maintainer: <a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a> </div> </div> diff --git a/templates/fr/download.template b/templates/fr/download.template index a0d99d9..c689122 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -117,7 +117,7 @@ center;">Voyez la <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware Linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a> - - .txz binaires (Slackware 14.1), et .tgz binaires (pour les versions plus anciennes)</td> + - .txz binaires (Slackware 14.2), et .tgz binaires (pour les versions plus anciennes)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index 2e576f9..71972b6 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -102,7 +102,7 @@ <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Pobierz paczki dla Slackware</a> - - binarne paczki txz (Slackware 14.1), i tgz (dla starszych wersji)</td> + - binarne paczki txz (Slackware 14.2), i tgz (dla starszych wersji)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/pt/download.template b/templates/pt/download.template index 1c1504f..8e0e146 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -100,7 +100,7 @@ <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Descarregar pacotes para Slackware</a> - - binários txz (Slackware 14.0), e tgz (para versões antigas)</td> + - binários txz (Slackware 14.2), e tgz (para versões antigas)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/tr/download.template b/templates/tr/download.template index 4c04b88..ce09d36 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -99,7 +99,7 @@ <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware paketleri indirin</a> - - ikili txz (Slackware 14.0) ve tgz (daha eski sürümler için) dosyaları</td> + - ikili txz (Slackware 14.2) ve tgz (daha eski sürümler için) dosyaları</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/uk/download.template b/templates/uk/download.template index b6a0e1a..d631f94 100644 --- a/templates/uk/download.template +++ b/templates/uk/download.template @@ -102,7 +102,7 @@ <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Завантажити пакунки Slackware</a> - - бінарні txz файли (Slackware 14.1), та tgz (для старіших версій)</td> + - бінарні txz файли (Slackware 14.2), та tgz (для старіших версій)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index b55874c..76944f5 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -113,7 +113,7 @@ </div> <div class="col-xs-10"> <a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a> - - txz 安装包（Slackware 14.1）和 tgz（供给旧版本 Slackware） + - txz 安装包（Slackware 14.2）和 tgz（供给旧版本 Slackware） 维护者： <a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a> </div> </div>

1 0

Alexandre Julliard : server: Implement Add/RemoveClipboardFormatListener.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 35537b1d4549129067a7591337aa52784e36e168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35537b1d4549129067a759133… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 20:55:52 2016 +0900 server: Implement Add/RemoveClipboardFormatListener. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 22 ++++++++-- dlls/user32/tests/clipboard.c | 16 +++---- include/wine/server_protocol.h | 32 +++++++++++++- include/winuser.h | 2 + server/clipboard.c | 95 +++++++++++++++++++++++++++++++++++++++++- server/protocol.def | 12 ++++++ server/request.h | 8 ++++ server/trace.c | 16 +++++++ 8 files changed, 189 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35537b1d4549129067a75…

1 0

Józef Kucia : dxgi: Update swapchain fullscreen state when state change is successful.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 7c5f60f2d8bf71a357f3823a55efea116ef055f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5f60f2d8bf71a357f3823a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 28 22:30:53 2016 +0200 dxgi: Update swapchain fullscreen state when state change is successful. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 7b02b3e..a759885 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -229,17 +229,24 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH dxgi_swapchain_SetFullscreenS } } - swapchain->fullscreen = fullscreen; - if (swapchain->target) - IDXGIOutput_Release(swapchain->target); - swapchain->target = target; - wined3d_mutex_lock(); wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); swapchain_desc.windowed = !fullscreen; hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, &swapchain_desc, NULL); wined3d_mutex_unlock(); + if (SUCCEEDED(hr)) + { + swapchain->fullscreen = fullscreen; + if (swapchain->target) + IDXGIOutput_Release(swapchain->target); + swapchain->target = target; + } + else + { + IDXGIOutput_Release(target); + } + return hr; }

1 0

Józef Kucia : dxgi: Release target output when releasing swapchain.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: a1b075258594d1924c1591c89ad7ce86965fbd02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b075258594d1924c1591c89… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 28 22:30:54 2016 +0200 dxgi: Release target output when releasing swapchain. It should never happen because applications are required to call SetFullscreenState() to exit fullscreen mode before releasing the swapchain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a759885..2b61327 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -78,6 +78,11 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) if (!refcount) { IWineDXGIDevice *device = swapchain->device; + if (swapchain->target) + { + WARN("Releasing fullscreen swapchain.\n"); + IDXGIOutput_Release(swapchain->target); + } if (swapchain->factory) IDXGIFactory_Release(swapchain->factory); wined3d_mutex_lock();

1 0

Nikolay Sivov : oleaut32: Added proxy/stub for BindType.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 2bc66dc073f920add93fa75b6c0c85226604e91b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc66dc073f920add93fa75b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 29 15:38:56 2016 +0300 oleaut32: Added proxy/stub for BindType. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/usrmarshal.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 61c8cc2..da524c8 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1515,23 +1515,41 @@ HRESULT __RPC_STUB ITypeComp_Bind_Stub( HRESULT CALLBACK ITypeComp_BindType_Proxy( ITypeComp* This, - LPOLESTR szName, + LPOLESTR name, ULONG lHashVal, - ITypeInfo** ppTInfo, - ITypeComp** ppTComp) + ITypeInfo **ti, + ITypeComp **typecomp) { - FIXME("not implemented\n"); - return E_FAIL; + HRESULT hr; + + TRACE("(%p, %s, %#x, %p, %p)\n", This, debugstr_w(name), lHashVal, ti, typecomp); + + hr = ITypeComp_RemoteBindType_Proxy(This, name, lHashVal, ti); + if (hr == S_OK) + ITypeInfo_GetTypeComp(*ti, typecomp); + else if (typecomp) + *typecomp = NULL; + + return hr; } HRESULT __RPC_STUB ITypeComp_BindType_Stub( ITypeComp* This, - LPOLESTR szName, + LPOLESTR name, ULONG lHashVal, - ITypeInfo** ppTInfo) + ITypeInfo **ti) { - FIXME("not implemented\n"); - return E_FAIL; + ITypeComp *typecomp = NULL; + HRESULT hr; + + TRACE("(%p, %s, %#x, %p)\n", This, debugstr_w(name), lHashVal, ti); + + hr = ITypeComp_BindType(This, name, lHashVal, ti, &typecomp); + + if (typecomp) + ITypeComp_Release(typecomp); + + return hr; } /* ITypeInfo */

1 0