wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Jacek Caban : rbtree.h: Store parent entry pointer in each entry.
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: 256f55e75bc5191cfdafd9d04c6f72194dd4a145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=256f55e75bc5191cfdafd9d04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 15 21:53:13 2016 +0200 rbtree.h: Store parent entry pointer in each entry. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 79 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 29 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index 13452d9..11f42f7 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -27,6 +27,7 @@ struct wine_rb_entry { + struct wine_rb_entry *parent; struct wine_rb_entry *left; struct wine_rb_entry *right; unsigned int flags; @@ -95,30 +96,46 @@ 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_entry **entry) +static inline void wine_rb_rotate_left(struct wine_rb_tree *tree, struct wine_rb_entry *e) { - struct wine_rb_entry *e = *entry; struct wine_rb_entry *right = e->right; + if (!e->parent) + tree->root = right; + else if (e->parent->left == e) + e->parent->left = right; + else + e->parent->right = right; + e->right = right->left; + if (e->right) e->right->parent = e; right->left = e; + right->parent = e->parent; + e->parent = right; right->flags &= ~WINE_RB_FLAG_RED; right->flags |= e->flags & WINE_RB_FLAG_RED; e->flags |= WINE_RB_FLAG_RED; - *entry = right; } -static inline void wine_rb_rotate_right(struct wine_rb_entry **entry) +static inline void wine_rb_rotate_right(struct wine_rb_tree *tree, struct wine_rb_entry *e) { - struct wine_rb_entry *e = *entry; struct wine_rb_entry *left = e->left; + if (!e->parent) + tree->root = left; + else if (e->parent->left == e) + e->parent->left = left; + else + e->parent->right = left; + e->left = left->right; + if (e->left) e->left->parent = e; left->right = e; + left->parent = e->parent; + e->parent = left; left->flags &= ~WINE_RB_FLAG_RED; left->flags |= e->flags & WINE_RB_FLAG_RED; e->flags |= WINE_RB_FLAG_RED; - *entry = left; } static inline void wine_rb_flip_color(struct wine_rb_entry *entry) @@ -128,7 +145,7 @@ 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_stack *stack) +static inline void wine_rb_fixup(struct wine_rb_tree *tree, struct wine_rb_stack *stack) { while (stack->count) { @@ -140,30 +157,30 @@ static inline void wine_rb_fixup(struct wine_rb_stack *stack) return; } - if (wine_rb_is_red((*entry)->right) && !wine_rb_is_red((*entry)->left)) wine_rb_rotate_left(entry); - if (wine_rb_is_red((*entry)->left) && wine_rb_is_red((*entry)->left->left)) wine_rb_rotate_right(entry); + if (wine_rb_is_red((*entry)->right) && !wine_rb_is_red((*entry)->left)) wine_rb_rotate_left(tree, *entry); + if (wine_rb_is_red((*entry)->left) && wine_rb_is_red((*entry)->left->left)) wine_rb_rotate_right(tree, *entry); if (wine_rb_is_red((*entry)->left) && wine_rb_is_red((*entry)->right)) wine_rb_flip_color(*entry); --stack->count; } } -static inline void wine_rb_move_red_left(struct wine_rb_entry **entry) +static inline void wine_rb_move_red_left(struct wine_rb_tree *tree, struct wine_rb_entry **entry) { wine_rb_flip_color(*entry); if (wine_rb_is_red((*entry)->right->left)) { - wine_rb_rotate_right(&(*entry)->right); - wine_rb_rotate_left(entry); + wine_rb_rotate_right(tree, (*entry)->right); + wine_rb_rotate_left(tree, *entry); wine_rb_flip_color(*entry); } } -static inline void wine_rb_move_red_right(struct wine_rb_entry **entry) +static inline void wine_rb_move_red_right(struct wine_rb_tree *tree, struct wine_rb_entry **entry) { wine_rb_flip_color(*entry); if (wine_rb_is_red((*entry)->left->left)) { - wine_rb_rotate_right(entry); + wine_rb_rotate_right(tree, *entry); wine_rb_flip_color(*entry); } } @@ -247,25 +264,26 @@ 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 **parent = &tree->root; + struct wine_rb_entry **iter = &tree->root, *parent = tree->root; size_t black_height = 1; - while (*parent) + while (*iter) { int c; - if (!wine_rb_is_red(*parent)) ++black_height; + if (!wine_rb_is_red(*iter)) ++black_height; - wine_rb_stack_push(&tree->stack, parent); + wine_rb_stack_push(&tree->stack, iter); - c = tree->functions->compare(key, *parent); + parent = *iter; + c = tree->functions->compare(key, parent); if (!c) { wine_rb_stack_clear(&tree->stack); return -1; } - else if (c < 0) parent = &(*parent)->left; - else parent = &(*parent)->right; + 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. */ @@ -276,11 +294,12 @@ static inline int wine_rb_put(struct wine_rb_tree *tree, const void *key, struct } entry->flags = WINE_RB_FLAG_RED; + entry->parent = parent; entry->left = NULL; entry->right = NULL; - *parent = entry; + *iter = entry; - wine_rb_fixup(&tree->stack); + wine_rb_fixup(tree, &tree->stack); tree->root->flags &= ~WINE_RB_FLAG_RED; return 0; @@ -295,19 +314,19 @@ static inline void wine_rb_remove(struct wine_rb_tree *tree, const void *key) if (tree->functions->compare(key, *entry) < 0) { wine_rb_stack_push(&tree->stack, entry); - if (!wine_rb_is_red((*entry)->left) && !wine_rb_is_red((*entry)->left->left)) wine_rb_move_red_left(entry); + if (!wine_rb_is_red((*entry)->left) && !wine_rb_is_red((*entry)->left->left)) wine_rb_move_red_left(tree, entry); entry = &(*entry)->left; } else { - if (wine_rb_is_red((*entry)->left)) wine_rb_rotate_right(entry); + if (wine_rb_is_red((*entry)->left)) wine_rb_rotate_right(tree, *entry); if (!tree->functions->compare(key, *entry) && !(*entry)->right) { *entry = NULL; break; } if (!wine_rb_is_red((*entry)->right) && !wine_rb_is_red((*entry)->right->left)) - wine_rb_move_red_right(entry); + wine_rb_move_red_right(tree, entry); if (!tree->functions->compare(key, *entry)) { struct wine_rb_entry **e = &(*entry)->right; @@ -320,14 +339,16 @@ static inline void wine_rb_remove(struct wine_rb_tree *tree, const void *key) while ((*e)->left) { wine_rb_stack_push(&tree->stack, e); - if (!wine_rb_is_red((*e)->left) && !wine_rb_is_red((*e)->left->left)) wine_rb_move_red_left(e); + if (!wine_rb_is_red((*e)->left) && !wine_rb_is_red((*e)->left->left)) wine_rb_move_red_left(tree, e); e = &(*e)->left; } *e = NULL; - wine_rb_fixup(&tree->stack); + wine_rb_fixup(tree, &tree->stack); *m = **entry; *entry = m; + if (m->right) m->right->parent = m; + if (m->left) m->left->parent = m; break; } @@ -339,7 +360,7 @@ static inline void wine_rb_remove(struct wine_rb_tree *tree, const void *key) } } - wine_rb_fixup(&tree->stack); + wine_rb_fixup(tree, &tree->stack); if (tree->root) tree->root->flags &= ~WINE_RB_FLAG_RED; }

1 0

Jacek Caban : winex11.drv: Added ThreadDetach entry point and use it instead of DllMain.
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: af9f722361800c17875964007b4f5f276db5cd4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9f722361800c17875964007… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 29 19:58:20 2016 +0200 winex11.drv: Added ThreadDetach entry point and use it instead of DllMain. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/winex11.drv.spec | 1 + dlls/winex11.drv/x11drv_main.c | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 7cdce52..ceb0f56 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -53,6 +53,7 @@ @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) X11DRV_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) X11DRV_WindowPosChanged @ cdecl SystemParametersInfo(long long ptr long) X11DRV_SystemParametersInfo +@ cdecl ThreadDetach() X11DRV_ThreadDetach # WinTab32 @ cdecl AttachEventQueueToTablet(long) X11DRV_AttachEventQueueToTablet diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index d4f5c84..c2e0969 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,9 +597,9 @@ static BOOL process_attach(void) /*********************************************************************** - * X11DRV thread termination routine + * ThreadDetach (X11DRV.@) */ -static void thread_detach(void) +void CDECL X11DRV_ThreadDetach(void) { struct x11drv_thread_data *data = TlsGetValue( thread_data_tls_index ); @@ -690,12 +690,10 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); x11drv_module = hinst; ret = process_attach(); break; - case DLL_THREAD_DETACH: - thread_detach(); - break; } return ret; }

1 0

Jacek Caban : rpcrt4/tests: Don't load GetUserNameEx dynamically.
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: ffe01b33f1a266aef2ec75e46d23a316750b8211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe01b33f1a266aef2ec75e46… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 29 17:30:10 2016 +0200 rpcrt4/tests: Don't load GetUserNameEx dynamically. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/Makefile.in | 2 +- dlls/rpcrt4/tests/rpc.c | 11 ++--------- dlls/rpcrt4/tests/server.c | 29 ++++++++--------------------- 3 files changed, 11 insertions(+), 31 deletions(-) diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in index 5df97c4..5229d07 100644 --- a/dlls/rpcrt4/tests/Makefile.in +++ b/dlls/rpcrt4/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = rpcrt4.dll -IMPORTS = ole32 rpcrt4 advapi32 +IMPORTS = ole32 rpcrt4 secur32 advapi32 EXTRAIDLFLAGS = --prefix-server=s_ C_SRCS = \ diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 81b598c..d260827 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -862,19 +862,12 @@ static void test_RpcServerInqDefaultPrincName(void) { RPC_STATUS ret; RPC_CSTR principal, saved_principal; - BOOLEAN (WINAPI *pGetUserNameExA)(EXTENDED_NAME_FORMAT,LPSTR,PULONG); char *username; ULONG len = 0; - pGetUserNameExA = (void *)GetProcAddress( LoadLibraryA("secur32.dll"), "GetUserNameExA" ); - if (!pGetUserNameExA) - { - win_skip( "GetUserNameExA not exported\n" ); - return; - } - pGetUserNameExA( NameSamCompatible, NULL, &len ); + GetUserNameExA( NameSamCompatible, NULL, &len ); username = HeapAlloc( GetProcessHeap(), 0, len ); - pGetUserNameExA( NameSamCompatible, username, &len ); + GetUserNameExA( NameSamCompatible, username, &len ); ret = RpcServerInqDefaultPrincNameA( 0, NULL ); ok( ret == RPC_S_UNKNOWN_AUTHN_SERVICE, "got %u\n", ret ); diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 2653f7a..6901f6b 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -44,7 +44,6 @@ static void (WINAPI *pNDRSContextMarshall2)(RPC_BINDING_HANDLE, NDR_SCONTEXT, vo static NDR_SCONTEXT (WINAPI *pNDRSContextUnmarshall2)(RPC_BINDING_HANDLE, void*, ULONG, void*, ULONG); static RPC_STATUS (WINAPI *pRpcServerRegisterIfEx)(RPC_IF_HANDLE,UUID*, RPC_MGR_EPV*, unsigned int, unsigned int,RPC_IF_CALLBACK_FN*); -static BOOLEAN (WINAPI *pGetUserNameExA)(EXTENDED_NAME_FORMAT, LPSTR, PULONG); static RPC_STATUS (WINAPI *pRpcBindingSetAuthInfoExA)(RPC_BINDING_HANDLE, RPC_CSTR, ULONG, ULONG, RPC_AUTH_IDENTITY_HANDLE, ULONG, RPC_SECURITY_QOS *); static RPC_STATUS (WINAPI *pRpcServerRegisterAuthInfoA)(RPC_CSTR, ULONG, RPC_AUTH_KEY_RETRIEVAL_FN, LPVOID); @@ -60,14 +59,12 @@ static const WCHAR worldW[] = { 'W','o','r','l','d','!',0 }; static void InitFunctionPointers(void) { HMODULE hrpcrt4 = GetModuleHandleA("rpcrt4.dll"); - HMODULE hsecur32 = LoadLibraryA("secur32.dll"); pNDRSContextMarshall2 = (void *)GetProcAddress(hrpcrt4, "NDRSContextMarshall2"); pNDRSContextUnmarshall2 = (void *)GetProcAddress(hrpcrt4, "NDRSContextUnmarshall2"); pRpcServerRegisterIfEx = (void *)GetProcAddress(hrpcrt4, "RpcServerRegisterIfEx"); pRpcBindingSetAuthInfoExA = (void *)GetProcAddress(hrpcrt4, "RpcBindingSetAuthInfoExA"); pRpcServerRegisterAuthInfoA = (void *)GetProcAddress(hrpcrt4, "RpcServerRegisterAuthInfoA"); - pGetUserNameExA = (void *)GetProcAddress(hsecur32, "GetUserNameExA"); if (!pNDRSContextMarshall2) old_windows_version = TRUE; } @@ -1500,7 +1497,7 @@ void __cdecl s_authinfo_test(unsigned int protseq, int secure) todo_wine ok(principal != NULL, "NULL principal\n"); } - if (protseq == RPC_PROTSEQ_LRPC && principal && pGetUserNameExA) + if (protseq == RPC_PROTSEQ_LRPC && principal) { int len; char *spn; @@ -1548,9 +1545,6 @@ set_auth_info(RPC_BINDING_HANDLE handle) RPC_STATUS status; RPC_SECURITY_QOS qos; - if (!pGetUserNameExA) - return; - qos.Version = 1; qos.Capabilities = RPC_C_QOS_CAPABILITIES_MUTUAL_AUTH; qos.IdentityTracking = RPC_C_QOS_IDENTITY_STATIC; @@ -1709,11 +1703,9 @@ server(void) if (ncalrpc_status == RPC_S_OK) { run_client("ncalrpc_basic"); - if (pGetUserNameExA) - { - /* we don't need to register RPC_C_AUTHN_WINNT for ncalrpc */ - run_client("ncalrpc_secure"); - } + + /* we don't need to register RPC_C_AUTHN_WINNT for ncalrpc */ + run_client("ncalrpc_secure"); } else skip("lrpc tests skipped due to earlier failure\n"); @@ -1742,20 +1734,15 @@ server(void) START_TEST(server) { + ULONG size = 0; int argc; char **argv; InitFunctionPointers(); - if (pGetUserNameExA) - { - ULONG size = 0; - ok(!pGetUserNameExA(NameSamCompatible, NULL, &size), "GetUserNameExA\n"); - domain_and_user = HeapAlloc(GetProcessHeap(), 0, size); - ok(pGetUserNameExA(NameSamCompatible, domain_and_user, &size), "GetUserNameExA\n"); - } - else - win_skip("GetUserNameExA is needed for some authentication tests\n"); + ok(!GetUserNameExA(NameSamCompatible, NULL, &size), "GetUserNameExA\n"); + domain_and_user = HeapAlloc(GetProcessHeap(), 0, size); + ok(GetUserNameExA(NameSamCompatible, domain_and_user, &size), "GetUserNameExA\n"); argc = winetest_get_mainargs(&argv); progname = argv[0];

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@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@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@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@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@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@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@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@giustetti.net">Simone Giustetti</a> </div> </div>

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

Ł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

Sebastian Lackner : shell32: Remove __SHFreeAndNil macro.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: d3cb5c24a5ebbc7dcfb181a56f0f55cf3d1a1c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cb5c24a5ebbc7dcfb181a56… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 29 14:07:22 2016 +0200 shell32: Remove __SHFreeAndNil macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 6 ------ dlls/shell32/shfldr_fs.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 4b8c7cb..8cd1318 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -156,12 +156,6 @@ static inline BOOL SHELL_OsIsUnicode(void) return !(GetVersion() & 0x80000000); } -#define __SHFreeAndNil(ptr) \ - {\ - SHFree(*ptr); \ - *ptr = NULL; \ - }; - static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) { int len = MultiByteToWideChar(CP_ACP, 0, source, -1, NULL, 0); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index d8bcb4c..2f49eb2 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1482,9 +1482,15 @@ IFSFldr_PersistFolder3_InitializeEx (IPersistFolder3 * iface, pdump (ppfti->pidlTargetFolder); if (This->pidlRoot) - __SHFreeAndNil (&This->pidlRoot); /* free the old */ + { + SHFree(This->pidlRoot); + This->pidlRoot = NULL; + } if (This->sPathTarget) - __SHFreeAndNil (&This->sPathTarget); + { + SHFree(This->sPathTarget); + This->sPathTarget = NULL; + } /* * Root path and pidl

1 0

Sebastian Lackner : shell32: Remove some unused static inline functions.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: af468590f7d312d759e14dc704395f27cf58e769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af468590f7d312d759e14dc70… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Aug 29 14:06:57 2016 +0200 shell32: Remove some unused static inline functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 0178e10..4b8c7cb 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -161,24 +161,6 @@ static inline BOOL SHELL_OsIsUnicode(void) SHFree(*ptr); \ *ptr = NULL; \ }; -static inline void __SHCloneStrA(char ** target,const char * source) -{ - *target = SHAlloc(strlen(source)+1); - strcpy(*target, source); -} - -static inline void __SHCloneStrWtoA(char ** target, const WCHAR * source) -{ - int len = WideCharToMultiByte(CP_ACP, 0, source, -1, NULL, 0, NULL, NULL); - *target = SHAlloc(len); - WideCharToMultiByte(CP_ACP, 0, source, -1, *target, len, NULL, NULL); -} - -static inline void __SHCloneStrW(WCHAR ** target, const WCHAR * source) -{ - *target = SHAlloc( (lstrlenW(source)+1) * sizeof(WCHAR) ); - lstrcpyW(*target, source); -} static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) {

1 0

Hugh McMaster : regedit: Process registry input from stdin.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: d8fd4bde382f7bba9d876dab6275e9706b7e3c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8fd4bde382f7bba9d876dab6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 29 12:06:08 2016 +0000 regedit: Process registry input from stdin. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index c0a1eab..7b2ddaef 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -93,6 +93,7 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) case ACTION_ADD: { WCHAR *filename = argv[*i]; WCHAR hyphen[] = {'-',0}; + WCHAR *realname = NULL; FILE *reg_file; if (!strcmpW(filename, hyphen)) @@ -100,7 +101,6 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) else { int size; - WCHAR *realname = NULL; WCHAR rb_mode[] = {'r','b',0}; size = SearchPathW(NULL, filename, NULL, 0, NULL, NULL); @@ -124,12 +124,12 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) HeapFree(GetProcessHeap(), 0, realname); return; } - import_registry_file(reg_file); - if (realname) - { - HeapFree(GetProcessHeap(),0,realname); - fclose(reg_file); - } + } + import_registry_file(reg_file); + if (realname) + { + HeapFree(GetProcessHeap(), 0, realname); + fclose(reg_file); } break; }

1 0

Bruno Jesus : msacm32: Use a helper to validate stream pointers.
by Alexandre Julliard 29 Aug '16

29 Aug '16

Module: wine Branch: master Commit: 37f159e1cb26c3f3a666f76f76c1f8809538bbe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f159e1cb26c3f3a666f76f7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 28 04:07:30 2016 -0300 msacm32: Use a helper to validate stream pointers. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/stream.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index 4b4976f..6e81151 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -50,6 +50,15 @@ static PWINE_ACMSTREAM ACM_GetStream(HACMSTREAM has) return (PWINE_ACMSTREAM)has; } +static BOOL ACM_ValidatePointers(PACMDRVSTREAMHEADER padsh) +{ + /* check that pointers have not been modified */ + return !(padsh->pbPreparedSrc != padsh->pbSrc || + padsh->cbPreparedSrcLength < padsh->cbSrcLength || + padsh->pbPreparedDst != padsh->pbDst || + padsh->cbPreparedDstLength < padsh->cbDstLength); +} + /*********************************************************************** * acmStreamClose (MSACM32.@) */ @@ -108,13 +117,9 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash, */ padsh = (PACMDRVSTREAMHEADER)pash; - /* check that pointers have not been modified */ - if (padsh->pbPreparedSrc != padsh->pbSrc || - padsh->cbPreparedSrcLength < padsh->cbSrcLength || - padsh->pbPreparedDst != padsh->pbDst || - padsh->cbPreparedDstLength < padsh->cbDstLength) { + if (!ACM_ValidatePointers(padsh)) { WARN("invalid parameter\n"); - return MMSYSERR_INVALPARAM; + return MMSYSERR_INVALPARAM; } padsh->fdwConvert = fdwConvert; @@ -467,13 +472,9 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, */ padsh = (PACMDRVSTREAMHEADER)pash; - /* check that pointers have not been modified */ - if (padsh->pbPreparedSrc != padsh->pbSrc || - padsh->cbPreparedSrcLength < padsh->cbSrcLength || - padsh->pbPreparedDst != padsh->pbDst || - padsh->cbPreparedDstLength < padsh->cbDstLength) { + if (!ACM_ValidatePointers(padsh)) { WARN("invalid parameter\n"); - return MMSYSERR_INVALPARAM; + return MMSYSERR_INVALPARAM; } padsh->fdwConvert = fdwUnprepare;

1 0

← Newer
1
2
3
4
5
6
7
8
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016