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

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

Aug. 30, 2016

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 : rpcrt4/tests: Don't load GetUserNameEx dynamically.
by Alexandre Julliard Aug. 30, 2016

Aug. 30, 2016

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

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

Aug. 30, 2016

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

Simone Giustetti : The Slackware release number was upgraded to 14.2
by Jeremy Newman Aug. 30, 2016

Aug. 30, 2016

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

Łukasz Wojniłowicz : Polish translation for release 1.8.4
by Jeremy Newman Aug. 30, 2016

Aug. 30, 2016

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 Aug. 30, 2016

Aug. 30, 2016

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

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

Aug. 29, 2016

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

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

Aug. 29, 2016

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

Alexandre Julliard : server: Implement Add/RemoveClipboardFormatListener.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

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

Alexandre Julliard : server: Add some validation of clipboard window handles.
by Alexandre Julliard Aug. 29, 2016

Aug. 29, 2016

Module: wine Branch: master Commit: 19d16a7cb1af82f0515afb10033d56d8ec7856d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d16a7cb1af82f0515afb100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 20:33:22 2016 +0900 server: Add some validation of clipboard window handles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 2 +- dlls/user32/tests/clipboard.c | 49 ++++++++++++++++++++++++++++++++++++++++++- server/clipboard.c | 27 +++++++++++++++++++----- server/trace.c | 1 + 4 files changed, 72 insertions(+), 7 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 6d62dfd..fb10d27 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -147,7 +147,7 @@ BOOL WINAPI OpenClipboard( HWND hwnd ) SERVER_START_REQ( open_clipboard ) { req->window = wine_server_user_handle( hwnd ); - if ((ret = !wine_server_call( req ))) + if ((ret = !wine_server_call_err( req ))) { if (!reply->owner) bCBHasChanged = FALSE; } diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index f01af3d..b9b926d 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -26,6 +26,7 @@ #include "winuser.h" static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); +static BOOL (WINAPI *pRemoveClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); static const BOOL is_win64 = sizeof(void *) > sizeof(int); @@ -565,7 +566,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA static DWORD WINAPI clipboard_thread(void *param) { - HWND win = param; + HWND ret, win = param; BOOL r; HANDLE handle; UINT count, formats, old_seq = 0, seq; @@ -577,10 +578,36 @@ static DWORD WINAPI clipboard_thread(void *param) next_wnd = SetClipboardViewer(win); ok(GetLastError() == 0xdeadbeef, "GetLastError = %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); + + SetLastError( 0xdeadbeef ); + ret = SetClipboardViewer( (HWND)0xdead ); + ok( !ret, "SetClipboardViewer succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + r = ChangeClipboardChain( win, (HWND)0xdead ); + ok( !r, "ChangeClipboardChain succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + r = ChangeClipboardChain( (HWND)0xdead, next_wnd ); + ok( !r, "ChangeClipboardChain succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + if (pAddClipboardFormatListener) { r = pAddClipboardFormatListener(win); ok( r, "AddClipboardFormatListener failed err %d\n", GetLastError()); + SetLastError( 0xdeadbeef ); + r = pAddClipboardFormatListener( win ); + todo_wine ok( !r, "AddClipboardFormatListener succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + r = pAddClipboardFormatListener( (HWND)0xdead ); + todo_wine ok( !r, "AddClipboardFormatListener succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + r = pAddClipboardFormatListener( GetDesktopWindow() ); + ok( r, "AddClipboardFormatListener failed err %d\n", GetLastError()); + r = pRemoveClipboardFormatListener( GetDesktopWindow() ); + ok( r, "RemoveClipboardFormatListener failed err %d\n", GetLastError()); } if (pGetClipboardSequenceNumber) @@ -593,6 +620,11 @@ static DWORD WINAPI clipboard_thread(void *param) count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + SetLastError( 0xdeadbeef ); + r = OpenClipboard( (HWND)0xdead ); + ok( !r, "OpenClipboard succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); @@ -887,6 +919,20 @@ static DWORD WINAPI clipboard_thread(void *param) r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); + + if (pRemoveClipboardFormatListener) + { + r = pRemoveClipboardFormatListener(win); + ok( r, "RemoveClipboardFormatListener failed err %d\n", GetLastError()); + SetLastError( 0xdeadbeef ); + r = pRemoveClipboardFormatListener(win); + todo_wine ok( !r, "RemoveClipboardFormatListener succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + r = pRemoveClipboardFormatListener( (HWND)0xdead ); + todo_wine ok( !r, "RemoveClipboardFormatListener succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + } return 0; } @@ -1238,6 +1284,7 @@ START_TEST(clipboard) argv0 = argv[0]; pAddClipboardFormatListener = (void *)GetProcAddress( mod, "AddClipboardFormatListener" ); + pRemoveClipboardFormatListener = (void *)GetProcAddress( mod, "RemoveClipboardFormatListener" ); pGetClipboardSequenceNumber = (void *)GetProcAddress( mod, "GetClipboardSequenceNumber" ); if (argc == 4 && !strcmp( argv[2], "set_clipboard_data" )) diff --git a/server/clipboard.c b/server/clipboard.c index 98df230..a1535b6 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -185,14 +185,18 @@ static int get_seqno( struct clipboard *clipboard ) DECL_HANDLER(open_clipboard) { struct clipboard *clipboard = get_process_clipboard(); - user_handle_t win; + user_handle_t win = req->window; if (!clipboard) return; - win = get_user_full_handle( req->window ); + if (win && !get_user_object_handle( &win, USER_WINDOW )) + { + set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); + return; + } if (clipboard->open_thread && clipboard->open_win != win) { - set_error( STATUS_WAS_LOCKED ); + set_error( STATUS_INVALID_LOCK_SEQUENCE ); return; } clipboard->open_win = win; @@ -286,14 +290,27 @@ DECL_HANDLER(get_clipboard_info) DECL_HANDLER(set_clipboard_viewer) { struct clipboard *clipboard = get_process_clipboard(); + user_handle_t viewer = req->viewer; + user_handle_t previous = req->previous; if (!clipboard) return; + if (viewer && !get_user_object_handle( &viewer, USER_WINDOW )) + { + set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); + return; + } + if (previous && !get_user_object_handle( &previous, USER_WINDOW )) + { + set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); + return; + } + reply->old_viewer = clipboard->viewer; reply->owner = clipboard->owner_win; - if (!req->previous || clipboard->viewer == get_user_full_handle( req->previous )) - clipboard->viewer = get_user_full_handle( req->viewer ); + if (!previous || clipboard->viewer == previous) + clipboard->viewer = viewer; else set_error( STATUS_PENDING ); /* need to send message instead */ } diff --git a/server/trace.c b/server/trace.c index 6c9518e..0e8a9e8 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5307,6 +5307,7 @@ static const struct { "INVALID_IMAGE_NOT_MZ", STATUS_INVALID_IMAGE_NOT_MZ }, { "INVALID_IMAGE_PROTECT", STATUS_INVALID_IMAGE_PROTECT }, { "INVALID_IMAGE_WIN_64", STATUS_INVALID_IMAGE_WIN_64 }, + { "INVALID_LOCK_SEQUENCE", STATUS_INVALID_LOCK_SEQUENCE }, { "INVALID_PARAMETER", STATUS_INVALID_PARAMETER }, { "INVALID_SECURITY_DESCR", STATUS_INVALID_SECURITY_DESCR }, { "IO_TIMEOUT", STATUS_IO_TIMEOUT },

1 0