- wine-devel - winehq.org

[PATCH 1/9] secur32: Implement InitializeSecurityContext in the SSP/AP wrapper. (v4)
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Partially based on Hans Leidekker's work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 1916aa4b3a..8da3a61cfd 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -396,6 +396,76 @@ static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); } +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( + CredHandle *credential, CtxtHandle *context, SEC_WCHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + UNICODE_STRING target_name_us; + BOOLEAN mapped_context; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_w(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (context) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + else if (credential) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->InitLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + if (target_name) + RtlInitUnicodeString(&target_name_us, target_name); + + status = lsa_package->lsa_api->InitLsaModeContext(lsa_credential, lsa_context, + target_name ? &target_name_us : NULL, context_req, target_data_rep, input, + &new_lsa_context, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( + CredHandle *credential, CtxtHandle *context, SEC_CHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + SEC_WCHAR *targetW = NULL; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_a(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (target_name) + { + int len = MultiByteToWideChar( CP_ACP, 0, target_name, -1, NULL, 0 ); + if (!(targetW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) return SEC_E_INSUFFICIENT_MEMORY; + MultiByteToWideChar( CP_ACP, 0, target_name, -1, targetW, len ); + } + + status = lsa_InitializeSecurityContextW( credential, context, targetW, context_req, reserved1, target_data_rep, + input, reserved2, new_context, output, context_attr, ts_expiry ); + HeapFree( GetProcessHeap(), 0, targetW ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -404,7 +474,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_AcquireCredentialsHandleW, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextW */ + lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ @@ -436,7 +506,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_AcquireCredentialsHandleA, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextA */ + lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ -- 2.15.1

2 1

[PATCH 1/9] secur32: Implement InitializeSecurityContext in the SSP/AP wrapper. (v3)
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Partially based on Hans Leidekker's work. v2: switch order of context vs. credentials initialization initialize context also in case of SEC_I_CONTINUE_NEEDED v3: actually switch order of context vs. credentials initialization Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 1916aa4b3a..ce4fb62a9d 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -396,6 +396,76 @@ static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); } +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( + CredHandle *credential, CtxtHandle *context, SEC_WCHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + UNICODE_STRING target_name_us; + BOOLEAN mapped_context; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_w(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (context) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + else if (credential) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->InitLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + if (target_name) + RtlInitUnicodeString(&target_name_us, target_name); + + status = lsa_package->lsa_api->InitLsaModeContext(lsa_credential, lsa_context, + target_name ? &target_name_us : NULL, context_req, target_data_rep, input, + &new_lsa_context, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( + CredHandle *credential, CtxtHandle *context, SEC_CHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + SEC_WCHAR *targetW = NULL; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_a(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (target_name) + { + int len = MultiByteToWideChar( CP_ACP, 0, target_name, -1, NULL, 0 ); + if (!(targetW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) return SEC_E_INSUFFICIENT_MEMORY; + MultiByteToWideChar( CP_ACP, 0, target_name, -1, targetW, len ); + } + + status = lsa_InitializeSecurityContextW( credential, context, targetW, context_req, reserved1, target_data_rep, + input, reserved2, new_context, output, context_attr, ts_expiry ); + HeapFree( GetProcessHeap(), 0, targetW ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -404,7 +474,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_AcquireCredentialsHandleW, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextW */ + lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ @@ -436,7 +506,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_AcquireCredentialsHandleA, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextA */ + lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ -- 2.15.1

2 2

[PATCH] winedbg: Use longer module names when printing module list
by Nikolay Sivov 01 Feb '18

01 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/winedbg/info.c | 69 ++++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 89a2dc43fa..c1de158228 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -147,50 +147,61 @@ static const char* get_symtype_str(const IMAGEHLP_MODULE64* mi) struct info_module { - IMAGEHLP_MODULE64* mi; + IMAGEHLP_MODULE64 mi; + char name[64]; +}; + +struct info_modules +{ + struct info_module *modules; unsigned num_alloc; unsigned num_used; }; -static void module_print_info(const IMAGEHLP_MODULE64* mi, BOOL is_embedded) +static void module_print_info(const struct info_module *module, BOOL is_embedded) { dbg_printf("%*.*s-%*.*s\t%-16s%s\n", - ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(mi->BaseOfImage), - ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(mi->BaseOfImage + mi->ImageSize), - is_embedded ? "\\" : get_symtype_str(mi), mi->ModuleName); + ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(module->mi.BaseOfImage), + ADDRWIDTH, ADDRWIDTH, wine_dbgstr_longlong(module->mi.BaseOfImage + module->mi.ImageSize), + is_embedded ? "\\" : get_symtype_str(&module->mi), module->name); } static int module_compare(const void* p1, const void* p2) { - LONGLONG val = ((const IMAGEHLP_MODULE64*)p1)->BaseOfImage - - ((const IMAGEHLP_MODULE64*)p2)->BaseOfImage; + struct info_module *left = (struct info_module *)p1; + struct info_module *right = (struct info_module *)p2; + LONGLONG val = left->mi.BaseOfImage - right->mi.BaseOfImage; + if (val < 0) return -1; else if (val > 0) return 1; else return 0; } -static inline BOOL module_is_container(const IMAGEHLP_MODULE64* wmod_cntnr, - const IMAGEHLP_MODULE64* wmod_child) +static inline BOOL module_is_container(const struct info_module *wmod_cntnr, + const struct info_module *wmod_child) { - return wmod_cntnr->BaseOfImage <= wmod_child->BaseOfImage && - wmod_cntnr->BaseOfImage + wmod_cntnr->ImageSize >= - wmod_child->BaseOfImage + wmod_child->ImageSize; + return wmod_cntnr->mi.BaseOfImage <= wmod_child->mi.BaseOfImage && + wmod_cntnr->mi.BaseOfImage + wmod_cntnr->mi.ImageSize >= + wmod_child->mi.BaseOfImage + wmod_child->mi.ImageSize; } static BOOL CALLBACK info_mod_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) { - struct info_module* im = ctx; + struct info_modules *im = ctx; if (im->num_used + 1 > im->num_alloc) { im->num_alloc += 16; - im->mi = dbg_heap_realloc(im->mi, im->num_alloc * sizeof(*im->mi)); + im->modules = dbg_heap_realloc(im->modules, im->num_alloc * sizeof(*im->modules)); } - im->mi[im->num_used].SizeOfStruct = sizeof(im->mi[im->num_used]); - if (SymGetModuleInfo64(dbg_curr_process->handle, base, &im->mi[im->num_used])) + im->modules[im->num_used].mi.SizeOfStruct = sizeof(im->modules[im->num_used].mi); + if (SymGetModuleInfo64(dbg_curr_process->handle, base, &im->modules[im->num_used].mi)) { + const int dst_len = sizeof(im->modules[im->num_used].name); + lstrcpynA(im->modules[im->num_used].name, mod_name, dst_len - 1); + im->modules[im->num_used].name[dst_len - 1] = 0; im->num_used++; - } + } return TRUE; } @@ -201,7 +212,7 @@ static BOOL CALLBACK info_mod_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) */ void info_win32_module(DWORD64 base) { - struct info_module im; + struct info_modules im; UINT i, j, num_printed = 0; DWORD opt; @@ -211,7 +222,7 @@ void info_win32_module(DWORD64 base) return; } - im.mi = NULL; + im.modules = NULL; im.num_alloc = im.num_used = 0; /* this is a wine specific options to return also ELF modules in the @@ -221,7 +232,7 @@ void info_win32_module(DWORD64 base) SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); - qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); + qsort(im.modules, im.num_used, sizeof(im.modules[0]), module_compare); dbg_printf("Module\tAddress\t\t\t%sDebug info\tName (%d modules)\n", ADDRWIDTH == 16 ? "\t\t" : "", im.num_used); @@ -229,19 +240,19 @@ void info_win32_module(DWORD64 base) for (i = 0; i < im.num_used; i++) { if (base && - (base < im.mi[i].BaseOfImage || base >= im.mi[i].BaseOfImage + im.mi[i].ImageSize)) + (base < im.modules[i].mi.BaseOfImage || base >= im.modules[i].mi.BaseOfImage + im.modules[i].mi.ImageSize)) continue; - if (strstr(im.mi[i].ModuleName, "<elf>")) + if (strstr(im.modules[i].name, "<elf>")) { dbg_printf("ELF\t"); - module_print_info(&im.mi[i], FALSE); + module_print_info(&im.modules[i], FALSE); /* print all modules embedded in this one */ for (j = 0; j < im.num_used; j++) { - if (!strstr(im.mi[j].ModuleName, "<elf>") && module_is_container(&im.mi[i], &im.mi[j])) + if (!strstr(im.modules[j].name, "<elf>") && module_is_container(&im.modules[i], &im.modules[j])) { dbg_printf(" \\-PE\t"); - module_print_info(&im.mi[j], TRUE); + module_print_info(&im.modules[j], TRUE); } } } @@ -250,19 +261,19 @@ void info_win32_module(DWORD64 base) /* check module is not embedded in another module */ for (j = 0; j < im.num_used; j++) { - if (strstr(im.mi[j].ModuleName, "<elf>") && module_is_container(&im.mi[j], &im.mi[i])) + if (strstr(im.modules[j].name, "<elf>") && module_is_container(&im.modules[j], &im.modules[i])) break; } if (j < im.num_used) continue; - if (strstr(im.mi[i].ModuleName, ".so") || strchr(im.mi[i].ModuleName, '<')) + if (strstr(im.modules[i].name, ".so") || strchr(im.modules[i].name, '<')) dbg_printf("ELF\t"); else dbg_printf("PE\t"); - module_print_info(&im.mi[i], FALSE); + module_print_info(&im.modules[i], FALSE); } num_printed++; } - HeapFree(GetProcessHeap(), 0, im.mi); + HeapFree(GetProcessHeap(), 0, im.modules); if (base && !num_printed) dbg_printf("'0x%x%08x' is not a valid module address\n", (DWORD)(base >> 32), (DWORD)base); -- 2.15.1

1 0

[PATCH 1/4] comctl32/treeview: Fix tooltip window leak
by Nikolay Sivov 01 Feb '18

01 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/treeview.c | 114 +++++++++++++++++++++++++++++++++++++---- dlls/comctl32/treeview.c | 1 + 2 files changed, 106 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 64fb1ebcd5..45bcb740a0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1069,9 +1069,101 @@ static void test_get_set_textcolor(void) static void test_get_set_tooltips(void) { - HWND hwndLastToolTip = NULL; - HWND hPopupTreeView; - HWND hTree; + HWND hTree, tooltips, hwnd; + DWORD style; + int i; + + /* TVS_NOTOOLTIPS */ + hTree = create_treeview_control(TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected tooltip window %p.\n", tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected ret value %p.\n", tooltips); + + /* Toggle style */ + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style & ~TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(IsWindow(tooltips), "Unexpected tooltip window %p.\n", tooltips); + + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style | TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected tooltip window %p.\n", tooltips); + + DestroyWindow(hTree); + + /* Set some valid window, does not have to be tooltips class. */ + hTree = create_treeview_control(TVS_NOTOOLTIPS); + + hwnd = CreateWindowA(WC_STATICA, "Test", WS_VISIBLE|WS_CHILD, 5, 5, 100, 100, hMainWnd, NULL, NULL, 0); + ok(hwnd != NULL, "Failed to create child window.\n"); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, (WPARAM)hwnd, 0); + ok(tooltips == NULL, "Unexpected ret value %p.\n", tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == hwnd, "Unexpected tooltip window %p.\n", tooltips); + + /* Externally set tooltips window, disable style. */ + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style & ~TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(IsWindow(tooltips) && tooltips != hwnd, "Unexpected tooltip window %p.\n", tooltips); + ok(IsWindow(hwnd), "Expected valid window.\n"); + + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style | TVS_NOTOOLTIPS); + ok(!IsWindow(tooltips), "Unexpected tooltip window %p.\n", tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected tooltip window %p.\n", tooltips); + ok(IsWindow(hwnd), "Expected valid window.\n"); + + DestroyWindow(hTree); + ok(IsWindow(hwnd), "Expected valid window.\n"); + + /* Set window, disable tooltips. */ + hTree = create_treeview_control(0); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, (WPARAM)hwnd, 0); + ok(IsWindow(tooltips), "Unexpected ret value %p.\n", tooltips); + + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style | TVS_NOTOOLTIPS); + ok(!IsWindow(hwnd), "Unexpected tooltip window %p.\n", tooltips); + ok(IsWindow(tooltips), "Expected valid window %p.\n", tooltips); + + DestroyWindow(hTree); + ok(IsWindow(tooltips), "Expected valid window %p.\n", tooltips); + DestroyWindow(tooltips); + DestroyWindow(hwnd); + + for (i = 0; i < 2; i++) + { + DWORD style = i == 0 ? 0 : TVS_NOTOOLTIPS; + + hwnd = CreateWindowA(WC_STATICA, "Test", WS_VISIBLE|WS_CHILD, 5, 5, 100, 100, hMainWnd, NULL, NULL, 0); + ok(hwnd != NULL, "Failed to create child window.\n"); + + hTree = create_treeview_control(style); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, (WPARAM)hwnd, 0); + ok(style & TVS_NOTOOLTIPS ? tooltips == NULL : IsWindow(tooltips), "Unexpected ret value %p.\n", tooltips); + DestroyWindow(tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == hwnd, "Unexpected tooltip window %p.\n", tooltips); + + /* TreeView is destroyed, check if set window is still around. */ + DestroyWindow(hTree); + ok(!IsWindow(hwnd), "Unexpected window.\n"); + } hTree = create_treeview_control(0); fill_tree(hTree); @@ -1079,20 +1171,23 @@ static void test_get_set_tooltips(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); /* show even WS_POPUP treeview don't send NM_TOOLTIPSCREATED */ - hPopupTreeView = CreateWindowA(WC_TREEVIEWA, NULL, WS_POPUP|WS_VISIBLE, 0, 0, 100, 100, + hwnd = CreateWindowA(WC_TREEVIEWA, NULL, WS_POPUP|WS_VISIBLE, 0, 0, 100, 100, hMainWnd, NULL, NULL, NULL); - DestroyWindow(hPopupTreeView); + DestroyWindow(hwnd); /* Testing setting a NULL ToolTip */ - SendMessageA(hTree, TVM_SETTOOLTIPS, 0, 0); - hwndLastToolTip = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); - ok(hwndLastToolTip == NULL, "NULL tool tip, reported as 0x%p, expected 0.\n", hwndLastToolTip); + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, 0, 0); + ok(IsWindow(tooltips), "Unexpected ret value %p.\n", tooltips); + + hwnd = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(hwnd == NULL, "Unexpected tooltip window %p.\n", hwnd); ok_sequence(sequences, TREEVIEW_SEQ_INDEX, test_get_set_tooltips_seq, "test get set tooltips", TRUE); - /* TODO: Add a test of an actual tooltip */ DestroyWindow(hTree); + ok(IsWindow(tooltips), "Expected valid window.\n"); + DestroyWindow(tooltips); } static void test_get_set_unicodeformat(void) @@ -2754,6 +2849,7 @@ START_TEST(treeview) test_expandedimage(); test_htreeitem_layout(); test_WM_GETDLGCODE(); + test_get_set_tooltips(); unload_v6_module(ctx_cookie, hCtx); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 9a37cf331b..2295022320 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5204,6 +5204,7 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) DeleteObject(infoPtr->hBoldFont); DeleteObject(infoPtr->hUnderlineFont); DeleteObject(infoPtr->hBoldUnderlineFont); + DestroyWindow(infoPtr->hwndToolTip); Free(infoPtr); return 0; -- 2.15.1

1 3

[PATCH] user32/edit: Fix replacement text trace
by Nikolay Sivov 01 Feb '18

01 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 5e161c5dbf..614a979a39 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2571,7 +2571,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r UINT bufl; TRACE("%s, can_undo %d, send_update %d\n", - debugstr_w(lpsz_replace), can_undo, send_update); + debugstr_wn(lpsz_replace, strl), can_undo, send_update); s = es->selection_start; e = es->selection_end; -- 2.15.1

1 0

[PATCH] secur32: Implement LsaFreeReturnBuffer.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index a2b2a9ae3e..9c18c46fc4 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -113,9 +113,10 @@ NTSTATUS WINAPI LsaEnumerateLogonSessions(PULONG LogonSessionCount, return STATUS_SUCCESS; } -NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID Buffer) +NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID buffer) { - FIXME("%p stub\n", Buffer); + TRACE("%p\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); return STATUS_SUCCESS; } -- 2.15.1

1 0

[PATCH] dbghelp: Avoid an infinite loop.
by Zebediah Figura 01 Feb '18

01 Feb '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dbghelp/cpu_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 99b5c17..67b710c 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -712,6 +712,7 @@ static void* x86_64_find_runtime_function(struct module* module, DWORD64 addr while (rtf->UnwindData & 1) /* follow chained entry */ { FIXME("RunTime_Function outside IMAGE_DIRECTORY_ENTRY_EXCEPTION unimplemented yet!\n"); + return NULL; /* we need to read into the other process */ /* rtf = (RUNTIME_FUNCTION*)(module->module.BaseOfImage + (rtf->UnwindData & ~1)); */ } -- 2.7.4

1 0

[PATCH 9/9] secur32: Remove Kerberos SSPI stubs.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/Makefile.in | 1 - dlls/secur32/kerberos.c | 323 -------------------------------------------- dlls/secur32/secur32.c | 3 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 3 insertions(+), 326 deletions(-) delete mode 100644 dlls/secur32/kerberos.c diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 6548521f53..c9acdee457 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ base64_codec.c \ dispatcher.c \ hmac_md5.c \ - kerberos.c \ lsa.c \ negotiate.c \ ntlm.c \ diff --git a/dlls/secur32/kerberos.c b/dlls/secur32/kerberos.c deleted file mode 100644 index 753e9748d2..0000000000 --- a/dlls/secur32/kerberos.c +++ /dev/null @@ -1,323 +0,0 @@ -/* - * Copyright 2005, 2006 Kai Blin - * 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 - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "rpc.h" -#include "sspi.h" - -#include "secur32_priv.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(secur32); - -#define KERBEROS_MAX_BUF 12000 - -/*********************************************************************** - * QueryCredentialsAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesA(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryCredentialsAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesW(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcquireCredentialsHandleW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleW(SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_NO_CREDENTIALS; -} - -/*********************************************************************** - * AcquireCredentialsHandleA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA(SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextW(CredHandle *phCredential, CtxtHandle *phContext, SEC_WCHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%p %p %s 0x%08x %d %d %p %d %p %p %p %p)\n", phCredential, phContext, debugstr_w(pszTargetName), - fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextA(CredHandle *phCredential, CtxtHandle *phContext, SEC_CHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, - Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcceptSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcceptSecurityContext(CredHandle *phCredential, CtxtHandle *phContext, SecBufferDesc *pInput, - ULONG fContextReq, ULONG TargetDataRep, CtxtHandle *phNewContext, SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%p %p %p %d %d %p %p %p %p)\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, - pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * CompleteAuthToken - */ -static SECURITY_STATUS SEC_ENTRY kerberos_CompleteAuthToken(CtxtHandle *phContext, SecBufferDesc *pToken) -{ - FIXME("(%p %p)\n", phContext, pToken); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DeleteSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DeleteSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesW(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesA(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * ImpersonateSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_ImpersonateSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * RevertSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_RevertSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * MakeSignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_MakeSignature(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * VerifySignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_VerifySignature(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * FreeCredentialsHandle - */ -static SECURITY_STATUS SEC_ENTRY kerberos_FreeCredentialsHandle(PCredHandle phCredential) -{ - FIXME("(%p)\n", phCredential); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * EncryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_EncryptMessage(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DecryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DecryptMessage(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -static const SecurityFunctionTableA kerberosTableA = { - 1, - NULL, /* EnumerateSecurityPackagesA */ - kerberos_QueryCredentialsAttributesA, /* QueryCredentialsAttributesA */ - kerberos_AcquireCredentialsHandleA, /* AcquireCredentialsHandleA */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextA, /* InitializeSecurityContextA */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesA, /* QueryContextAttributesA */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoA */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextA */ - NULL, /* AddCredentialsA */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesA */ -}; - -static const SecurityFunctionTableW kerberosTableW = { - 1, - NULL, /* EnumerateSecurityPackagesW */ - kerberos_QueryCredentialsAttributesW, /* QueryCredentialsAttributesW */ - kerberos_AcquireCredentialsHandleW, /* AcquireCredentialsHandleW */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextW, /* InitializeSecurityContextW */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesW, /* QueryContextAttributesW */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoW */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextW */ - NULL, /* AddCredentialsW */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesW */ -}; - -#define KERBEROS_COMMENT \ - {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0} -static CHAR kerberos_comment_A[] = KERBEROS_COMMENT; -static WCHAR kerberos_comment_W[] = KERBEROS_COMMENT; - -#define KERBEROS_NAME {'K','e','r','b','e','r','o','s',0} -static char kerberos_name_A[] = KERBEROS_NAME; -static WCHAR kerberos_name_W[] = KERBEROS_NAME; - -#define CAPS \ - ( SECPKG_FLAG_INTEGRITY \ - | SECPKG_FLAG_PRIVACY \ - | SECPKG_FLAG_TOKEN_ONLY \ - | SECPKG_FLAG_DATAGRAM \ - | SECPKG_FLAG_CONNECTION \ - | SECPKG_FLAG_MULTI_REQUIRED \ - | SECPKG_FLAG_EXTENDED_ERROR \ - | SECPKG_FLAG_IMPERSONATION \ - | SECPKG_FLAG_ACCEPT_WIN32_NAME \ - | SECPKG_FLAG_NEGOTIABLE \ - | SECPKG_FLAG_GSS_COMPATIBLE \ - | SECPKG_FLAG_LOGON \ - | SECPKG_FLAG_MUTUAL_AUTH \ - | SECPKG_FLAG_DELEGATION \ - | SECPKG_FLAG_READONLY_WITH_CHECKSUM \ - | SECPKG_FLAG_RESTRICTED_TOKENS \ - | SECPKG_FLAG_APPCONTAINER_CHECKS) - -static const SecPkgInfoW infoW = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_W, - kerberos_comment_W -}; - -static const SecPkgInfoA infoA = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_A, - kerberos_comment_A -}; - -void SECUR32_initKerberosSP(void) -{ - SecureProvider *provider = SECUR32_addProvider(&kerberosTableA, &kerberosTableW, NULL); - SECUR32_addPackages(provider, 1, &infoA, &infoW); -} diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 1e12f3c543..f7b1ec2d98 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -564,7 +564,8 @@ static void SECUR32_initializeProviders(void) /* First load built-in providers */ SECUR32_initSchannelSP(); SECUR32_initNTLMSP(); - SECUR32_initKerberosSP(); + /* Load SSP/AP packages (Kerberos and others) */ + load_auth_packages(); /* Load the Negotiate provider last so apps stumble over the working NTLM * provider first. Attempting to fix bug #16905 while keeping the * application reported on wine-users on 2006-09-12 working. */ diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 9a60d65788..973b75c699 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -136,7 +136,7 @@ PSTR SECUR32_AllocMultiByteFromWide(PCWSTR str) DECLSPEC_HIDDEN; void SECUR32_initSchannelSP(void) DECLSPEC_HIDDEN; void SECUR32_initNegotiateSP(void) DECLSPEC_HIDDEN; void SECUR32_initNTLMSP(void) DECLSPEC_HIDDEN; -void SECUR32_initKerberosSP(void) DECLSPEC_HIDDEN; +void load_auth_packages(void) DECLSPEC_HIDDEN; /* Cleanup functions for built-in providers */ void SECUR32_deinitSchannelSP(void) DECLSPEC_HIDDEN; -- 2.15.1

1 0

[PATCH 8/9] secur32: Implement DecryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 1770c9bef8..a2b2a9ae3e 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -643,6 +643,27 @@ static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG qual return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_DecryptMessage(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->UnsealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->UnsealMessage(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -671,7 +692,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesW */ }; @@ -703,7 +724,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesA */ }; -- 2.15.1

1 0

[PATCH 7/9] secur32: Implement EncryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index a9801a5d9f..1770c9bef8 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -622,6 +622,27 @@ static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBuffer return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); } +static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->SealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -649,7 +670,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* AddCredentialsW */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesW */ }; @@ -681,7 +702,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* AddCredentialsA */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesA */ }; -- 2.15.1

1 0

[PATCH 6/9] secur32: Implement VerifySignature in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index b52e9208af..a9801a5d9f 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -601,6 +601,27 @@ static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quali return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->VerifySignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -618,7 +639,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ NULL, /* Reserved3 */ @@ -650,7 +671,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ NULL, /* Reserved3 */ -- 2.15.1

1 0

[PATCH 5/9] secur32: Implement MakeSignature in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 7ac1d62e73..b52e9208af 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -580,6 +580,27 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U return SEC_E_UNSUPPORTED_FUNCTION; } +static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->MakeSignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -596,7 +617,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ @@ -628,7 +649,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ -- 2.15.1

1 0

[PATCH 4/9] secur32: Implement QueryContextAttributes in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 46a98d1e4b..7ac1d62e73 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -526,6 +526,60 @@ static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) return lsa_package->lsa_api->DeleteContext(lsa_context); } +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, ULONG attribute, void *buffer) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->SpQueryContextAttributes) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); +} + +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) +{ + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { + case SECPKG_ATTR_SIZES: + return lsa_QueryContextAttributesW( context, attribute, buffer ); + +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + X(SECPKG_ATTR_NEGOTIATION_INFO); +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -539,7 +593,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesW */ + lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ @@ -571,7 +625,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesA */ + lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ -- 2.15.1

1 0

[PATCH 3/9] secur32: Implement AcceptSecurityContext in the SSP/AP wrapper. (v3)
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

v2: switch order of context vs. credentials initialization initialize context also in case of SEC_I_CONTINUE_NEEDED v3: actually switch order of context vs. credentials initialization Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index e683c36f65..46a98d1e4b 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,46 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_AcceptSecurityContext( + CredHandle *credential, CtxtHandle *context, SecBufferDesc *input, + ULONG context_req, ULONG target_data_rep, CtxtHandle *new_context, + SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + BOOLEAN mapped_context; + + TRACE("%p %p %p %#x %#x %p %p %p %p\n", credential, context, input, + context_req, target_data_rep, new_context, output, context_attr, ts_expiry); + + if (context) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + else if (credential) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->AcceptLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + status = lsa_package->lsa_api->AcceptLsaModeContext(lsa_credential, lsa_context, + input, context_req, target_data_rep, &new_lsa_context, output, context_attr, + ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) { struct lsa_package *lsa_package; @@ -495,7 +535,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextW, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ @@ -527,7 +567,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextA, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ -- 2.15.1

1 0

[PATCH 2/9] secur32: Implement DeleteSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index ce4fb62a9d..e683c36f65 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,26 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p\n", context); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->DeleteContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->DeleteContext(lsa_context); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -477,7 +497,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesW */ NULL, /* ImpersonateSecurityContext */ @@ -509,7 +529,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesA */ NULL, /* ImpersonateSecurityContext */ -- 2.15.1

1 0

[PATCH 9/9] secur32: Remove Kerberos SSPI stubs.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/Makefile.in | 1 - dlls/secur32/kerberos.c | 323 -------------------------------------------- dlls/secur32/secur32.c | 3 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 3 insertions(+), 326 deletions(-) delete mode 100644 dlls/secur32/kerberos.c diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 6548521f53..c9acdee457 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ base64_codec.c \ dispatcher.c \ hmac_md5.c \ - kerberos.c \ lsa.c \ negotiate.c \ ntlm.c \ diff --git a/dlls/secur32/kerberos.c b/dlls/secur32/kerberos.c deleted file mode 100644 index 753e9748d2..0000000000 --- a/dlls/secur32/kerberos.c +++ /dev/null @@ -1,323 +0,0 @@ -/* - * Copyright 2005, 2006 Kai Blin - * 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 - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "rpc.h" -#include "sspi.h" - -#include "secur32_priv.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(secur32); - -#define KERBEROS_MAX_BUF 12000 - -/*********************************************************************** - * QueryCredentialsAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesA(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryCredentialsAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesW(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcquireCredentialsHandleW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleW(SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_NO_CREDENTIALS; -} - -/*********************************************************************** - * AcquireCredentialsHandleA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA(SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextW(CredHandle *phCredential, CtxtHandle *phContext, SEC_WCHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%p %p %s 0x%08x %d %d %p %d %p %p %p %p)\n", phCredential, phContext, debugstr_w(pszTargetName), - fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextA(CredHandle *phCredential, CtxtHandle *phContext, SEC_CHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, - Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcceptSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcceptSecurityContext(CredHandle *phCredential, CtxtHandle *phContext, SecBufferDesc *pInput, - ULONG fContextReq, ULONG TargetDataRep, CtxtHandle *phNewContext, SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%p %p %p %d %d %p %p %p %p)\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, - pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * CompleteAuthToken - */ -static SECURITY_STATUS SEC_ENTRY kerberos_CompleteAuthToken(CtxtHandle *phContext, SecBufferDesc *pToken) -{ - FIXME("(%p %p)\n", phContext, pToken); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DeleteSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DeleteSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesW(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesA(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * ImpersonateSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_ImpersonateSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * RevertSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_RevertSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * MakeSignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_MakeSignature(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * VerifySignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_VerifySignature(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * FreeCredentialsHandle - */ -static SECURITY_STATUS SEC_ENTRY kerberos_FreeCredentialsHandle(PCredHandle phCredential) -{ - FIXME("(%p)\n", phCredential); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * EncryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_EncryptMessage(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DecryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DecryptMessage(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -static const SecurityFunctionTableA kerberosTableA = { - 1, - NULL, /* EnumerateSecurityPackagesA */ - kerberos_QueryCredentialsAttributesA, /* QueryCredentialsAttributesA */ - kerberos_AcquireCredentialsHandleA, /* AcquireCredentialsHandleA */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextA, /* InitializeSecurityContextA */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesA, /* QueryContextAttributesA */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoA */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextA */ - NULL, /* AddCredentialsA */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesA */ -}; - -static const SecurityFunctionTableW kerberosTableW = { - 1, - NULL, /* EnumerateSecurityPackagesW */ - kerberos_QueryCredentialsAttributesW, /* QueryCredentialsAttributesW */ - kerberos_AcquireCredentialsHandleW, /* AcquireCredentialsHandleW */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextW, /* InitializeSecurityContextW */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesW, /* QueryContextAttributesW */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoW */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextW */ - NULL, /* AddCredentialsW */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesW */ -}; - -#define KERBEROS_COMMENT \ - {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0} -static CHAR kerberos_comment_A[] = KERBEROS_COMMENT; -static WCHAR kerberos_comment_W[] = KERBEROS_COMMENT; - -#define KERBEROS_NAME {'K','e','r','b','e','r','o','s',0} -static char kerberos_name_A[] = KERBEROS_NAME; -static WCHAR kerberos_name_W[] = KERBEROS_NAME; - -#define CAPS \ - ( SECPKG_FLAG_INTEGRITY \ - | SECPKG_FLAG_PRIVACY \ - | SECPKG_FLAG_TOKEN_ONLY \ - | SECPKG_FLAG_DATAGRAM \ - | SECPKG_FLAG_CONNECTION \ - | SECPKG_FLAG_MULTI_REQUIRED \ - | SECPKG_FLAG_EXTENDED_ERROR \ - | SECPKG_FLAG_IMPERSONATION \ - | SECPKG_FLAG_ACCEPT_WIN32_NAME \ - | SECPKG_FLAG_NEGOTIABLE \ - | SECPKG_FLAG_GSS_COMPATIBLE \ - | SECPKG_FLAG_LOGON \ - | SECPKG_FLAG_MUTUAL_AUTH \ - | SECPKG_FLAG_DELEGATION \ - | SECPKG_FLAG_READONLY_WITH_CHECKSUM \ - | SECPKG_FLAG_RESTRICTED_TOKENS \ - | SECPKG_FLAG_APPCONTAINER_CHECKS) - -static const SecPkgInfoW infoW = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_W, - kerberos_comment_W -}; - -static const SecPkgInfoA infoA = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_A, - kerberos_comment_A -}; - -void SECUR32_initKerberosSP(void) -{ - SecureProvider *provider = SECUR32_addProvider(&kerberosTableA, &kerberosTableW, NULL); - SECUR32_addPackages(provider, 1, &infoA, &infoW); -} diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 1e12f3c543..f7b1ec2d98 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -564,7 +564,8 @@ static void SECUR32_initializeProviders(void) /* First load built-in providers */ SECUR32_initSchannelSP(); SECUR32_initNTLMSP(); - SECUR32_initKerberosSP(); + /* Load SSP/AP packages (Kerberos and others) */ + load_auth_packages(); /* Load the Negotiate provider last so apps stumble over the working NTLM * provider first. Attempting to fix bug #16905 while keeping the * application reported on wine-users on 2006-09-12 working. */ diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 9a60d65788..973b75c699 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -136,7 +136,7 @@ PSTR SECUR32_AllocMultiByteFromWide(PCWSTR str) DECLSPEC_HIDDEN; void SECUR32_initSchannelSP(void) DECLSPEC_HIDDEN; void SECUR32_initNegotiateSP(void) DECLSPEC_HIDDEN; void SECUR32_initNTLMSP(void) DECLSPEC_HIDDEN; -void SECUR32_initKerberosSP(void) DECLSPEC_HIDDEN; +void load_auth_packages(void) DECLSPEC_HIDDEN; /* Cleanup functions for built-in providers */ void SECUR32_deinitSchannelSP(void) DECLSPEC_HIDDEN; -- 2.15.1

1 0

[PATCH 8/9] secur32: Implement DecryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index d7d21fbd00..ce60f35c71 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -643,6 +643,27 @@ static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG qual return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_DecryptMessage(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->UnsealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->UnsealMessage(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -671,7 +692,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesW */ }; @@ -703,7 +724,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesA */ }; -- 2.15.1

1 0

[PATCH 7/9] secur32: Implement EncryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index c64d3c240d..d7d21fbd00 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -622,6 +622,27 @@ static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBuffer return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); } +static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->SealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -649,7 +670,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* AddCredentialsW */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesW */ }; @@ -681,7 +702,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* AddCredentialsA */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesA */ }; -- 2.15.1

1 0

[PATCH 6/9] secur32: Implement VerifySignature in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 7343fa85b6..c64d3c240d 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -601,6 +601,27 @@ static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quali return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->VerifySignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -618,7 +639,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ NULL, /* Reserved3 */ @@ -650,7 +671,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ NULL, /* Reserved3 */ -- 2.15.1

1 0

[PATCH 5/9] secur32: Implement MakeSignature in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index d63dcaa809..7343fa85b6 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -580,6 +580,27 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U return SEC_E_UNSUPPORTED_FUNCTION; } +static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->user_api || !lsa_package->user_api->MakeSignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -596,7 +617,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ @@ -628,7 +649,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ -- 2.15.1

1 0

[PATCH 4/9] secur32: Implement QueryContextAttributes in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index b9693e6976..d63dcaa809 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -526,6 +526,60 @@ static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) return lsa_package->lsa_api->DeleteContext(lsa_context); } +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, ULONG attribute, void *buffer) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->SpQueryContextAttributes) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); +} + +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) +{ + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { + case SECPKG_ATTR_SIZES: + return lsa_QueryContextAttributesW( context, attribute, buffer ); + +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + X(SECPKG_ATTR_NEGOTIATION_INFO); +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -539,7 +593,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesW */ + lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ @@ -571,7 +625,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesA */ + lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ -- 2.15.1

1 0

[PATCH 3/9] secur32: Implement AcceptSecurityContext in the SSP/AP wrapper. (v2)
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

v2: switch order of context vs. credentials initialization initialize context also in case of SEC_I_CONTINUE_NEEDED Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 628614cbed..b9693e6976 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,46 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_AcceptSecurityContext( + CredHandle *credential, CtxtHandle *context, SecBufferDesc *input, + ULONG context_req, ULONG target_data_rep, CtxtHandle *new_context, + SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + BOOLEAN mapped_context; + + TRACE("%p %p %p %#x %#x %p %p %p %p\n", credential, context, input, + context_req, target_data_rep, new_context, output, context_attr, ts_expiry); + + if (context) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + else if (credential) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->AcceptLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + status = lsa_package->lsa_api->AcceptLsaModeContext(lsa_credential, lsa_context, + input, context_req, target_data_rep, &new_lsa_context, output, context_attr, + ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) { struct lsa_package *lsa_package; @@ -495,7 +535,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextW, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ @@ -527,7 +567,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextA, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ -- 2.15.1

1 0

[PATCH 2/9] secur32: Implement DeleteSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 4ed6a06caf..628614cbed 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,26 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p\n", context); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->DeleteContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->DeleteContext(lsa_context); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -477,7 +497,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesW */ NULL, /* ImpersonateSecurityContext */ @@ -509,7 +529,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesA */ NULL, /* ImpersonateSecurityContext */ -- 2.15.1

1 0

[PATCH 1/9] secur32: Implement InitializeSecurityContext in the SSP/AP wrapper. (v2)
by Dmitry Timoshkov 01 Feb '18

01 Feb '18

Partially based on Hans Leidekker's work. v2: switch order of context vs. credentials initialization initialize context also in case of SEC_I_CONTINUE_NEEDED Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 1916aa4b3a..4ed6a06caf 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -396,6 +396,76 @@ static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); } +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( + CredHandle *credential, CtxtHandle *context, SEC_WCHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + UNICODE_STRING target_name_us; + BOOLEAN mapped_context; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_w(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (context) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + else if (credential) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->InitLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + if (target_name) + RtlInitUnicodeString(&target_name_us, target_name); + + status = lsa_package->lsa_api->InitLsaModeContext(lsa_credential, lsa_context, + target_name ? &target_name_us : NULL, context_req, target_data_rep, input, + &new_lsa_context, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK || status == SEC_I_CONTINUE_NEEDED) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( + CredHandle *credential, CtxtHandle *context, SEC_CHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + SEC_WCHAR *targetW = NULL; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_a(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (target_name) + { + int len = MultiByteToWideChar( CP_ACP, 0, target_name, -1, NULL, 0 ); + if (!(targetW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) return SEC_E_INSUFFICIENT_MEMORY; + MultiByteToWideChar( CP_ACP, 0, target_name, -1, targetW, len ); + } + + status = lsa_InitializeSecurityContextW( credential, context, targetW, context_req, reserved1, target_data_rep, + input, reserved2, new_context, output, context_attr, ts_expiry ); + HeapFree( GetProcessHeap(), 0, targetW ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -404,7 +474,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_AcquireCredentialsHandleW, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextW */ + lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ @@ -436,7 +506,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_AcquireCredentialsHandleA, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextA */ + lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ -- 2.15.1

1 0

[PATCH 4/4] crypt32: Always set returned size in CRYPT_CopySignerInfo.
by Jacek Caban 01 Feb '18

01 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crypt32/msg.c | 3 +-- dlls/crypt32/tests/msg.c | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-)

1 0

[PATCH 3/4] crypt32: Fixed decoded size calculation in CRYPT_AsnDecodeSequence when indefinite length is used.
by Jacek Caban 01 Feb '18

01 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crypt32/decode.c | 1 + dlls/crypt32/tests/encode.c | 105 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 94 insertions(+), 12 deletions(-)

1 0

[PATCH 2/4] crypt32/tests: Added more decoding tests.
by Jacek Caban 01 Feb '18

01 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crypt32/tests/encode.c | 238 +++++++++++++++++++++++++++++--------------- 1 file changed, 157 insertions(+), 81 deletions(-)

1 0

[PATCH 1/4] crypt32: Support constructed strings in octet strings decoder.
by Jacek Caban 01 Feb '18

01 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crypt32/decode.c | 146 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 117 insertions(+), 29 deletions(-)

1 0

[PATCH 5/5] d3d10: Use the global memory allocation helpers.
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/d3d10_main.c | 6 +-- dlls/d3d10/d3d10_private.h | 8 +-- dlls/d3d10/effect.c | 119 ++++++++++++++++++++++----------------------- dlls/d3d10/shader.c | 4 +- dlls/d3d10/stateblock.c | 5 +- 5 files changed, 63 insertions(+), 79 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 52585f0..f2fbb41 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -222,8 +222,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", data, data_size, flags, device, effect_pool, effect); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate D3D10 effect object memory\n"); return E_OUTOFMEMORY; @@ -303,8 +302,7 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad FIXME("data %p, data_size %lu, reflector %p stub!\n", data, data_size, reflector); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate D3D10 shader reflection object memory\n"); return E_OUTOFMEMORY; diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 93b6e35..e785b8b 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -21,6 +21,7 @@ #include "wine/debug.h" #include "wine/rbtree.h" +#include "wine/heap.h" #define COBJMACROS #include "winbase.h" @@ -278,13 +279,6 @@ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte HRESULT parse_dxbc(const char *data, SIZE_T data_size, HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN; -static inline void *d3d10_calloc(SIZE_T count, SIZE_T size) -{ - if (count > ~(SIZE_T)0 / size) - return NULL; - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * size); -} - static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4760489..10d8404 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -285,7 +285,7 @@ static BOOL fx10_copy_string(const char *data, size_t data_size, DWORD offset, c return TRUE; } - if (!(*s = HeapAlloc(GetProcessHeap(), 0, len))) + if (!(*s = heap_alloc(len))) { ERR("Failed to allocate string memory.\n"); return FALSE; @@ -308,8 +308,7 @@ static BOOL copy_name(const char *ptr, char **name) return TRUE; } - *name = HeapAlloc(GetProcessHeap(), 0, name_len); - if (!*name) + if (!(*name = heap_alloc(name_len))) { ERR("Failed to allocate name memory.\n"); return FALSE; @@ -355,7 +354,7 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct return E_INVALIDARG; } - if (!(e = d3d10_calloc(count, sizeof(*e)))) + if (!(e = heap_calloc(count, sizeof(*e)))) { ERR("Failed to allocate signature memory.\n"); return E_OUTOFMEMORY; @@ -370,7 +369,7 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct if (!(e[i].SemanticName = shader_get_string(data, data_size, name_offset))) { WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); - HeapFree(GetProcessHeap(), 0, e); + heap_free(e); return E_INVALIDARG; } read_dword(&ptr, &e[i].SemanticIndex); @@ -396,8 +395,8 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct static void shader_free_signature(struct d3d10_effect_shader_signature *s) { - HeapFree(GetProcessHeap(), 0, s->signature); - HeapFree(GetProcessHeap(), 0, s->elements); + heap_free(s->signature); + heap_free(s->elements); } static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) @@ -422,8 +421,7 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag if (tag == TAG_ISGN) sig = &s->input_signature; else sig = &s->output_signature; - sig->signature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!sig->signature) + if (!(sig->signature = heap_alloc_zero(size))) { ERR("Failed to allocate input signature data\n"); return E_OUTOFMEMORY; @@ -698,7 +696,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, t->basetype = 0; t->type_class = D3D10_SVC_STRUCT; - if (!(t->members = d3d10_calloc(t->member_count, sizeof(*t->members)))) + if (!(t->members = heap_calloc(t->member_count, sizeof(*t->members)))) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; @@ -759,8 +757,7 @@ static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, TRACE("Elementtype for type at offset: %#x\n", t->id); /* allocate elementtype - we need only one, because all elements have the same type */ - t->elementtype = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*t->elementtype)); - if (!t->elementtype) + if (!(t->elementtype = heap_alloc_zero(sizeof(*t->elementtype)))) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; @@ -828,8 +825,7 @@ static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, return WINE_RB_ENTRY_VALUE(entry, struct d3d10_effect_type, entry); } - type = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*type)); - if (!type) + if (!(type = heap_alloc_zero(sizeof(*type)))) { ERR("Failed to allocate type memory.\n"); return NULL; @@ -841,14 +837,14 @@ static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, if (FAILED(hr = parse_fx10_type(data, data_size, offset, type))) { ERR("Failed to parse type info, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, type); + heap_free(type); return NULL; } if (wine_rb_put(&effect->types, &offset, &type->entry) == -1) { ERR("Failed to insert type entry.\n"); - HeapFree(GetProcessHeap(), 0, type); + heap_free(type); return NULL; } @@ -948,7 +944,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) if (v->type->member_count) { - if (!(v->members = d3d10_calloc(v->type->member_count, sizeof(*v->members)))) + if (!(v->members = heap_calloc(v->type->member_count, sizeof(*v->members)))) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; @@ -990,7 +986,7 @@ static HRESULT copy_variableinfo_from_type(struct d3d10_effect_variable *v) { unsigned int bufferoffset = v->buffer_offset; - if (!(v->elements = d3d10_calloc(v->type->element_count, sizeof(*v->elements)))) + if (!(v->elements = heap_calloc(v->type->element_count, sizeof(*v->elements)))) { ERR("Failed to allocate elements memory.\n"); return E_OUTOFMEMORY; @@ -1592,7 +1588,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, read_dword(ptr, &p->annotation_count); TRACE("Pass has %u annotations.\n", p->annotation_count); - if (!(p->annotations = d3d10_calloc(p->annotation_count, sizeof(*p->annotations)))) + if (!(p->annotations = heap_calloc(p->annotation_count, sizeof(*p->annotations)))) { ERR("Failed to allocate pass annotations memory.\n"); return E_OUTOFMEMORY; @@ -1609,7 +1605,7 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, return hr; } - if (!(p->objects = d3d10_calloc(p->object_count, sizeof(*p->objects)))) + if (!(p->objects = heap_calloc(p->object_count, sizeof(*p->objects)))) { ERR("Failed to allocate effect objects memory.\n"); return E_OUTOFMEMORY; @@ -1655,7 +1651,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, read_dword(ptr, &t->annotation_count); TRACE("Technique has %u annotations.\n", t->annotation_count); - if (!(t->annotations = d3d10_calloc(t->annotation_count, sizeof(*t->annotations)))) + if (!(t->annotations = heap_calloc(t->annotation_count, sizeof(*t->annotations)))) { ERR("Failed to allocate technique annotations memory.\n"); return E_OUTOFMEMORY; @@ -1672,7 +1668,7 @@ static HRESULT parse_fx10_technique(const char *data, size_t data_size, return hr; } - if (!(t->passes = d3d10_calloc(t->pass_count, sizeof(*t->passes)))) + if (!(t->passes = heap_calloc(t->pass_count, sizeof(*t->passes)))) { ERR("Failed to allocate passes memory\n"); return E_OUTOFMEMORY; @@ -1723,7 +1719,7 @@ static HRESULT parse_fx10_variable(const char *data, size_t data_size, read_dword(ptr, &v->annotation_count); TRACE("Variable has %u annotations.\n", v->annotation_count); - if (!(v->annotations = d3d10_calloc(v->annotation_count, sizeof(*v->annotations)))) + if (!(v->annotations = heap_calloc(v->annotation_count, sizeof(*v->annotations)))) { ERR("Failed to allocate variable annotations memory.\n"); return E_OUTOFMEMORY; @@ -1897,7 +1893,7 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, read_dword(ptr, &v->annotation_count); TRACE("Variable has %u annotations.\n", v->annotation_count); - if (!(v->annotations = d3d10_calloc(v->annotation_count, sizeof(*v->annotations)))) + if (!(v->annotations = heap_calloc(v->annotation_count, sizeof(*v->annotations)))) { ERR("Failed to allocate variable annotations memory.\n"); return E_OUTOFMEMORY; @@ -1927,8 +1923,7 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, unsigned int stride = 0; /* Generate our own type, it isn't in the fx blob. */ - l->type = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*l->type)); - if (!l->type) + if (!(l->type = heap_alloc_zero(sizeof(*l->type)))) { ERR("Failed to allocate local buffer type memory.\n"); return E_OUTOFMEMORY; @@ -1986,7 +1981,7 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, read_dword(ptr, &l->annotation_count); TRACE("Local buffer has %u annotations.\n", l->annotation_count); - if (!(l->annotations = d3d10_calloc(l->annotation_count, sizeof(*l->annotations)))) + if (!(l->annotations = heap_calloc(l->annotation_count, sizeof(*l->annotations)))) { ERR("Failed to allocate local buffer annotations memory.\n"); return E_OUTOFMEMORY; @@ -2003,13 +1998,13 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, return hr; } - if (!(l->members = d3d10_calloc(l->type->member_count, sizeof(*l->members)))) + if (!(l->members = heap_calloc(l->type->member_count, sizeof(*l->members)))) { ERR("Failed to allocate members memory.\n"); return E_OUTOFMEMORY; } - if (!(l->type->members = d3d10_calloc(l->type->member_count, sizeof(*l->type->members)))) + if (!(l->type->members = heap_calloc(l->type->member_count, sizeof(*l->type->members)))) { ERR("Failed to allocate type members memory.\n"); return E_OUTOFMEMORY; @@ -2112,8 +2107,8 @@ static void d3d10_effect_type_member_destroy(struct d3d10_effect_type_member *ty TRACE("effect type member %p.\n", typem); /* Do not release typem->type, it will be covered by d3d10_effect_type_destroy(). */ - HeapFree(GetProcessHeap(), 0, typem->semantic); - HeapFree(GetProcessHeap(), 0, typem->name); + heap_free(typem->semantic); + heap_free(typem->name); } static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context) @@ -2124,8 +2119,8 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context if (t->elementtype) { - HeapFree(GetProcessHeap(), 0, t->elementtype->name); - HeapFree(GetProcessHeap(), 0, t->elementtype); + heap_free(t->elementtype->name); + heap_free(t->elementtype); } if (t->members) @@ -2136,11 +2131,11 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context { d3d10_effect_type_member_destroy(&t->members[i]); } - HeapFree(GetProcessHeap(), 0, t->members); + heap_free(t->members); } - HeapFree(GetProcessHeap(), 0, t->name); - HeapFree(GetProcessHeap(), 0, t); + heap_free(t->name); + heap_free(t); } static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD data_size) @@ -2156,31 +2151,31 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d } ptr = data + e->index_offset; - if (!(e->local_buffers = d3d10_calloc(e->local_buffer_count, sizeof(*e->local_buffers)))) + if (!(e->local_buffers = heap_calloc(e->local_buffer_count, sizeof(*e->local_buffers)))) { ERR("Failed to allocate local buffer memory.\n"); return E_OUTOFMEMORY; } - if (!(e->local_variables = d3d10_calloc(e->local_variable_count, sizeof(*e->local_variables)))) + if (!(e->local_variables = heap_calloc(e->local_variable_count, sizeof(*e->local_variables)))) { ERR("Failed to allocate local variable memory.\n"); return E_OUTOFMEMORY; } - if (!(e->anonymous_shaders = d3d10_calloc(e->anonymous_shader_count, sizeof(*e->anonymous_shaders)))) + if (!(e->anonymous_shaders = heap_calloc(e->anonymous_shader_count, sizeof(*e->anonymous_shaders)))) { ERR("Failed to allocate anonymous shaders memory\n"); return E_OUTOFMEMORY; } - if (!(e->used_shaders = d3d10_calloc(e->used_shader_count, sizeof(*e->used_shaders)))) + if (!(e->used_shaders = heap_calloc(e->used_shader_count, sizeof(*e->used_shaders)))) { ERR("Failed to allocate used shaders memory\n"); return E_OUTOFMEMORY; } - if (!(e->techniques = d3d10_calloc(e->technique_count, sizeof(*e->techniques)))) + if (!(e->techniques = heap_calloc(e->technique_count, sizeof(*e->techniques)))) { ERR("Failed to allocate techniques memory\n"); return E_OUTOFMEMORY; @@ -2398,15 +2393,15 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) TRACE("variable %p.\n", v); - HeapFree(GetProcessHeap(), 0, v->name); - HeapFree(GetProcessHeap(), 0, v->semantic); + heap_free(v->name); + heap_free(v->semantic); if (v->annotations) { for (i = 0; i < v->annotation_count; ++i) { d3d10_effect_variable_destroy(&v->annotations[i]); } - HeapFree(GetProcessHeap(), 0, v->annotations); + heap_free(v->annotations); } if (v->members) @@ -2415,7 +2410,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) { d3d10_effect_variable_destroy(&v->members[i]); } - HeapFree(GetProcessHeap(), 0, v->members); + heap_free(v->members); } if (v->elements) @@ -2424,7 +2419,7 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) { d3d10_effect_variable_destroy(&v->elements[i]); } - HeapFree(GetProcessHeap(), 0, v->elements); + heap_free(v->elements); } if (v->type) @@ -2508,7 +2503,7 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) TRACE("pass %p\n", p); - HeapFree(GetProcessHeap(), 0, p->name); + heap_free(p->name); if (p->objects) { @@ -2516,7 +2511,7 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) { d3d10_effect_object_destroy(&p->objects[i]); } - HeapFree(GetProcessHeap(), 0, p->objects); + heap_free(p->objects); } if (p->annotations) @@ -2525,7 +2520,7 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) { d3d10_effect_variable_destroy(&p->annotations[i]); } - HeapFree(GetProcessHeap(), 0, p->annotations); + heap_free(p->annotations); } } @@ -2535,14 +2530,14 @@ static void d3d10_effect_technique_destroy(struct d3d10_effect_technique *t) TRACE("technique %p\n", t); - HeapFree(GetProcessHeap(), 0, t->name); + heap_free(t->name); if (t->passes) { for (i = 0; i < t->pass_count; ++i) { d3d10_effect_pass_destroy(&t->passes[i]); } - HeapFree(GetProcessHeap(), 0, t->passes); + heap_free(t->passes); } if (t->annotations) @@ -2551,7 +2546,7 @@ static void d3d10_effect_technique_destroy(struct d3d10_effect_technique *t) { d3d10_effect_variable_destroy(&t->annotations[i]); } - HeapFree(GetProcessHeap(), 0, t->annotations); + heap_free(t->annotations); } } @@ -2561,14 +2556,14 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) TRACE("local buffer %p.\n", l); - HeapFree(GetProcessHeap(), 0, l->name); + heap_free(l->name); if (l->members) { for (i = 0; i < l->type->member_count; ++i) { d3d10_effect_variable_destroy(&l->members[i]); } - HeapFree(GetProcessHeap(), 0, l->members); + heap_free(l->members); } if (l->type) @@ -2580,7 +2575,7 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) { d3d10_effect_variable_destroy(&l->annotations[i]); } - HeapFree(GetProcessHeap(), 0, l->annotations); + heap_free(l->annotations); } } @@ -2636,7 +2631,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) { d3d10_effect_technique_destroy(&This->techniques[i]); } - HeapFree(GetProcessHeap(), 0, This->techniques); + heap_free(This->techniques); } if (This->local_variables) @@ -2645,7 +2640,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) { d3d10_effect_variable_destroy(&This->local_variables[i]); } - HeapFree(GetProcessHeap(), 0, This->local_variables); + heap_free(This->local_variables); } if (This->local_buffers) @@ -2654,7 +2649,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) { d3d10_effect_local_buffer_destroy(&This->local_buffers[i]); } - HeapFree(GetProcessHeap(), 0, This->local_buffers); + heap_free(This->local_buffers); } if (This->anonymous_shaders) @@ -2662,17 +2657,17 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) for (i = 0; i < This->anonymous_shader_count; ++i) { d3d10_effect_variable_destroy(&This->anonymous_shaders[i].shader); - HeapFree(GetProcessHeap(), 0, This->anonymous_shaders[i].type.name); + heap_free(This->anonymous_shaders[i].type.name); } - HeapFree(GetProcessHeap(), 0, This->anonymous_shaders); + heap_free(This->anonymous_shaders); } - HeapFree(GetProcessHeap(), 0, This->used_shaders); + heap_free(This->used_shaders); wine_rb_destroy(&This->types, d3d10_effect_type_destroy, NULL); ID3D10Device_Release(This->device); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return refcount; diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index a6a9a30..c97d8df 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -68,9 +68,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderRefle TRACE("%p decreasing refcount to %u\n", This, refcount); if (!refcount) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return refcount; } diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index 470d325..ebeebf7 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -275,7 +275,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_Release(ID3D10StateBlock *iface) { stateblock_cleanup(stateblock); ID3D10Device_Release(stateblock->device); - HeapFree(GetProcessHeap(), 0, stateblock); + heap_free(stateblock); } return refcount; @@ -522,8 +522,7 @@ HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, TRACE("device %p, mask %p, stateblock %p.\n", device, mask, stateblock); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate D3D10 stateblock object memory.\n"); return E_OUTOFMEMORY; -- 2.1.4

1 0

[PATCH 3/5] wined3d: Use more resource access flags in wined3d_texture_use_pbo().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 101f9ad..f166c2a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -32,8 +32,8 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { - return texture->resource.pool == WINED3D_POOL_DEFAULT - && texture->resource.access & WINED3D_RESOURCE_ACCESS_MAP + return (texture->resource.access & (WINED3D_RESOURCE_ACCESS_CPU + | WINED3D_RESOURCE_ACCESS_MAP)) == WINED3D_RESOURCE_ACCESS_MAP && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !texture->resource.format->conv_byte_count && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)); -- 2.1.4

1 0

[PATCH 2/5] wined3d: Use the resource access flags in wined3d_surface_blt().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f34ad0..388b803 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3854,10 +3854,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst { TRACE("Depth/stencil blit.\n"); - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) - dst_location = dst_texture->resource.map_binding; - else + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; + else + dst_location = dst_texture->resource.map_binding; context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, @@ -3959,10 +3959,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst blit_op = WINED3D_BLIT_OP_RAW_BLIT; } - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) - dst_location = dst_texture->resource.map_binding; - else + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU) dst_location = dst_texture->resource.draw_binding; + else + dst_location = dst_texture->resource.map_binding; context = context_acquire(device, dst_texture, dst_sub_resource_idx); valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context, -- 2.1.4

1 0

[PATCH 1/5] wined3d: Use the resource access flags in ffp_blitter_use_cpu_clear().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f91c21..5f34ad0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2744,14 +2744,16 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) resource = view->resource; if (resource->type == WINED3D_RTYPE_BUFFER) - return resource->pool == WINED3D_POOL_SYSTEM_MEM; + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU); texture = texture_from_resource(resource); locations = texture->sub_resources[view->sub_resource_idx].locations; if (locations & (resource->map_binding | WINED3D_LOCATION_DISCARDED)) - return resource->pool == WINED3D_POOL_SYSTEM_MEM || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) + || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); - return resource->pool == WINED3D_POOL_SYSTEM_MEM && !(texture->flags & WINED3D_TEXTURE_CONVERTED); + return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU) + && !(texture->flags & WINED3D_TEXTURE_CONVERTED); } static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, -- 2.1.4

1 0

[PATCH] comctl32/tests: Add test for v6 combobox dropdown size
by Fabian Maurer 31 Jan '18

31 Jan '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 895d9429b4..74cbe7851e 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -33,6 +33,8 @@ #define EDITBOX_ID 0 #define COMBO_ID 1995 +#define COMBO_YBORDERSIZE() 2 + #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) #define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ @@ -1151,6 +1153,137 @@ static void test_combo_WS_VSCROLL(void) DestroyWindow(hCombo); } + +static void test_listbox_size(DWORD style) +{ + HWND hCombo, hList; + COMBOBOXINFO cbInfo; + UINT x, y; + BOOL ret; + int i, test; + const char wine_test[] = "Wine Test"; + + static const struct list_size_info + { + int num_items; + int height_combo; + int limit; + BOOL todo_regular; + BOOL todo_nointegral; + } info_height[] = { + {2, 24, -1, TRUE, TRUE}, + {2, 41, -1, TRUE, TRUE}, + {2, 300, -1, TRUE}, + {6, 50, -1, TRUE, TRUE}, + {6, 1, -1, TRUE, TRUE}, + {6, 800, -1, TRUE}, + {80, 10, -1, TRUE, TRUE}, + {100, 900, -1, TRUE, TRUE}, + {2, 100, -1, TRUE}, + + {2, 12, 30, FALSE, TRUE}, + {100, 12, 30, TRUE, TRUE}, + {2, 12, 1, TRUE, TRUE}, + {100, 12, 1, TRUE, TRUE}, + {2, 12, 100, FALSE, TRUE}, + {100, 12, 100, TRUE, TRUE}, + {15, 12, 4, TRUE, TRUE}, + {15, 12, 15, TRUE, TRUE}, + + {10, 24, -1, TRUE, TRUE}, + {10, 41, -1, TRUE, TRUE}, + {10, 42, -1, TRUE, TRUE}, + {10, 50, -1, TRUE, TRUE}, + }; + + for(test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) + { + const struct list_size_info *info_test = &info_height[test]; + int height_item; /* Height of a list item */ + int height_list; /* Height of the list we got */ + int expected_height_list; + RECT rect_list_client; + int min_visible_expected; + + hCombo = CreateWindowA("ComboBox", "Combo", WS_VISIBLE | WS_CHILD | style, 5, 5, 100, + info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); + + min_visible_expected = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == 30, "Expected maximum of visible items to be 30, got %d\n", min_visible_expected); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = GetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); + + hList = cbInfo.hwndList; + for (i = 0; i < info_test->num_items; i++) + SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM) wine_test); + + if(info_test->limit != -1) + { + int min_visible_actual; + min_visible_expected = info_test->limit; + + SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0); + min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == min_visible_actual, "Expected maximum of visible items to be %d, got %d\n", + min_visible_expected, min_visible_actual); + } + + /* Click on the button to drop down the list */ + x = cbInfo.rcButton.left + (cbInfo.rcButton.right-cbInfo.rcButton.left)/2; + y = cbInfo.rcButton.top + (cbInfo.rcButton.bottom-cbInfo.rcButton.top)/2; + ret = SendMessageA(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); + ok(ret, "WM_LBUTTONDOWN was not processed. LastError=%d\n", + GetLastError()); + ok(SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0), + "The dropdown list should have appeared after clicking the button.\n"); + + GetClientRect(hList, &rect_list_client); + height_list = rect_list_client.bottom - rect_list_client.top; + height_item = (int)SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0); + + if(style & CBS_NOINTEGRALHEIGHT) + { + RECT rect_list_complete; + int list_height_nonclient; + int list_height_calculated; + + GetWindowRect(hList, &rect_list_complete); + + list_height_nonclient = (rect_list_complete.bottom - rect_list_complete.top) + - (rect_list_client.bottom - rect_list_client.top); + + /* Calculate the expected client size of the listbox popup from the size of the combobox. */ + list_height_calculated = info_test->height_combo + - (cbInfo.rcItem.bottom + COMBO_YBORDERSIZE()) + - list_height_nonclient + - 1; + + expected_height_list = min(list_height_calculated, height_item * info_test->num_items); + if( expected_height_list < 0) + expected_height_list = 0; + + todo_wine_if(info_test->todo_nointegral) + ok(expected_height_list == height_list, + "Test %d, expected list height to be %d, got %d\n", test, expected_height_list, height_list); + } + else + { + expected_height_list = min(info_test->num_items, min_visible_expected) * height_item; + + todo_wine_if(info_test->todo_regular) + ok(expected_height_list == height_list, + "Test %d, expected list height to be %d, got %d\n", test, expected_height_list, height_list); + } + + DestroyWindow(hCombo); + } +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1192,6 +1325,8 @@ START_TEST(combo) test_combo_listbox_styles(CBS_SIMPLE); test_combo_listbox_styles(CBS_DROPDOWN); test_combo_listbox_styles(CBS_DROPDOWNLIST); + test_listbox_size(CBS_DROPDOWN); + test_listbox_size(CBS_DROPDOWN | CBS_NOINTEGRALHEIGHT); cleanup(); unload_v6_module(ctx_cookie, hCtx); -- 2.16.1

4 6

[PATCH] msscript.ocx: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index b0ea1e55a1..1f706f5380 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -28,6 +28,7 @@ #include "msscript.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(msscript); @@ -103,16 +104,6 @@ struct ScriptControl { static HINSTANCE msscript_instance; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - typedef enum tid_t { IScriptControl_tid, LAST_tid -- 2.14.3

1 0

[PATCH] msident: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msident/msident.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index 3efb190a39..8b9842f960 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -24,19 +24,10 @@ #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(msident); -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static HINSTANCE msident_instance; typedef struct { -- 2.14.3

1 0

[PATCH] jsproxy: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jsproxy/main.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index a52fbb4df7..d1ac903eb6 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -51,6 +51,7 @@ #include "dispex.h" #include "activscp.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" static HINSTANCE instance; @@ -87,16 +88,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *strdupAW( const char *src, int len ) { WCHAR *dst = NULL; -- 2.14.3

1 0

[PATCH] inseng: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inseng/inseng_main.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index c95d2c7321..93649e20e9 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -33,19 +33,10 @@ #include "inseng.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inseng); -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static HINSTANCE instance; struct InstallEngine { -- 2.14.3

1 0

[PATCH] inetcpl.cpl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcpl.cpl/inetcpl.h | 19 ------------------- dlls/inetcpl.cpl/security.c | 1 + 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index 4aae2922f3..50d4bd1e66 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -31,25 +31,6 @@ INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; INT_PTR CALLBACK security_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; -/* ## Memory allocation functions ## */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - -/* ######### */ - #define NUM_PROPERTY_PAGES 8 /* icons */ diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 6d7905785b..543ada433d 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -37,6 +37,7 @@ #include "inetcpl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); -- 2.14.3

1 0

[PATCH] inetcomm: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcomm/inetcomm_private.h | 10 ---------- dlls/inetcomm/mimeole.c | 1 + dlls/inetcomm/protocol.c | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index 816493bb0b..b27cbd7bc1 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -83,13 +83,3 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) DECLSPEC_HIDD HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f0e186ca1f..681ca820d4 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -33,6 +33,7 @@ #include "mimeole.h" #include "propvarutil.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index b7b01d4aaf..028463a269 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -25,6 +25,7 @@ #include "inetcomm_private.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); -- 2.14.3

1 0

[PATCH] hlink: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hlink/hlink_private.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h index 33b58ac42f..1b7847bb74 100644 --- a/dlls/hlink/hlink_private.h +++ b/dlls/hlink/hlink_private.h @@ -27,26 +27,12 @@ #include "ole2.h" #include "hlink.h" +#include "wine/heap.h" #include "wine/unicode.h" extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR hlink_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

1 0

[PATCH] testbot: Better wrap the database backend code.
by Francois Gouget 31 Jan '18

31 Jan '18

ObjectModel::BackEnd no longer exposes its global active backends variable. Also provide a way to close all database connections so the code does not have to assume we only have the 'WineTestBot' one which would defeat the point of the BackEnd module. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 4 ++-- testbot/lib/ObjectModel/BackEnd.pm | 33 +++++++++++++++++++++++++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 ++++---- testbot/lib/WineTestBot/VMs.pm | 4 ++-- testbot/lib/WineTestBot/WineTestBotObjects.pm | 4 ++-- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 827879cf..d6375647 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -309,8 +309,8 @@ sub HandleJobStatusChange($$$) if ($OldStatus eq "running" && $NewStatus ne "running") { - # Make sure the child process does not inherit the database connection - $ActiveBackEnds{'WineTestBot'}->Close(); + # Make sure the child process does not inherit the database connections + CloseAllDBBackEnds(); my $Pid = fork; if (!defined $Pid) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index 6c5c813d..0bb48cf7 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -30,11 +30,11 @@ should provide. =cut -use vars qw(@ISA @EXPORT %ActiveBackEnds); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -@EXPORT = qw(%ActiveBackEnds); +@EXPORT = qw(&AddDBBackEnd &GetDBBackEnd &RemoveDBBackEnd &CloseAllDBBackEnds); sub new($@) { @@ -51,4 +51,33 @@ sub _initialize($) #my ($self) = @_; } + +my %_ActiveBackEnds; + +sub AddDBBackEnd($$) +{ + my ($Name, $BackEnd) = @_; + $_ActiveBackEnds{$Name} = $BackEnd; +} + +sub GetDBBackEnd($) +{ + my ($Name) = @_; + return $_ActiveBackEnds{$Name}; +} + +sub RemoveDBBackEnd($) +{ + my ($Name) = @_; + delete $_ActiveBackEnds{$Name}; +} + +sub CloseAllDBBackEnds() +{ + foreach my $BackEnd (values %_ActiveBackEnds) + { + $BackEnd->Close(); + } +} + 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 565d4a8e..d4b07777 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -604,12 +604,12 @@ sub Close($) } } -sub UseDBIBackEnd($$@) +sub UseDBIBackEnd($$$$$$) { - my $class = shift; - my $DbSelector = shift; + my ($class, $DbSelector, $DbSource, $DbUser, $DbPassword, $DbArgs) = @_; - $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector} = $class->new(); - $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector}->{ConnectArgs} = \@_; + my $BackEnd = $class->new(); + $BackEnd->{ConnectArgs} = [$DbSource, $DbUser, $DbPassword, $DbArgs]; + AddDBBackEnd($DbSelector, $BackEnd); } 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2ba6b4b5..bb9a8328 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -344,8 +344,8 @@ sub Run($$$$$) # So set ChildPid in the parent and synchronize with the child so it only # starts once this is done. - # Make sure the child process will use its own database connection - $self->GetBackEnd()->Close(); + # Make sure the child process will use its own database connections + CloseAllDBBackEnds(); use Fcntl; my ($fd_read, $fd_write); diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index b46fa41d..20ff6b1e 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -37,7 +37,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return $ActiveBackEnds{'WineTestBot'}; + return GetDBBackEnd('WineTestBot'); } @@ -61,7 +61,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return $ActiveBackEnds{'WineTestBot'}; + return GetDBBackEnd('WineTestBot'); } 1; -- 2.15.1

1 1

[PATCH 5/6] d2d1: Introduce a helper function to allocate arrays.
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 6 ++++-- dlls/d2d1/brush.c | 4 ++-- dlls/d2d1/d2d1_private.h | 9 +++++++++ dlls/d2d1/geometry.c | 6 +++--- dlls/d2d1/render_target.c | 4 ++-- dlls/d2d1/stroke.c | 2 +- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 43ed094..028fab3 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -509,9 +509,11 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d } pitch = ((bpp * size.width) + 15) & ~15; - data_size = pitch * size.height; - if (!(data = heap_alloc(data_size))) + if (pitch / bpp < size.width) return E_OUTOFMEMORY; + if (!(data = d2d_calloc(size.height, pitch))) + return E_OUTOFMEMORY; + data_size = size.height * pitch; rect.X = 0; rect.Y = 0; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 6759019..0531a3a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -142,7 +142,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D unsigned int i; HRESULT hr; - if (!(data = heap_alloc_zero(2 * stop_count * sizeof(*data)))) + if (!(data = d2d_calloc(stop_count, 2 * sizeof(*data)))) { ERR("Failed to allocate data.\n"); return E_OUTOFMEMORY; @@ -205,7 +205,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D (*gradient)->view = view; (*gradient)->stop_count = stop_count; - if (!((*gradient)->stops = heap_alloc(stop_count * sizeof(*stops)))) + if (!((*gradient)->stops = d2d_calloc(stop_count, sizeof(*stops)))) { ID3D10ShaderResourceView_Release(view); heap_free(*gradient); diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index caeb4b9..2c10252 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -477,6 +477,15 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory * ID2D1Geometry *src_geometry, const D2D_MATRIX_3X2_F *transform) DECLSPEC_HIDDEN; struct d2d_geometry *unsafe_impl_from_ID2D1Geometry(ID2D1Geometry *iface) DECLSPEC_HIDDEN; +static inline void *d2d_calloc(size_t count, size_t size) +{ + SIZE_T s = count * size; + + if (size && s / size != count) + return NULL; + return heap_alloc(s); +} + static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) { D2D_MATRIX_3X2_F tmp = *a; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 88beee2..c805084 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2052,7 +2052,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) return S_OK; } - if (!(vertices = heap_alloc(vertex_count * sizeof(*vertices)))) + if (!(vertices = d2d_calloc(vertex_count, sizeof(*vertices)))) return E_OUTOFMEMORY; for (i = 0, j = 0; i < geometry->u.path.figure_count; ++i) @@ -2819,8 +2819,8 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; } - if (!(geometry->fill.bezier_vertices = heap_alloc(geometry->fill.bezier_vertex_count - * sizeof(*geometry->fill.bezier_vertices)))) + if (!(geometry->fill.bezier_vertices = d2d_calloc(geometry->fill.bezier_vertex_count, + sizeof(*geometry->fill.bezier_vertices)))) { ERR("Failed to allocate bezier vertices array.\n"); geometry->fill.bezier_vertex_count = 0; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 73f15f7..cc820cf 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1175,12 +1175,12 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta if (texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) bitmap_size.width *= 3; - opacity_values_size = bitmap_size.width * bitmap_size.height; - if (!(opacity_values = heap_alloc(opacity_values_size))) + if (!(opacity_values = d2d_calloc(bitmap_size.height, bitmap_size.width))) { ERR("Failed to allocate opacity values.\n"); goto done; } + opacity_values_size = bitmap_size.height * bitmap_size.width; if (FAILED(hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, texture_type, &bounds, opacity_values, opacity_values_size))) diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index a0830e3..63f88c7 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -212,7 +212,7 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact if (!dashes || !dash_count) return E_INVALIDARG; - if (!(style->dashes = heap_alloc(dash_count * sizeof(*style->dashes)))) + if (!(style->dashes = d2d_calloc(dash_count, sizeof(*style->dashes)))) return E_OUTOFMEMORY; memcpy(style->dashes, dashes, dash_count * sizeof(*style->dashes)); style->dash_count = dash_count; -- 2.1.4

3 2

[PATCH website] Remove static Download pages and redirect to wiki
by Rosanne DiMesio 31 Jan '18

31 Jan '18

The Download page is now on the wiki at https://wiki.winehq.org/Download. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> --- include/htaccess.sample | 12 +-- templates/de/download.template | 165 ----------------------------------- templates/de/home.template | 2 +- templates/en/download.template | 159 ---------------------------------- templates/en/home.template | 2 +- templates/es/home.template | 2 +- templates/fr/download.template | 178 -------------------------------------- templates/fr/home.template | 2 +- templates/ko/download.template | 159 ---------------------------------- templates/ko/home.template | 2 +- templates/pl/download.template | 159 ---------------------------------- templates/pl/home.template | 2 +- templates/pt/download.template | 162 ---------------------------------- templates/pt/home.template | 2 +- templates/tr/download.template | 149 ------------------------------- templates/tr/home.template | 2 +- templates/uk/download.template | 153 -------------------------------- templates/uk/home.template | 2 +- templates/zh-cn/download.template | 159 ---------------------------------- templates/zh-cn/home.template | 2 +- 20 files changed, 16 insertions(+), 1459 deletions(-) delete mode 100644 templates/de/download.template delete mode 100644 templates/en/download.template delete mode 100644 templates/fr/download.template delete mode 100644 templates/ko/download.template delete mode 100644 templates/pl/download.template delete mode 100644 templates/pt/download.template delete mode 100644 templates/tr/download.template delete mode 100644 templates/uk/download.template delete mode 100644 templates/zh-cn/download.template diff --git a/include/htaccess.sample b/include/htaccess.sample index ae532686..2e25cdfb 100644 --- a/include/htaccess.sample +++ b/include/htaccess.sample @@ -36,11 +36,11 @@ RedirectPermanent /dev https://www.winehq.org/getinvolv RedirectPermanent /dev.shtml https://www.winehq.org/getinvolved RedirectPermanent /dev.html https://www.winehq.org/getinvolved RedirectPermanent /devstart.shtml https://www.winehq.org/getinvolved -RedirectPermanent /download/index.php https://www.winehq.org/download -RedirectPermanent /download.shtml https://www.winehq.org/download -RedirectPermanent /download.html https://www.winehq.org/download -RedirectPermanent /download-mirrors.html https://www.winehq.org/download -RedirectPermanent /download-mirrors.shtml https://www.winehq.org/download +RedirectPermanent /download/index.php https://wiki.winehq.org/Download +RedirectPermanent /download.shtml https://wiki.winehq.org/Download +RedirectPermanent /download.html https://wiki.winehq.org/Download +RedirectPermanent /download-mirrors.html https://wiki.winehq.org/Download +RedirectPermanent /download-mirrors.shtml https://wiki.winehq.org/Download RedirectPermanent /site/download-deb https://wiki.winehq.org/Debian RedirectPermanent /download/debian https://wiki.winehq.org/Debian RedirectPermanent /download/ubuntu https://wiki.winehq.org/Ubuntu @@ -67,7 +67,7 @@ RedirectPermanent /todo https://wiki.winehq.org/KnownIss RedirectPermanent /site/history https://wiki.winehq.org/WineHistory RedirectPermanent /fun_projects https://wiki.winehq.org/Fun_Projects RedirectPermanent /winelib https://wiki.winehq.org/Winelib -RedirectMatch ^/download/deb.*$ https://www.winehq.org/download/ +RedirectMatch ^/download/deb.*$ https://wiki.winehq.org/Download RedirectMatch ^/site/wineconf/?$ https://wiki.winehq.org/WineConf RedirectMatch ^/wineconf/?$ https://wiki.winehq.org/WineConf diff --git a/templates/de/download.template b/templates/de/download.template deleted file mode 100644 index b5969715..00000000 --- a/templates/de/download.template +++ /dev/null @@ -1,165 +0,0 @@ - - - -<h1 class="title">Wine Downloads</h1> - -<a name="crossover"></a> -<h2>Wine mit Support</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">CrossOver</a></b> - ist eine auf Hochglanz polierte Wine-Version, die von <b><a href="https://www.codeweavers.com">CodeWeavers</a></b> - bereitgestellt wird. CrossOver vereinfacht die Bedienung von Wine und CodeWeavers leistet exzellenten technischen - Support für seine Nutzer. Alle Käufe von CrossOver werden direkt zur finanziellen Unterstützung - der Wine-Entwickler genutzt. Darum ist CrossOver eine großartige Möglichkeit, sowohl Unterstützung für - Wine zu bekommen, als auch das Wine-Projekt zu unterstützen.<br> - CodeWeavers stellt vollständig funktionsfähige - <b><a href="https://www.codeweavers.com/products">Testversionen von Crossover</a></b> zur Verfügung.</p> - <p class="small">Diese Empfehlung ist die primäre Anerkennung, die CodeWeavers als Dank - für das Hosten der Wine-Webseite erbeten hat.</p> - </div> -</div> - -<a name="binary"></a> -<h2>Wine Binärpakete</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - Neueste stabile Version: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - Neueste Entwicklungsversion: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b>Lesen Sie die <a href="https://wiki.winehq.org/HowTo">Installations- und Konfigurationsanleitung (en)</a>, - um zu erfahren, welche Schritte nach der Installation auszuführen sind.</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - WineHQ Binärpakete -</div> - -<p class="small margin-bottom-md text-right"><b>Maintainer:</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - Die folgenden Pakete werden von WineHQ erstellt und unterstützt.<br> - Bitte melden Sie Probleme mit diesen Paketen im <a href="http://bugs.winehq.org">WineHQ Bugzilla</a>. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - WineHQ Binärpakete für Ubuntu 14.04, 16.04, 16.10 und 17.04</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - WineHQ Binärpakete für Debian Wheezy, Jessie, Stretch, Buster und Sid</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - WineHQ Binärpakete für Fedora 24, 25 und 26</p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - WineHQ Binärpakete für macOS 10.8 und höher</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Binärpakete der Distibutionen -</div> - -<div class="whq-info-box center"> - Die folgenden Pakete werden von den jeweiligen Distributionen erstellt und unterstützt.<br> - Bei Problemen mit diesen Paketen melden Sie das bitte dem zuständigen Maintainer. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - binäre und Quellcode .rpms, sowie tägliche Snapshot-RPMs für alle openSUSE-Versionen (11.4 bis 13.2 und Leap 42.1) wie auch SUSE Linux Enterprise 11 und 12<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - binäre txz (Slackware 14.2) und tgz (für ältere Versionen)<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - Quelltext für FreeBSD 5.3 und neuer<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>Tools von Drittanbietern</h2> - -<p>Manchmal sorgt eine Anpassung von Wine dafür, dass bestimmte Anwendungen funktionieren, jedoch können die Änderungen -aus verschiedenen Gründen nicht in Wine selbst aufgenommen werden. Um gegenwärtige Defizite von Wine zu überwinden, -wurden über die Jahre diverse Hilfsprogramme für Endanwender erstellt. Diese Anwendungen werden seitens der Wine-Entwickler -in keinster Weise unterstützt, könnten aber dennoch nützlich sein. -Weitergehende Informationen dazu finden Sie auf <a href="https://wiki.winehq.org/ThirdPartyApplications">unserer Wiki-Seite (en)</a> -zu Drittanwendungen.</p> - -<a name="source"></a> -<h2>Quelltext-Downloads</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - Unsere offizielle Seite zur Veröffentlichung von Quelltexten. -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - Die aktuelle Entwicklungsversion. -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - Alternative Downloadseite für offizielle Quellcode- und Dokumentations-Tarballs. -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>Anmerkung:</b> Die Informationen über <a href="https://wiki.winehq.org/Recommended_Packages">empfohlene Pakete (en)</a> - enthalten Hinweise zur Konfiguration und zum Kompilieren von Wine. -</div> diff --git a/templates/de/home.template b/templates/de/home.template index 92a42d3e..433bc733 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Download</span> <span class="subtitle">Installieren Sie die neueste Wine-Version.</span> diff --git a/templates/en/download.template b/templates/en/download.template deleted file mode 100644 index 27351b6a..00000000 --- a/templates/en/download.template +++ /dev/null @@ -1,159 +0,0 @@ - - - -<h1 class="title">Wine Downloads</h1> - -<a name="crossover"></a> -<h2>Supported Wine</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">CrossOver</a></b> - is a polished version of Wine provided by <b><a href="https://www.codeweavers.com">CodeWeavers</a></b>. - CrossOver makes it easier to use Wine and CodeWeavers provides excellent technical support to its users. - All purchases of CrossOver are used to directly fund the developers working on Wine. So CrossOver is both a great way to get - support in using Wine and to support the Wine Project.<br> - CodeWeavers provides fully functional - <b><a href="https://www.codeweavers.com/products">trial versions of CrossOver</a></b>.</p> - <p class="small">This endorsement is the primary recognition that CodeWeavers has - requested in exchange for hosting the Wine web site.</p> - </div> -</div> - -<a name="binary"></a> -<h2>Wine Binary Packages</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - Latest stable release: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - Latest development release: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b>See the <a href="https://wiki.winehq.org/HowTo">installation and configuration how-to</a> for post-installation instructions.</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - WineHQ Binary Packages -</div> - -<p class="small margin-bottom-md text-right"><b>Maintainer:</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - These packages are built and supported by WineHQ.<br> - Please report any problems with them in <a href="http://bugs.winehq.org">WineHQ's bugzilla</a>. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - WineHQ binary packages for Ubuntu 14.04, 16.04, 16.10, 17.04, and 17.10</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - WineHQ binary packages for Debian Wheezy, Jessie, Stretch, Buster, and Sid</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - WineHQ binary packages for Fedora 24, 25, and 26 </p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - WineHQ binary packages for Mageia 6 </p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - WineHQ binary packages for macOS 10.8 and higher</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Distro Binary Packages -</div> - -<div class="whq-info-box center"> - These packages are built and supported by the distros.<br> - Please report any problems with them to the package maintainer. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - release binary and source .rpms and daily snapshot RPMs for all openSUSE versions (11.4 up to 13.2 and Leap 42.1) and SUSE Linux Enterprise 11 and 12.<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - binary txz (Slackware 14.2), and tgz (for older versions)<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - source for FreeBSD 5.3 or later<br> - <span class="small"><b>Maintainer:</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>3rd Party Tools</h2> - -<p>Sometimes a customization of Wine can cause an application to work, but this change cannot be incorporated into Wine for some reason. To help overcome current deficiencies in Wine, various third party applications for end users have been made over the years. These applications are entirely unsupported by the Wine developers, however you may find them useful. For more information, see <a href="https://wiki.winehq.org/ThirdPartyApplications">our wiki page</a> on third party applications.</p> - -<a name="source"></a> -<h2>Wine Source Downloads</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - Our official source release site. -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - For the latest development version. -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - Alternative download site for the official source and documentation tarballs. -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>Note:</b> See the <a href="https://wiki.winehq.org/Recommended_Packages">recommended packages</a> for help on configuring and building Wine. -</div> diff --git a/templates/en/home.template b/templates/en/home.template index b7735dff..d525e1a2 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Download</span> <span class="subtitle">Install the latest Wine.</span> diff --git a/templates/es/home.template b/templates/es/home.template index a96945e6..2577b447 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Descarga</span> <span class="subtitle">Instala la última versión de Wine.</span> diff --git a/templates/fr/download.template b/templates/fr/download.template deleted file mode 100644 index b8d89cfc..00000000 --- a/templates/fr/download.template +++ /dev/null @@ -1,178 +0,0 @@ - - - -<h1 class="title">Télécharger Wine</h1> - -<h2 style="margin-bottom: 10px;"><a name="crossover"></a>Wine avec support</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Produit</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Description</font></b></td> - </tr> - - <tr> - <td align="center" bgcolor="#ffffff"> - <a href="http://www.codeweavers.com/products/download_trial/"> - <img src="{$root}/images/distro/crossover.png" - width="50" height="50" alt="CrossOver Linux ou Mac" border="0"> - </a> - </td> - <td align="left" bgcolor="#ffffff"> - <b><a href="http://www.codeweavers.com/products/">CrossOver</a></b> - est une version affinée de Wine fournie par <b><a href="http://www.codeweavers.com">CodeWeavers</a></b>. -CrossOver facilite l'utilisation de Wine et fournit un excellent support -technique à ses utilisateurs. -Tous les achats de CrossOver sont utilisés pour financer directement les -développeurs travaillant sur Wine. Ainsi, CrossOver constitue à la fois un -excellent moyen d'obtenir du support lors de l'utilisation de Wine et un -soutien au projet Wine.<br>CodeWeavers fournit des - <b><a href="http://www.codeweavers.com/products/download_trial/">versions -d'évaluation de CrossOver</a></b> entièrement fonctionnelles. - </td> - </tr> -</table> - -<p class="small" align="center">Cet endossement est la principale exigence de -CodeWeavers en échange de l'hébergement du site web de Wine.</p> - - -<h2 style="margin-bottom: 5px;"><a name="binary"></a>Téléchargements binaires de Wine</h2> - -<table style="margin: 0 0 15px 0;" width="100%"> -<tr> - <td width="200">Dernière version stable :</td><td>Wine {$config_stable_release}</td> - <td rowspan="2" valign="top" style="padding-left: 20px; text-align: -center;"><b>Voyez la - <a href="https://wiki.winehq.org/HowTo">procédure d'installation et de configuration</a> - pour les instructions de post-installation.</b></td> -</tr> -<tr> - <td>Dernière version de développement :</td><td>Wine {$config_master_release}</td> -</tr> -</table> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small"></font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Paquets binaires WineHQ</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Maintenanceur</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"></td> - <td align="center"><b>Ces paquets sont construits et supportés par WineHQ.<br> - Veuillez rapporter tout problème rencontré (en anglais) dans le <a href="http://bugs.winehq.org">bugzilla de WineHQ</a>.</b> - </td> - <td></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"> - <img src="{$root}/images/winehq_logo_glass_sm.png" alt="WineHQ" border="0"> - </td> - <td> - <p><b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - paquets binaires WineHQ pour les branches de développement et <i>staging</i> pour Ubuntu 12.04, 14.04, 15.04, 15.10, 16.04</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - paquets binaires WineHQ pour les branches de développement et <i>staging</i> pour Debian Wheezy, Jessie, Stretchi et Sid</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - paquets binaires WineHQ pour les branches de développement et <i>staging</i> pour Fedora 22 and 23 </p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - paquets binaires WineHQ pour les branches de développement et <i>staging</i> pour Mageia 4 and 5</p> - <p><b>macOS</b> - - prévu ; pas encore disponible pour le téléchargement.</p> - <td><a href="mailto:michael@fds-team.de">Michael Müller</a></td> - </tr> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small"></font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Paquets binaires des distributions</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Maintenanceur</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"></td> - <td align="center"><b>Ces paquets sont construits et supportés par les distributions.<br> - Veuillez rapporter tout problème rencontré au maintenanceur du paquet.</b> - </td> - <td></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> - </td> - <td> <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - .rpm binaires et sources, et instantanés quotidiens pour toutes les versions de openSUSE - (11.4 jusqu'à 13.2 et Leap 42.1) et SUSE Linux Enterprise 11 et 12.<br> - </td> - <td><a href="mailto:meissner@suse.de">Marcus Meissner</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware Linux" border="0"></a> - </td> - <td> <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - .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> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> - </td> - <td> <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - code source pour FreeBSD 5.3 ou ultérieur</td> - <td><a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></td> - </tr> - -</table> - - -<h2 style="margin-bottom: 10px;"><a name="binary"></a>Outils tiers</h2> - -<p>Parfois, il arrive qu'une adaptation de Wine permette à une application de -fonctionner correctement, mais qu'elle ne puisse être incorporée à Wine pour une -raison quelconque. Pour pallier les imperfections actuelles de Wine, diverses -applications tierces pour utilisateurs finaux ont été conçues au fil des ans. -Les développeurs Wine ne supportent en aucun cas ces applications, mais -il se peut que vous les trouviez utiles. Pour plus d'informations, voyez notre page -wiki sur les <a -href="https://wiki.winehq.org/ThirdPartyApplications">applications tierces</a>.</p> - -<h2><a name="source"></a>Téléchargement des sources de Wine</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Emplacement</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Description</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> - <td> Site officiel de téléchargement. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="https://wiki.winehq.org/GitWine">source.winehq.org/git</a> </td> - <td> Version de développement la plus récente. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> - <td> Site de téléchargement alternatif pour les tarballs officiels de -sources et de documentation.</td> - </tr> - -</table> - -<div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; -background-color: #F0F0F0;"><b>Note:</b> Voyez les <a -href="https://wiki.winehq.org/Recommended_Packages">paquets recommandés</a> pour -de l'aide sur la configuration et la construction de Wine.</div> - diff --git a/templates/fr/home.template b/templates/fr/home.template index a0846b29..400c9de0 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Téléchargement</span> <span class="subtitle">Installez la dernière version de Wine.</span> diff --git a/templates/ko/download.template b/templates/ko/download.template deleted file mode 100644 index be114816..00000000 --- a/templates/ko/download.template +++ /dev/null @@ -1,159 +0,0 @@ - - - -<h1 class="title">와인 내려받기</h1> - -<a name="crossover"></a> -<h2>지원되는 와인판본</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">크로스오버</a></b>는 - <b><a href="https://www.codeweavers.com">CodeWeavers</a></b>가 제공하는 세련된 와인입니다. - 크로스오버는 사용하기 편리하며 CodeWeavers가 완벽한 기술 지원을 해줍니다. - 크로스오버 판매금은 전액 와인 개발자에게 돌아갑니다. 즉 크로스오버는 사용감과 와인 개발 지원이라는 두 마리 토끼를 한 번에 잡습니다 .<br> - CodeWeavers에서는 모든 기능을 갖춘 - <b><a href="https://www.codeweavers.com/products">크로스오버 체험판</a></b>을 제공합니다.</p> - <p class="small">본 광고는 CodeWeavers에서 누리집 호스팅을 맡으며한 제1의 요청입니다.</p> - </div> -</div> - -<a name="binary"></a> -<h2>와인 실행 파일 꾸러미</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - 최신 안정판 : - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">와인 {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - 최신 개발자판 : - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">와인 {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b><a href="https://wiki.winehq.org/HowTo">설치와 구성 방법</a>의 설치전 부분을 확인 하시기 바랍니다.</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - 와인HQ 실행파일 꾸러미 -</div> - -<p class="small margin-bottom-md text-right"><b>유지보수자 :</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - 이 꾸러미는 와인HQ에서 제작하고 지원합니다.<br> - <a href="http://bugs.winehq.org">와인HQ의 버그질라</a>에 오류를 보고해 주십시오. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="와인HQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - 우분투 14.04, 16.04, 16.10, 17.04, 17.10용 와인HQ 실행 파일</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - Debian Wheezy, Jessie, Stretch, Buster, Sid용 와인HQ 실행 파일</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - Fedora 24, 25, 26용 와인HQ 실행 파일</p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - Mageia 6용 와인HQ 실행 파일</p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - macOS 10.8 및 이상판용 와인HQ 실행 파일</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - 배포판 와인 실행파일 -</div> - -<div class="whq-info-box center"> - 이 꾸러미는 각 배포판이 제작하고 지원합니다.<br> - 각 꾸러미 유지보수자에게 오류 보고를 해주시기 바랍니다. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - 배포되는 실행파일과 원시 부호입니다. 모든 openSUSE판용 RPM 패키지 매니저 (11.4 up to 13.2 and Leap 42.1)와 SUSE Linux 기업용11과 12를 지원합니다.<br> - <span class="small"><b>유지보수부 :</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - 실행용 txz (Slackware 14.2)와 tgz (이전판용)<br> - <span class="small"><b>유지보수 :</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - FreeBSD 5.3및 이후판용 원시 부호<br> - <span class="small"><b>유지보수 :</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>제3 도구</h2> - -<p>일부 개작된 와인은 일부 응용 무른모를 동작시킬 수 있으나, 몇몇 이유로 공식 승인을 받지 않았습니다. 현 와인의 부족한 점을 채우기 위해, 여러 제3의 응용 무른모가 최종 사용자를 위해 수년간 개발되었습니다. -이 응용 무른모들은 와인 개발진이 지원하지 않으나, 여러분이 편리하게 이용하실 수 있습니다. -더 많은 정보는 <a href="https://wiki.winehq.org/ThirdPartyApplications">위키</a>에서 확인 할 수 있습니다.</p> - -<a name="source"></a> -<h2>와인 부호 내려받기</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - 저희 공식 부호 배포 누리집 입니다. -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - 최신 개발자판 입니다. -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - 공식 부호와 tar로 압축된 문서를 내려받을 수 있는 대체 누리집 입니다. -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>일러두기 :</b> <a href="https://wiki.winehq.org/Recommended_Packages">권장 꾸러미</a>를 확인하여 와인 설치와 구성에 관한 도움을 얻을 수 있습니다. -</div> diff --git a/templates/ko/home.template b/templates/ko/home.template index be8359b6..70b14ee9 100644 --- a/templates/ko/home.template +++ b/templates/ko/home.template @@ -53,7 +53,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">내려받기</span> <span class="subtitle">최신판 와인 설치하기</span> diff --git a/templates/pl/download.template b/templates/pl/download.template deleted file mode 100644 index 71972b67..00000000 --- a/templates/pl/download.template +++ /dev/null @@ -1,159 +0,0 @@ - - - -<h1 class="title">Pobieralnia Wine</h1> - -<h2 style="margin-bottom: 10px;"><a name="crossover"></a>Wine ze wsparciem technicznym</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Produkt</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Opis</font></b></td> - </tr> - - <tr> - <td align="center" bgcolor="#ffffff"> - <a href="http://www.codeweavers.com/products/download_trial/"> - <img src="{$root}/images/distro/crossover.png" - width="50" height="50" alt="CrossOver Linux or Mac" border="0"> - </a> - </td> - <td align="left" bgcolor="#ffffff"> - <b><a href="http://www.codeweavers.com/products/">CrossOver</a></b> - jest bardziej dopracowaną wersją Wine dostarczaną przez <b><a href="http://www.codeweavers.com">CodeWeavers</a></b>. - CrossOver usprawnia używanie Wine, a CodeWeavers zapewnia wspaniałe wsparcie techniczne swoim użytkownikom. - Wszystkie fundusze ze sprzedaży CrossOvera są przekazywane bezpośrednio na wsparcie dla programistów pracujących nad Wine. - Tak więc CrossOver jest idealną drogą do uzyskania wsparcia jak również do wspierania Projektu Wine. CodeWeavers dostarcza w pełni funkcjonalną - <b><a href="http://www.codeweavers.com/products/download_trial/">wersję trialową CrossOver</a></b>. - </td> - </tr> -</table> - -<p class="small" align="center">Ta rekomendacja jest głównym dowodem uznania wymaganym przez CodeWeavers w zamian za hostowanie strony Wine.</p> - - -<h2 style="margin-bottom: 5px;"><a name="binary"></a>Pobieralnia binariów Wine</h2> - -<table style="margin: 0 0 15px 0;" width="100%"> -<tr> - <td width="200">Najnowsze stabilne wydanie:</td><td>Wine {$config_stable_release}</td> - <td rowspan="2" valign="top" style="padding-left: 20px; text-align: center;"><b>Zajrzyj do - <a href="https://wiki.winehq.org/HowTo">samouczka konfiguracji i instalacji</a> - , aby zaznajomić się z czynnościami po-instalacyjnymi.</b></td> -</tr> -<tr> - <td>Najnowsze rozwojowe wydanie:</td><td>Wine {$config_master_release}</td> -</tr> -</table> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">System</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Uwagi</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Opiekun</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/ubuntu"> - <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> - </td> - <td> <b><a href="{$root}/download/ubuntu">Pobierz paczki dla Ubuntu</a></b> - - binarne i źródłowe paczki .deb dla Ubuntu</td> - <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/debian"> - <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> - </td> - <td> <b><a href="{$root}/download/debian">Pobierz paczki dla Debian</a></b> - - binarne paczki .deb dla Debian</td> - <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> - <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> - </td> - <td> <b><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Pobierz paczki dla Red Hat / CentOS / Fedora</a></b> - - binarne i źródłowe paczki .rpm dla Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 i - kompatybilnych dystrybucji. - Meta paczka Wine jest dostępna przez <tt>yum</tt> - dzięki repozytorium EPEL / Fedora Extras / Fedora poprzez wpisanie w terminalu <tt>$ yum install - wine </tt>" - </td> - <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> - </td> - <td> <b><a href="http://en.opensuse.org/Wine#Repositories">Pobierz paczki dla SUSE</a></b> - - binarne i źródłowe paczki .rpm oraz dzienne zrzuty dla openSUSE 11.4 - 13.2 i SUSE Linux Enterprise 11.<br> - </td> - <td><a href="mailto:meissner@suse.de">Marcus Meissner</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> - </td> - <td> <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Pobierz paczki dla Slackware</a></b> - - binarne paczki txz (Slackware 14.2), i tgz (dla starszych wersji)</td> - <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> - </td> - <td> <b><a href="http://www.freshports.org/emulators/wine/">Pobierz paczki dla FreeBSD</a></b> - - źródło dla FreeBSD 5.3 lub późniejszych</td> - <td><a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></td> - </tr> - -</table> - - -<h2 style="margin-bottom: 10px;"><a name="binary"></a>Aplikacje osób trzecich</h2> - -<p>Czasami pewne zmiany Wine mogą sprawić, -że aplikacja będzie działać, ale z pewnych powodów zmiany te nie -mogą być wcielone do Wine. Stworzono różne aplikacje (tzw. -aplikacje osób trzecich), aby pomóc przezwyciężyć niedobory w -Wine. Aplikacje te są całkowicie niewspierane przez programistów -Wine, jednakże mogą ci się przydać. Aby dowiedzieć się więcej, -odwiedź <a href="https://wiki.winehq.org/ThirdPartyApplications">naszą -stronę wiki</a> w poszukiwaniu aplikacji osób trzecich.</p> - -<h2><a name="source"></a>Pobieralnia źródeł Wine</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Położenie</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Opis</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> - <td> Nasza oficjalna strona źródeł. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="https://wiki.winehq.org/GitWine">source.winehq.org/git</a> </td> - <td> Do najnowszych wydań rozwojowych. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> - <td> Alternatywna strona z oficjalnymi źródłami i dokumentacją. </td> - </tr> - -</table> - -<div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; background-color: #F0F0F0;"><b>Notka:</b> Zobacz <a href="https://wiki.winehq.org/Recommended_Packages">zalecane paczki</a> , aby uzyskać pomoc przy konfiguracji i kompilacji Wine.</div> - diff --git a/templates/pl/home.template b/templates/pl/home.template index a6318211..f068c277 100644 --- a/templates/pl/home.template +++ b/templates/pl/home.template @@ -53,7 +53,7 @@ za to z wyglądem podobnym do innych aplikacji na twoim komputerze.</p> <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Pobieralnia</span> <span class="subtitle">Wgraj sobie najnowsze Wine.</span> diff --git a/templates/pt/download.template b/templates/pt/download.template deleted file mode 100644 index 510cfb34..00000000 --- a/templates/pt/download.template +++ /dev/null @@ -1,162 +0,0 @@ - - - -<h1 class="title">Downloads do Wine</h1> - -<a name="crossover"></a> -<h2>Wine com Suporte</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">CrossOver</a></b> - é uma versão mais polida do Wine fornecida pela empresa <b><a href="https://www.codeweavers.com">CodeWeavers</a></b>. - CrossOver torna mais fácil o uso do Wine e a CodeWeavers provê um excelente suporte técnico para seus usuários. - Todas as compras do CrossOver são usados para financiar diretamente os desenvolvedores trabalhando no Wine. - Logo, Crossover é ao mesmo tempo uma ótima maneira de utilizar o Wine e apoior o projeto. - A CodeWeavers oferece - <b><a href="https://www.codeweavers.com/products">versões de demonstração do CrossOver</a></b> - totalmente funcionais.</p> - <p class="small">Este endosso é o reconhecimento que a CodeWeavers solicitou em troca da hospedagem do site do Wine.</p> - </div> -</div> - -<a name="binary"></a> -<h2>Pacotes Binários do Wine</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - Última versão estável: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - Última versão de desenvolvimento: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b>Leia o <a href="https://wiki.winehq.org/HowTo">how-to de instalação e configuração</a> para instruções pós-instalação.</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Pacotes binários fornecidos pelo WineHQ -</div> - -<p class="small margin-bottom-md text-right"><b>Maintainer:</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - Pacotes construídos e com suporte do WineHQ.<br> - Por favor, reporte qualquer problema encontrado neles no <a href="http://bugs.winehq.org">bugzilla do WineHQ</a>. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - Pacotes binários do WineHQ para versões de desenvolvimento e staging para Ubuntu 12.04, 14.04, 15.04, 15.10 e 16.04</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - Pacotes binários do WineHQ para versões de desenvolvimento e staging para Debian Wheezy, Jessie, Stretch e Sid</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - Pacotes binários do WineHQ para versões de desenvolvimento e staging para Fedora 22, 23 e 24</p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - Pacotes binários do WineHQ para versões de desenvolvimento e staging para Mageia 4 e 5</p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - Pacotes binários do WineHQ para versões de desenvolvimento e staging para macOS 10.8 e superior</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Pacotes Binários de Distruições -</div> - -<div class="whq-info-box center"> - Esses pacotes são construídos e suportados pelas distribuições.<br> - Por favor, reporte qualquer problema encontrado para o respectivo mantenedor do pacote. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - lançamento binário e código-fonte em .rpms e snapshots diários em RPMs para todos openSUSE versões (11.4 até 13.2 e Leap 42.1) e SUSE Linux Enterprise 11 e 12.<br> - <span class="small"><b>Mantenedor:</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - txz binário (Slackware 14.2), e tgz (para versões mais antigas)<br> - <span class="small"><b>Mantenedor:</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - código-fonte para FreeBSD 5.3 ou superior<br> - <span class="small"><b>Mantenedor:</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>Ferramentas de Terceiros</h2> - -<p>Algumas vezes uma personalização do Wine pode fazer um aplicativo funcionar, mas está mudança não pode ser incorporada no Wine por alguma razão. -Para ajudar a superar essas deficiências no Wine várias ferramentas de terceiros para usuários finais foram criadas ao longo dos anos. -Esses aplicativos são completamente NÃO suportados pelos desenvolvedores do Wine, apesar disso você pode achar neles alguma utilidade. -Para mais informações veja<a href="https://wiki.winehq.org/ThirdPartyApplications">nossa página wiki</a> sobre ferramentas de terceiros.</p> - -<a name="source"></a> -<h2>Download de código-fonte</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - Nosso site oficial para lançamentos. -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - Para a última versão em desenvolvimento. -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - Site alternativo para downloads do código-fonte oficial e documentação em formato tar. -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>Nota:</b> Veja a lista de <a href="https://wiki.winehq.org/Recommended_Packages">pacotes recomendados</a> para ajuda para configurar ou compilar o Wine. -</div> diff --git a/templates/pt/home.template b/templates/pt/home.template index 85bdaf50..ad6c8340 100644 --- a/templates/pt/home.template +++ b/templates/pt/home.template @@ -53,7 +53,7 @@ com um visual semelhante às outras aplicações do seu computador.</p> <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Download</span> <span class="subtitle">Instale a última versão do Wine.</span> diff --git a/templates/tr/download.template b/templates/tr/download.template deleted file mode 100644 index ce09d364..00000000 --- a/templates/tr/download.template +++ /dev/null @@ -1,149 +0,0 @@ - - - -<h1 class="title">Wine İndirmeleri</h1> - -<h2 style="margin-bottom: 10px;"><a name="crossover"></a>Destekli Wine</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Ürün</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Tanım</font></b></td> - </tr> - - <tr> - <td align="center" bgcolor="#ffffff"> - <a href="http://www.codeweavers.com/products/download_trial/"> - <img src="{$root}/images/distro/crossover.png" - width="50" height="50" alt="CrossOver Linux veya Mac" border="0"> - </a> - </td> - <td align="left" bgcolor="#ffffff"> - <b><a href="http://www.codeweavers.com/products/">CrossOver</a></b> - Wine'ın <b><a href="http://www.codeweavers.com">CodeWeavers</a></b> tarafından sağlanan parlatılmış sürümüdür. - CrossOver, Wine'ı daha kolay kullanmayı kılar ve CodeWeavers kullanıcılarına mükemmel teknik destek sunar. - CrossOver için yapılmış tüm ödemeler, doğrudan Wine üzerinde çalışan geliştiricilere gönderilir. Bu yüzden CrossOver, Wine kullanımına destek almak ve Wine Projesine destek olmak için mükemmel bir yoldur. CodeWeavers tam özellikli - <b><a href="http://www.codeweavers.com/products/download_trial/">CrossOver deneme sürümünü</a></b> sağlamaktadır. - </td> - </tr> -</table> - -<p class="small" align="center">Bu açıklama, CodeWeavers'ın Wine web sitesine ev sahipliği yapmak için istediği birincil algılama değişikliğidir.</p> - - -<h2 style="margin-bottom: 5px;"><a name="binary"></a>Wine İkili İndirmeleri</h2> - -<table style="margin: 0 0 15px 0;" width="100%"> -<tr> - <td width="200">Son kararlı sürüm:</td><td>Wine {$config_stable_release}</td> - <td rowspan="2" valign="top" style="padding-left: 20px; text-align: center;"><b>Kurulum sonrası talimatları için - <a href="https://wiki.winehq.org/HowTo">kurulum ve yapılandırma nasıl yapılır</a> - sayfasına bakın.</b></td> -</tr> -<tr> - <td>Son geliştirme sürümü:</td><td>Wine {$config_master_release}</td> -</tr> -</table> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Sistem</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Notlar</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Bakımcı</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/ubuntu"> - <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> - </td> - <td> <b><a href="{$root}/download/ubuntu">Ubuntu paketleri indirin</a></b> - - Ubuntu için .debs ikili ve kaynak paketi - <td><a href="mailto:scottritchie@ubuntu.com">Scott Ritchie</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="{$root}/download/debian"> - <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> - </td> - <td> <b><a href="{$root}/download/debian">Debian paketleri indirin</a></b> - - Debian için ikili .deb dosyaları</td> - <td><a href="mailto:pkg-wine-party@lists.alioth.debian.org">Debian Wine Party</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> - <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="Red Hat Linux" border="0"></a> - </td> - <td> <b><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine">Red Hat / CentOS / Fedora paketleri indirin</a></b> - - Red Hat Enterprise Linux 5, 6; CentOS 5, 6; Fedora Linux 16, 17 ve uyumlu dağıtımlar için ikili ve kaynak .rpms dosyaları - Wine üst paketi <tt>yum</tt> aracılığıyla <tt>$ yum install - wine </tt> çalıştırılarak EPEL / Fedora Extras / Fedora deposundan alınabilir. - </td> - <td><a href="mailto:andreas.bierfert_at_lowlatency.de">Andreas Bierfert</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" width="50" height="50" alt="SUSE Linux" border="0"></a> - </td> - <td> <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE paketleri indirin</a></b> - - sürüm ikili ve kaynak .rpm dosyaları ve günlük RPM derlemeleri. openSUSE 11.4 - 13.2 ve SUSE Linux Enterprise 11 için.<br> - </td> - <td><a href="mailto:meissner@suse.de">Marcus Meissner</a></td> - </tr> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> - </td> - <td> <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware paketleri indirin</a></b> - - 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> - - <tr bgcolor="#ffffff"> - <td align="center"><a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> - </td> - <td> <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD paketleri indirin</a></b> - - FreeBSD 5.3 ve sonrası için kaynaklar</td> - <td><a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></td> - </tr> - -</table> - - -<h2 style="margin-bottom: 10px;"><a name="binary"></a>3. Parti Araçlar</h2> - -<p>Bazen bir Wine özelleştirmesi bir uygulamanın çalışmasını sağlarken, bazı nedenlerden dolayı Wine içerisine katılamayabilir. Bu, Wine içerisindeki güncel sorunları önlemek adına son kullanıcılar için çeşitli üçünkü parti uygulamalar yıllardır geliştirilmektedir. Bu uygulamalar Wine geliştiricileri tarafından desteklenmemektedir ancak kullanışlı olabilirler. Daha fazla bilgi için üçüncü parti yazılımlara ayrılmış <a href="https://wiki.winehq.org/ThirdPartyApplications">wiki sayfamıza</a> bakmanızı öneriririz.</p> - -<h2><a name="source"></a>Wine Kaynak Dosyalar</h2> - -<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> - - <tr> - <td align="center" bgcolor="black"><b><font color="white" class="small">Konum</font></b></td> - <td align="center" bgcolor="black"><b><font color="white" class="small">Açıklama</font></b></td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> - <td> Resmi kaynak yayın sitemiz. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td> <a href="https://wiki.winehq.org/GitWine">source.winehq.org/git</a> </td> - <td> Son geliştirme sürümü için. </td> - </tr> - - <tr bgcolor="#ffffff"> - <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> - <td> Resmi kaynak ve belgeler için alternatif indirme sitesi. </td> - </tr> - -</table> - -<div style="margin: 10px; padding: 5px; border: 1px solid #C0C0C0; background-color: #F0F0F0;"><b>Not:</b> Wine yapılandırması ve derlemesi hakkında yardım için <a href="https://wiki.winehq.org/Recommended_Packages">önerilen paketler</a> sayfasına bakın.</div> - diff --git a/templates/tr/home.template b/templates/tr/home.template index 81bf2c3d..1da7bd83 100644 --- a/templates/tr/home.template +++ b/templates/tr/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">İndir</span> <span class="subtitle">Wine yükleyin.</span> diff --git a/templates/uk/download.template b/templates/uk/download.template deleted file mode 100644 index feb738ad..00000000 --- a/templates/uk/download.template +++ /dev/null @@ -1,153 +0,0 @@ - - - -<h1 class="title">Завантаження Wine</h1> - -<a name="crossover"></a> -<h2>Підтримка Wine</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">CrossOver</a></b> - це допрацьована версія Wine від <b><a href="https://www.codeweavers.com">CodeWeavers</a></b>. З CrossOver зручніше використовувати Wine, крім того CodeWeavers забезпечують чудову технічну підтримку своїм користувачам. Всі покупки зроблені через CrossOver напряму підтримують розробників, що працюють над Wine. Тож CrossOver це гарна можливість отримати підтримку у використанні Wine та надати підтримку Wine, як проекту.<br>Ви можете <b><a href="https://www.codeweavers.com/products">завантажити повнофункціональну пробну версію CrossOver</a></b>.</p> - <p class="small">Наявність цієї реклами - головна вимога від CodeWeavers за те, що вони хостять вебсайт Wine.</p> - </div> -</div> - -<a name="binary"></a> -<h2>Завантаження готових пакунків Wine</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - Останній стабільний реліз: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - Останній розробницький реліз: - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b>Щоб отримати післяінсталяційні інструкції, дивіться <a href="https://wiki.winehq.org/HowTo">інструкцію по інсталяції та конфігурації</a>.</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Готові пакунки -</div> - -<p class="small margin-bottom-md text-right"><b>Супроводжувач:</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - Ці пакунки побудовані та підтримуються WineHQ.<br> - При винекненні проблем, будь ласка, повідомляйте до <a href="http://bugs.winehq.org">WineHQ's bugzilla</a>. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - Готові пакунки WineHQ для Ubuntu 14.04, 16.04, 16.10, 17.04</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - Готові пакунки WineHQ для Debian Wheezy, Jessie, Stretch, Sid</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - Готові пакунки WineHQ для Fedora 24, 25 та новіших версій</p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - Готові пакунки WineHQ для Mageia 5</p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - Готові пакунки WineHQ для macOS 10.8 та новіших версій</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - Готові дистрибутивні пакунки -</div> - -<div class="whq-info-box center"> - Ці пакунки побудовані та підтримуються супроводжувачами дистрибутива.<br> - При винекненні проблем, будь ласка, повідомляйте супроводжувачам пакунку. -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - бінарні та вихідні .rpms та щоденні RPMs знімки для всіх версій openSUSE (від 11.4 до 13.2 та Leap 42.1) і SUSE Linux Enterprise 11 та 12.<br> - <span class="small"><b>Супроводжувач:</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - бінарні txz (Slackware 14.2) та tgz (для старіших версій)<br> - <span class="small"><b>Супроводжувач:</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - вихідні файли для FreeBSD 5.3 або пізніших версій<br> - <span class="small"><b>Супроводжувач:</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>Сторонні додатки</h2> - -<p>Інколи модифікація Wine може призвести до того, що якась програма запрацює, та ця модифікація не може бути застосована до основної версії Wine з певних причин. За роки існування для усунення існуючих недоліків Wine було створено багато сторонніх програм. Ці програми ніяк не підтримуються безпосередніми розробниками Wine, але все ж, вони можуть стати вам в нагоді. Детальну інформацією дивіться на <a href="https://wiki.winehq.org/ThirdPartyApplications">нашій вікі-сторінці</a>.</p> - -<a name="source"></a> -<h2>Завантажити вихідний код Wine</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - Наш офіційний сайт. -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - Останні розробницькі версії. -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - Альтернативний сайт для завантаження вихідних файлів та документації. -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>Примітка:</b> Дивіться <a href="https://wiki.winehq.org/Recommended_Packages">рекомендовані пакунки</a> для допомоги при конфігурації та побудові Wine. -</div> diff --git a/templates/uk/home.template b/templates/uk/home.template index 4acd3a7d..ace895cc 100644 --- a/templates/uk/home.template +++ b/templates/uk/home.template @@ -49,7 +49,7 @@ <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">Завантажити</span> <span class="subtitle">Встановити останню версію Wine.</span> diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template deleted file mode 100644 index a372d441..00000000 --- a/templates/zh-cn/download.template +++ /dev/null @@ -1,159 +0,0 @@ - - - -<h1 class="title">下载 Wine</h1> - -<a name="crossover"></a> -<h2>被支持的 Wine</h2> - -<div class="row"> - <div class="col-xs-3 col-sm-2 col-lg-1"> - <a href="https://www.codeweavers.com/products"> - <img src="{$root}/images/distro/crossover_swoosh.png" alt="CrossOver Linux or Mac" class="fill-width"> - </a> - </div> - <div class="col-xs-9 col-sm-10 col-lg-11"> - <p><b><a href="https://www.codeweavers.com/products">CrossOver</a></b> - 是由 <b><a href="https://www.codeweavers.com">CodeWeavers</a></b> 提供的一个经过打磨的 Wine。 - CrossOver 使得 Wine 更易于使用，同时 CodeWeavers 为用户提供了极好的技术支持。 - 所有 CrossOver 的销售收入都将被直接用于支持 Wine 开发者。所以使用 CrossOver 可谓一举两得，既可以得到使用 Wine 的帮助， - 又可以支持 Wine 项目。<br> - CodeWeavers 提供全功能的 - <b><a href="https://www.codeweavers.com/products">CrossOver 试用版</a></b>。</p> - <p class="small">This endorsement is the primary recognition that CodeWeavers has - requested in exchange for hosting the Wine web site.</p> - </div> -</div> - -<a name="binary"></a> -<h2>Wine 安装包下载</h2> - -<div class="row"> - <div class="col-md-4"> - <div class="row"> - <div class="col-md-9"> - 最新稳定版： - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a> - </div> - </div> - <div class="row margin-top-sm"> - <div class="col-md-9"> - 最新开发版： - </div> - <div class="col-md-3"> - <a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a> - </div> - </div> - </div> - <div class="col-md-1"></div> - <div class="col-md-7"> - <div class="whq-info-box center"> - <span class="glyphicon glyphicon-info-sign big pull-left text-muted"></span> - <b>查看 <a href="https://wiki.winehq.org/HowTo">installation and configuration how-to</a> 获取快速安装说明。</b> - </div> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - WineHQ 提供的安装包 -</div> - -<p class="small margin-bottom-md text-right"><b>维护者:</b> <a href="mailto:michael@fds-team.de">Michael Müller</a></p> - -<div class="whq-info-box center"> - 这些安装包由 WineHQ 构建并提供支持。<br> - 如果您在使用过程发现问题，请提交到 <a href="http://bugs.winehq.org">WineHQ 的 bugzilla</a>。 -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-md-2 hidden-xs hidden-sm padding-lg"><img src="{$root}/images/winehq_logo_glass.png" alt="WineHQ" class="fill-width"></div> - <div class="col-md-10"> - <b><a href="https://wiki.winehq.org/Ubuntu">Ubuntu</a></b> - - 适用于 Ubuntu 14.04、16.04、16.10 和 17.04 的 WineHQ 安装包</p> - <p><b><a href="https://wiki.winehq.org/Debian">Debian</a></b> - - 适用于 Debian Wheezy、Jessie、Stretch 和 Sid 的 WineHQ 安装包</p> - <p><b><a href="https://wiki.winehq.org/Fedora">Fedora</a></b> - - 适用于 Fedora 24 和 25 的 WineHQ 安装包</p> - <p><b><a href="https://wiki.winehq.org/Mageia">Mageia</a></b> - - 适用于 Mageia 5 的 WineHQ 安装包</p> - <p><b><a href="https://wiki.winehq.org/MacOSX">macOS</a></b> - - 适用于 macOS 10.8 或更新版本的 WineHQ 安装包</p> - </div> -</div> - -<div class="small black inverse bold center margin-top-lg cornerround padding-md"> - 由发行版提供的安装包 -</div> - -<div class="whq-info-box center"> - 这些安装包由各发行版构建并提供支持。<br> - 如果您在使用过程发现问题，请提交给打包的维护者。 -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://en.opensuse.org/Wine#Repositories"> - <img src="{$root}/images/distro/suse.png" alt="SUSE Linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://en.opensuse.org/Wine#Repositories">SUSE</a></b> - - 供给所有版本的 openSUSE（11.4 到 13.2 和 Leap 42.1）和 SUSE Linux Enterprise 11、12 的安装包、.rmps 源码包及每日构建 RPMs。<br> - <span class="small"><b>维护者：</b> <a href="mailto:meissner@suse.de">Marcus Meissner</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…"> - <img src="{$root}/images/distro/slackware.png" alt="Slackware linux"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://sourceforge.net/projects/wine/files/Slackware%20Packages/">Slackware</a></b> - - txz 安装包（Slackware 14.2）和 tgz（供给旧版本 Slackware）<br> - <span class="small"><b>维护者：</b> <a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></span> - </div> -</div> - -<div class="row margin-md margin-top-lg"> - <div class="col-xs-2 center"> - <a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" alt="FreeBSD"> - </a> - </div> - <div class="col-xs-10"> - <b><a href="http://www.freshports.org/emulators/wine/">FreeBSD</a></b> - - 供给 FreeBSD 5.3 或更新版本的软件源<br> - <span class="small"><b>维护者：</b> <a href="mailto:gerald@pfeifer.com">Gerald Pfeifer</a></span> - </div> -</div> - - -<a name="binary"></a> -<h2>第三方工具</h2> - -<p>有时候，一个经过修改的 Wine 可以让一个应用程序工作，但由于种种原因这些修改并没有被合并到 Wine 中。同时为了克服 Wine 的不足，这些年来出现了许多面向终端用户的第三方工具。然而这些第三方应用都是不被 Wine 开发者提供支持的，虽然有时候他们对您很有用。更多相关内容，请查看我们 <a href="https://wiki.winehq.org/ThirdPartyApplications">关于第三方应用</a> 的 wiki 页面。</p> - -<a name="source"></a> -<h2>Wine Source Downloads</h2> - -<p> - <a href="//dl.winehq.org/wine/source/" class="bold">winehq.org</a><br> - 官方源码发布网站。 -</p> -<p> - <a href="https://wiki.winehq.org/GitWine" class="bold">source.winehq.org/git</a><br> - 获取最新开发版。 -</p> -<p> - <a href="http://mirrors.ibiblio.org/wine/source/" class="bold">ibiblio.org</a><br> - 备选官方源码和文档打包下载网站。 -</p> - -<div class="whq-info-box"> - <span class="glyphicon glyphicon-info-sign text-muted"></span> - <b>注意：</b>查看 <a href="https://wiki.winehq.org/Recommended_Packages">recommended packages</a> 获取配置和构建 Wine 的帮助。 -</div> diff --git a/templates/zh-cn/home.template b/templates/zh-cn/home.template index f0df5d5f..a7c9ecce 100644 --- a/templates/zh-cn/home.template +++ b/templates/zh-cn/home.template @@ -50,7 +50,7 @@ Wine 不是像虚拟机或者模拟器一样模仿内部的 Windows 逻辑，而 <div class="whq-page-container winehq_menu fill-height"> - <a class="winehq_menu_item dl" href="{$root}/download"> + <a class="winehq_menu_item dl" href="https://wiki.winehq.org/Download"> <span class="icon"></span> <span class="title">下载</span> <span class="subtitle">安装最新版的 Wine.</span> -- 2.12.3

1 0

[PATCH 1/4] user32: Make it possible to created windows for redirected classes
by Nikolay Sivov 31 Jan '18

31 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/class.c | 2 +- dlls/user32/user_private.h | 2 ++ dlls/user32/win.c | 7 +++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 8aa568dde3..a70bcb1a04 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -325,7 +325,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -static const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 0ffdcddfef..bf0e3c7626 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -269,6 +269,8 @@ extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM w extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; +extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname) DECLSPEC_HIDDEN; + /* message spy definitions */ #define SPY_DISPATCHMESSAGE 0x0100 diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 382ca1086e..c3360f9f86 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1333,13 +1333,16 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, RECT rect; WND *wndPtr; HWND hwnd, parent, owner, top_child = 0; + const WCHAR *p = className; MDICREATESTRUCTW mdi_cs; CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - TRACE("%s %s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", + className = CLASS_GetVersionedName(className); + + TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), - debugstr_w(className), + debugstr_w(p), p != className ? "->" : "", p != className ? debugstr_w(className) : "", cs->dwExStyle, cs->style, cs->x, cs->y, cs->cx, cs->cy, cs->hwndParent, cs->hMenu, cs->hInstance, cs->lpCreateParams ); if(TRACE_ON(win)) dump_window_styles( cs->style, cs->dwExStyle ); -- 2.15.1

2 4

Re: [PATCH] user32: Allow mouse messages to land on windows below top-level HTTRANSPARENT windows.
by Alexandre Julliard 31 Jan '18

31 Jan '18

Huw Davies <huw(a)codeweavers.com> writes: > @@ -2502,7 +2502,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H > } > else > { > - msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest ); > + msg->hwnd = WINPOS_WindowFromPoint( 0, msg->pt, &hittest ); In general we want to trust the X11 window information over the wineserver. In particular I don't think we want to send a mouse click to some unrelated window that may be behind another X11 window. Also note that the same patch in staging has been reported to cause regressions. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH resend 1/2] user32: Kill focus before minimizing a window.
by Zebediah Figura 31 Jan '18

31 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Initial version was dependent on some patches in my local tree; sorry for the spam. dlls/user32/tests/win.c | 31 ++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 ++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f492ecc..917ab61 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3113,7 +3113,6 @@ todo_wine ShowWindow(hwnd, SW_SHOWMINIMIZED); ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); ok( GetFocus() != child, "Focus should not be on child %p\n", child ); -todo_wine ok( GetFocus() != hwnd, "Focus should not be on parent %p\n", hwnd ); old_wnd_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); ShowWindow(hwnd, SW_RESTORE); @@ -10071,6 +10070,13 @@ static void test_minimize_window(HWND hwndMain) ShowWindow(hwnd2, SW_RESTORE); check_active_state(hwnd2, hwnd2, hwnd2); + /* try SW_SHOWMINIMIZED */ + ShowWindow(hwnd2, SW_SHOWMINIMIZED); + check_active_state(hwnd2, hwnd2, 0); + + ShowWindow(hwnd2, SW_RESTORE); + check_active_state(hwnd2, hwnd2, hwnd2); + /* hide a non-active window */ ShowWindow(hwnd, SW_MINIMIZE); check_active_state(hwnd2, hwnd2, hwnd2); @@ -10114,6 +10120,11 @@ static void test_minimize_window(HWND hwndMain) todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd3, hwnd3, 0); + /* hide an owner window */ ShowWindow(hwnd, SW_RESTORE); ShowWindow(hwnd2, SW_RESTORE); @@ -10123,6 +10134,24 @@ static void test_minimize_window(HWND hwndMain) check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd3); + + /* test a child window - focus should be yielded back to the parent */ + ShowWindow(hwnd, SW_RESTORE); + hwnd3 = CreateWindowExA(0, "MainWindowClass", "Child window 3", WS_CHILD|WS_VISIBLE, + 100, 100, 200, 200, hwnd, 0, GetModuleHandleA(NULL), NULL); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_MINIMIZE); + check_active_state(hwnd, hwnd, hwnd); + + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd, hwnd, hwnd); + + DestroyWindow(hwnd3); DestroyWindow(hwnd2); DestroyWindow(hwnd); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 10f0fd0..c1b55b5 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -983,6 +983,14 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (IsZoomed( hwnd )) win_set_flags( hwnd, WIN_RESTORE_MAX, 0 ); else win_set_flags( hwnd, 0, WIN_RESTORE_MAX ); + if (GetFocus() == hwnd) + { + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) + SetFocus(GetAncestor(hwnd, GA_PARENT)); + else + SetFocus(0); + } + old_style = WIN_SetStyle( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); wpl.ptMinPosition = WINPOS_FindIconPos( hwnd, wpl.ptMinPosition ); -- 2.7.4

3 4

[PATCH] dbghelp: Use correct module name buffer length when doing enumeration
by Nikolay Sivov 31 Jan '18

31 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Manually tested on Windows. dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 684111c86c..f37991dacd 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -353,6 +353,7 @@ struct module { struct process* process; IMAGEHLP_MODULEW64 module; + WCHAR modulename[64]; /* used for enumeration */ struct module* next; enum module_type type : 16; unsigned short is_virtual : 1; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 6c7f2dcb6d..9f90d5e0ca 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -102,6 +102,7 @@ void module_set_module(struct module* module, const WCHAR* name) { module_fill_module(name, module->module.ModuleName, sizeof(module->module.ModuleName) / sizeof(module->module.ModuleName[0])); + module_fill_module(name, module->modulename, sizeof(module->modulename) / sizeof(module->modulename[0])); } const WCHAR *get_wine_loader_name(void) @@ -812,7 +813,7 @@ BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, if (!(dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) && (module->type == DMT_ELF || module->type == DMT_MACHO)) continue; - if (!EnumModulesCallback(module->module.ModuleName, + if (!EnumModulesCallback(module->modulename, module->module.BaseOfImage, UserContext)) break; } -- 2.15.1

1 0

[PATCH 6/6] d2d1: Use d2d_array_reserve() in d2d_clip_stack_push().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 30 ++++++++++++++++++++++++++++-- dlls/d2d1/geometry.c | 27 --------------------------- dlls/d2d1/render_target.c | 17 ++--------------- 3 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2c10252..07f71a0 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -62,8 +62,8 @@ extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; struct d2d_clip_stack { D2D1_RECT_F *stack; - unsigned int size; - unsigned int count; + size_t size; + size_t count; }; struct d2d_error_state @@ -486,6 +486,32 @@ static inline void *d2d_calloc(size_t count, size_t size) return heap_alloc(s); } +static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) { D2D_MATRIX_3X2_F tmp = *a; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index c805084..4a2f7d7 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -562,33 +562,6 @@ static void d2d_rect_get_bezier_segment_bounds(D2D_RECT_F *bounds, const D2D1_PO d2d_rect_get_bezier_bounds(bounds, &q[0], &q[1], &q[2]); } -static BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) -{ - size_t new_capacity, max_capacity; - void *new_elements; - - if (element_count <= *capacity) - return TRUE; - - max_capacity = ~(size_t)0 / element_size; - if (max_capacity < element_count) - return FALSE; - - new_capacity = max(*capacity, 4); - while (new_capacity < element_count && new_capacity <= max_capacity / 2) - new_capacity *= 2; - - if (new_capacity < element_count) - new_capacity = max_capacity; - - if (!(new_elements = heap_realloc(*elements, new_capacity * element_size))) - return FALSE; - - *elements = new_elements; - *capacity = new_capacity; - return TRUE; -} - static BOOL d2d_figure_insert_vertex(struct d2d_figure *figure, size_t idx, D2D1_POINT_2F vertex) { if (!d2d_array_reserve((void **)&figure->vertices, &figure->vertices_size, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index cc820cf..a202279 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -95,21 +95,8 @@ static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F { D2D1_RECT_F r; - if (stack->count == stack->size) - { - D2D1_RECT_F *new_stack; - unsigned int new_size; - - if (stack->size > UINT_MAX / 2) - return FALSE; - - new_size = stack->size * 2; - if (!(new_stack = heap_realloc(stack->stack, new_size * sizeof(*stack->stack)))) - return FALSE; - - stack->stack = new_stack; - stack->size = new_size; - } + if (!d2d_array_reserve((void **)&stack->stack, &stack->size, stack->count + 1, sizeof(*stack->stack))) + return FALSE; r = *rect; if (stack->count) -- 2.1.4

1 0

[PATCH 4/6] wined3d: Use the resource access flags in surface_blt_special().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 520f88c..5f91c21 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1990,10 +1990,10 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); - /* Get the swapchain. One of the surfaces has to be a primary surface */ - if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + /* Get the swapchain. One of the surfaces has to be a primary surface. */ + if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - WARN("Destination is in sysmem, rejecting gl blt\n"); + WARN("Destination resource is not GPU accessible, rejecting GL blit.\n"); return WINED3DERR_INVALIDCALL; } @@ -2002,9 +2002,9 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if (src_surface) { src_texture = src_surface->container; - if (src_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + if (!(src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - WARN("Src is in sysmem, rejecting gl blt\n"); + WARN("Source resource is not GPU accessible, rejecting GL blit.\n"); return WINED3DERR_INVALIDCALL; } -- 2.1.4

1 0

[PATCH 3/6] wined3d: Use the resource access flags in wined3d_resource_set_priority().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 44f9f00..437261b 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -284,7 +284,7 @@ DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWO { DWORD prev; - if (resource->pool != WINED3D_POOL_MANAGED) + if (!wined3d_resource_access_is_managed(resource->access)) { WARN("Called on non-managed resource %p, ignoring.\n", resource); return 0; -- 2.1.4

1 0

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-devel