November 2015 - Wine-commits

Jacek Caban : ntdll: Added NtOpenKeyEx implementation.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 4269423ee49046886fa21167f58c325c85fb6be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4269423ee49046886fa21167f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 4 15:28:49 2015 +0100 ntdll: Added NtOpenKeyEx implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/reg.c | 25 ++++++++++++++++++------- dlls/ntdll/tests/reg.c | 14 ++++++++++++++ include/winternl.h | 1 + 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 38422ae..464b233 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -213,6 +213,7 @@ @ stdcall NtOpenIoCompletion(ptr long ptr) @ stdcall NtOpenJobObject(ptr long ptr) @ stdcall NtOpenKey(ptr long ptr) +@ stdcall NtOpenKeyEx(ptr long ptr long) @ stdcall NtOpenKeyedEvent(ptr long ptr) @ stdcall NtOpenMutant(ptr long ptr) @ stub NtOpenObjectAuditAlarm @@ -1128,6 +1129,7 @@ @ stdcall ZwOpenIoCompletion(ptr long ptr) NtOpenIoCompletion @ stdcall ZwOpenJobObject(ptr long ptr) NtOpenJobObject @ stdcall ZwOpenKey(ptr long ptr) NtOpenKey +@ stdcall ZwOpenKeyEx(ptr long ptr long) NtOpenKeyEx @ stdcall ZwOpenKeyedEvent(ptr long ptr) NtOpenKeyedEvent @ stdcall ZwOpenMutant(ptr long ptr) NtOpenMutant @ stub ZwOpenObjectAuditAlarm diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index a104c2e..c0fc641 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -106,14 +106,10 @@ NTSTATUS WINAPI RtlpNtCreateKey( PHANDLE retkey, ACCESS_MASK access, const OBJEC } /****************************************************************************** - * NtOpenKey [NTDLL.@] - * ZwOpenKey [NTDLL.@] - * - * OUT HANDLE retkey (returns 0 when failure) - * IN ACCESS_MASK access - * IN POBJECT_ATTRIBUTES attr + * NtOpenKeyEx [NTDLL.@] + * ZwOpenKeyEx [NTDLL.@] */ -NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINAPI NtOpenKeyEx( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) { NTSTATUS ret; DWORD len; @@ -123,6 +119,8 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTR len = attr->ObjectName->Length; TRACE( "(%p,%s,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), access, retkey ); + if (options) + FIXME("options %x not implemented\n", options); if (len > MAX_NAME_LENGTH) return STATUS_BUFFER_OVERFLOW; @@ -141,6 +139,19 @@ NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTR } /****************************************************************************** + * NtOpenKey [NTDLL.@] + * ZwOpenKey [NTDLL.@] + * + * OUT HANDLE retkey (returns 0 when failure) + * IN ACCESS_MASK access + * IN POBJECT_ATTRIBUTES attr + */ +NTSTATUS WINAPI NtOpenKey( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +{ + return NtOpenKeyEx( retkey, access, attr, 0 ); +} + +/****************************************************************************** * RtlpNtOpenKey [NTDLL.@] * * See NtOpenKey. diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 6d04668..ecfe1b2 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -123,6 +123,7 @@ static NTSTATUS (WINAPI * pRtlQueryRegistryValues)(IN ULONG, IN PCWSTR,IN PRTL_Q static NTSTATUS (WINAPI * pRtlCheckRegistryKey)(IN ULONG,IN PWSTR); static NTSTATUS (WINAPI * pRtlOpenCurrentUser)(IN ACCESS_MASK, PHANDLE); static NTSTATUS (WINAPI * pNtOpenKey)(PHANDLE, IN ACCESS_MASK, IN POBJECT_ATTRIBUTES); +static NTSTATUS (WINAPI * pNtOpenKeyEx)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI * pNtClose)(IN HANDLE); static NTSTATUS (WINAPI * pNtFlushKey)(HANDLE); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); @@ -195,6 +196,7 @@ static BOOL InitFunctionPtrs(void) /* optional functions */ pNtQueryLicenseValue = (void *)GetProcAddress(hntdll, "NtQueryLicenseValue"); + pNtOpenKeyEx = (void *)GetProcAddress(hntdll, "NtOpenKeyEx"); return TRUE; } @@ -351,6 +353,18 @@ static void test_NtOpenKey(void) attr.Length *= 2; status = pNtOpenKey(&key, am, &attr); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got: 0x%08x\n", status); + + if (!pNtOpenKeyEx) + { + win_skip("NtOpenKeyEx not available\n"); + return; + } + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKeyEx(&key, KEY_WRITE|KEY_READ, &attr, 0); + ok(status == STATUS_SUCCESS, "NtOpenKeyEx Failed: 0x%08x\n", status); + + pNtClose(key); } static void test_NtCreateKey(void) diff --git a/include/winternl.h b/include/winternl.h index 5420391..f3de636 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2169,6 +2169,7 @@ NTSYSAPI NTSTATUS WINAPI NtOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_ NTSYSAPI NTSTATUS WINAPI NtOpenIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); NTSYSAPI NTSTATUS WINAPI NtOpenJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); +NTSYSAPI NTSTATUS WINAPI NtOpenKeyEx(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); NTSYSAPI NTSTATUS WINAPI NtOpenKeyedEvent(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenMutant(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenObjectAuditAlarm(PUNICODE_STRING,PHANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,ACCESS_MASK,PPRIVILEGE_SET,BOOLEAN,BOOLEAN,PBOOLEAN);

1 0

Bruno Jesus : include: Add definitions related to WSAPoll().
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: d4664c132392e8bcd2ec565f5feae7330752eebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4664c132392e8bcd2ec565f5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 4 21:59:00 2015 +0800 include: Add definitions related to WSAPoll(). Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsock2.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/winsock2.h b/include/winsock2.h index d871a23..461b90c 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -112,6 +112,33 @@ extern "C" { #define SD_SEND 0x01 #define SD_BOTH 0x02 +/* Constants for WSAPoll() */ +#ifndef __WINE_WINE_PORT_H +#ifndef USE_WS_PREFIX +#define POLLERR 0x0001 +#define POLLHUP 0x0002 +#define POLLNVAL 0x0004 +#define POLLWRNORM 0x0010 +#define POLLWRBAND 0x0020 +#define POLLRDNORM 0x0100 +#define POLLRDBAND 0x0200 +#define POLLPRI 0x0400 +#define POLLIN (POLLRDNORM|POLLRDBAND) +#define POLLOUT (POLLWRNORM) +#else +#define WS_POLLERR 0x0001 +#define WS_POLLHUP 0x0002 +#define WS_POLLNVAL 0x0004 +#define WS_POLLWRNORM 0x0010 +#define WS_POLLWRBAND 0x0020 +#define WS_POLLRDNORM 0x0100 +#define WS_POLLRDBAND 0x0200 +#define WS_POLLPRI 0x0400 +#define WS_POLLIN (WS_POLLRDNORM|WS_POLLRDBAND) +#define WS_POLLOUT (WS_POLLWRNORM) +#endif +#endif + /* Constants for WSAIoctl() */ #ifdef USE_WS_PREFIX #define WS_IOC_UNIX 0x00000000 @@ -286,6 +313,13 @@ typedef struct _WSAPROTOCOLCHAIN #define SECURITY_PROTOCOL_NONE 0x0000 +typedef struct /*WS(pollfd)*/ +{ + SOCKET fd; + SHORT events; + SHORT revents; +} WSAPOLLFD; + #define WSAPROTOCOL_LEN 255 typedef struct _WSAPROTOCOL_INFOA { @@ -689,6 +723,7 @@ INT WINAPI WSALookupServiceNextW(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); int WINAPI WSANSPIoctl(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION); int WINAPI WSANtohl(SOCKET,ULONG,ULONG*); int WINAPI WSANtohs(SOCKET,WS(u_short),WS(u_short)*); +int WINAPI WSAPoll(WSAPOLLFD*,ULONG,int); INT WINAPI WSAProviderConfigChange(LPHANDLE,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); int WINAPI WSARecv(SOCKET,LPWSABUF,DWORD,LPDWORD,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); int WINAPI WSARecvDisconnect(SOCKET,LPWSABUF); @@ -763,6 +798,7 @@ typedef int (WINAPI *LPFN_WSANSPIOCTL)(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LP typedef int (WINAPI *LPFN_WSANTOHL)(SOCKET,ULONG,ULONG*); typedef int (WINAPI *LPFN_WSANTOHS)(SOCKET,WS(u_short),WS(u_short)*); typedef INT (WINAPI *LPFN_WSAPROVIDERCONFIGCHANGE)(LPHANDLE,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); +typedef int (WINAPI *LPFN_WSAPOLL)(WSAPOLLFD*,ULONG,int); typedef int (WINAPI *LPFN_WSARECV)(SOCKET,LPWSABUF,DWORD,LPDWORD,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); typedef int (WINAPI *LPFN_WSARECVDISCONNECT)(SOCKET,LPWSABUF); typedef int (WINAPI *LPFN_WSARECVFROM)(SOCKET,LPWSABUF,DWORD,LPDWORD,LPDWORD,struct WS(sockaddr)*,LPINT,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE);

1 0

Austin English : fltmgr.sys: Add FltInitializePushLock stub.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: f91a7b2cfe5b44fea333ed70b9fc38a509b7798a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91a7b2cfe5b44fea333ed70b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 4 10:46:50 2015 -0800 fltmgr.sys: Add FltInitializePushLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 7 +++++++ include/ddk/ntifs.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 5310269..ea84d81 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -97,7 +97,7 @@ @ stub FltGetVolumeProperties @ stub FltInitializeFileLock @ stub FltInitializeOplock -@ stub FltInitializePushLock +@ stdcall FltInitializePushLock(ptr) @ stub FltIs32bitProcess @ stub FltIsCallbackDataDirty @ stub FltIsDirectory diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 7341ef2..70ee307 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -25,6 +25,8 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "ddk/ntddk.h" +#include "ddk/ntifs.h" #include "ddk/wdm.h" #include "wine/debug.h" @@ -36,3 +38,8 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) return STATUS_SUCCESS; } + +void WINAPI FltInitializePushLock( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index a8d90a1..32c9e30 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -19,6 +19,8 @@ #ifndef __NTIFS_H__ #define __NTIFS_H__ +typedef struct _EX_PUSH_LOCK EX_PUSH_LOCK, *PEX_PUSH_LOCK; + typedef struct _KQUEUE { DISPATCHER_HEADER Header;

1 0

Sebastian Lackner : kernel32/tests: Add a test to demonstrate a deadlock by suspending a thread during a system APC.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 659e585166d3440665588de939652294a5fd2e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=659e585166d3440665588de93… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 5 05:41:43 2015 +0100 kernel32/tests: Add a test to demonstrate a deadlock by suspending a thread during a system APC. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 1065d5e..4ac6a99 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -56,6 +56,9 @@ static VOID (WINAPI *pReleaseSRWLockExclusive)(PSRWLOCK); static VOID (WINAPI *pReleaseSRWLockShared)(PSRWLOCK); static BOOLEAN (WINAPI *pTryAcquireSRWLockExclusive)(PSRWLOCK); static BOOLEAN (WINAPI *pTryAcquireSRWLockShared)(PSRWLOCK); + +static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); +static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); static NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); static void test_signalandwait(void) @@ -2394,8 +2397,105 @@ static void test_alertable_wait(void) CloseHandle(semaphores[1]); } +struct apc_deadlock_info +{ + PROCESS_INFORMATION *pi; + HANDLE event; + BOOL running; +}; + +static DWORD WINAPI apc_deadlock_thread(void *param) +{ + struct apc_deadlock_info *info = param; + PROCESS_INFORMATION *pi = info->pi; + NTSTATUS status; + SIZE_T size; + void *base; + + while (info->running) + { + base = NULL; + size = 0x1000; + status = pNtAllocateVirtualMemory(pi->hProcess, &base, 0, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + ok(!status, "expected STATUS_SUCCESS, got %08x\n", status); + ok(base != NULL, "expected base != NULL, got %p\n", base); + SetEvent(info->event); + + size = 0; + status = pNtFreeVirtualMemory(pi->hProcess, &base, &size, MEM_RELEASE); + ok(!status, "expected STATUS_SUCCESS, got %08x\n", status); + SetEvent(info->event); + } + + return 0; +} + +static void test_apc_deadlock(void) +{ + struct apc_deadlock_info info; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { sizeof(si) }; + char cmdline[MAX_PATH]; + HANDLE event, thread; + DWORD result; + BOOL success; + char **argv; + int i; + + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" sync apc_deadlock", argv[0]); + success = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(success, "CreateProcess failed with %u\n", GetLastError()); + + event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEvent failed with %u\n", GetLastError()); + + info.pi = π + info.event = event; + info.running = TRUE; + + thread = CreateThread(NULL, 0, apc_deadlock_thread, &info, 0, NULL); + ok(thread != NULL, "CreateThread failed with %u\n", GetLastError()); + result = WaitForSingleObject(event, 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + + for (i = 0; i < 1000 && info.running; i++) + { + result = SuspendThread(pi.hThread); + ok(result == 0, "expected 0, got %u\n", result); + + WaitForSingleObject(event, 0); /* reset event */ + result = WaitForSingleObject(event, 1000); + if (result == WAIT_TIMEOUT) + { + todo_wine + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + info.running = FALSE; + } + else + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + + result = ResumeThread(pi.hThread); + ok(result == 1, "expected 1, got %u\n", result); + Sleep(1); + } + + info.running = FALSE; + result = WaitForSingleObject(thread, 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + CloseHandle(thread); + CloseHandle(event); + + TerminateProcess(pi.hProcess, 0); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); +} + START_TEST(sync) { + char **argv; + int argc; HMODULE hdll = GetModuleHandleA("kernel32.dll"); HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2424,8 +2524,21 @@ START_TEST(sync) pReleaseSRWLockShared = (void *)GetProcAddress(hdll, "ReleaseSRWLockShared"); pTryAcquireSRWLockExclusive = (void *)GetProcAddress(hdll, "TryAcquireSRWLockExclusive"); pTryAcquireSRWLockShared = (void *)GetProcAddress(hdll, "TryAcquireSRWLockShared"); + pNtAllocateVirtualMemory = (void *)GetProcAddress(hntdll, "NtAllocateVirtualMemory"); + pNtFreeVirtualMemory = (void *)GetProcAddress(hntdll, "NtFreeVirtualMemory"); pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); + argc = winetest_get_mainargs( &argv ); + if (argc >= 3) + { + if (!strcmp(argv[2], "apc_deadlock")) + { + HANDLE handle = GetCurrentThread(); + for (;;) WaitForMultipleObjectsEx(1, &handle, FALSE, INFINITE, TRUE); + } + return; + } + test_signalandwait(); test_mutex(); test_slist(); @@ -2442,4 +2555,5 @@ START_TEST(sync) test_srwlock_base(); test_srwlock_example(); test_alertable_wait(); + test_apc_deadlock(); }

1 0

Sebastian Lackner : server: Wake up APC if we fail to allocate a handle in target process.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 41f7f19cb578c60d65dd8321d1de63aa9c09e271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f7f19cb578c60d65dd8321d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 5 05:41:58 2015 +0100 server: Wake up APC if we fail to allocate a handle in target process. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/thread.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/thread.c b/server/thread.c index d65ea89..bad2231 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1500,10 +1500,10 @@ DECL_HANDLER(select) /* Optimization: ignore APC_NONE calls, they are only used to * wake up a thread, but since we got here the thread woke up already. */ - if (apc->call.type != APC_NONE) + if (apc->call.type != APC_NONE && + (reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) { - if ((reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 ))) - reply->call = apc->call; + reply->call = apc->call; release_object( apc ); break; }

1 0

Martin Storsjo : ucrtbase: Implement _get_stream_buffer_pointers.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 8cc5b07e9d0aedffd4251d2e8942cb8368920bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cc5b07e9d0aedffd4251d2e8… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Nov 4 12:25:27 2015 +0200 ucrtbase: Implement _get_stream_buffer_pointers. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/file.c | 15 +++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 2db8222..30570da 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -55,7 +55,7 @@ @ cdecl _get_fmode(ptr) ucrtbase._get_fmode @ cdecl _get_osfhandle(long) ucrtbase._get_osfhandle @ cdecl _get_printf_count_output() ucrtbase._get_printf_count_output -@ stub _get_stream_buffer_pointers +@ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) ucrtbase._get_stream_buffer_pointers @ cdecl _getc_nolock(ptr) ucrtbase._getc_nolock @ cdecl _getcwd(str long) ucrtbase._getcwd @ cdecl _getdcwd(long str long) ucrtbase._getdcwd diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f1de534..22bb925 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5303,3 +5303,18 @@ int CDECL MSVCRT__setmaxstdio(int newmax) MSVCRT_max_streams = newmax; return MSVCRT_max_streams; } + +/********************************************************************* + * _get_stream_buffer_pointers (UCRTBASE.@) + */ +int CDECL MSVCRT__get_stream_buffer_pointers(MSVCRT_FILE *file, char*** base, + char*** ptr, int** count) +{ + if (base) + *base = &file->_base; + if (ptr) + *ptr = &file->_ptr; + if (count) + *count = &file->_cnt; + return 0; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6877bef..4e8b3bb 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -373,7 +373,7 @@ @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @ stub _get_purecall_handler -@ stub _get_stream_buffer_pointers +@ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers @ cdecl _get_terminate() MSVCRT__get_terminate @ stub _get_thread_local_invalid_parameter_handler @ cdecl _get_timezone(ptr)

1 0

Józef Kucia : d3d11: Add support for mapping 3D textures.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 1c980f70935ead15eb78993d87f0fa249e1cabef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c980f70935ead15eb78993d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 4 23:37:12 2015 +0100 d3d11: Add support for mapping 3D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/texture.c | 8 ++++++++ dlls/d3d11/utils.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b6d84c0..932d518 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -133,6 +133,7 @@ struct d3d_texture3d HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture) DECLSPEC_HIDDEN; +struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) DECLSPEC_HIDDEN; /* ID3D11Buffer, ID3D10Buffer */ struct d3d_buffer diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index ef4c3ac..9c7f299 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -887,6 +887,14 @@ static const struct ID3D10Texture3DVtbl d3d10_texture3d_vtbl = d3d10_texture3d_GetDesc, }; +struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_texture3d_vtbl); + return impl_from_ID3D11Texture3D(iface); +} + static const struct wined3d_parent_ops d3d_texture3d_wined3d_parent_ops = { d3d_texture3d_wined3d_object_released, diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 31dffa3..4253689 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -518,6 +518,10 @@ struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *re return wined3d_texture_get_resource(unsafe_impl_from_ID3D11Texture2D( (ID3D11Texture2D *)resource)->wined3d_texture); + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: + return wined3d_texture_get_resource(unsafe_impl_from_ID3D11Texture3D( + (ID3D11Texture3D *)resource)->wined3d_texture); + default: FIXME("Unhandled resource dimension %#x.\n", dimension); return NULL;

1 0

Alexandre Julliard : update-winehq: Update the source download URL.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: tools Branch: master Commit: 69639af132fa26a75c6bb33b5445e7df159a6a3a URL: http://source.winehq.org/git/tools.git/?a=commit;h=69639af132fa26a75c6bb33b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 00:36:15 2015 +0900 update-winehq: Update the source download URL. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- update-winehq | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/update-winehq b/update-winehq index bfabc81..efcf1d5 100755 --- a/update-winehq +++ b/update-winehq @@ -90,7 +90,9 @@ while (<ANNOUNCE>) } } -push @text, "The source is <a href=\"http://prdownloads.sourceforge.net/wine/wine-$rel.tar.bz2\">available now</a>.\n"; +(my $dir = $rel) =~ s/^([0-9]+\.[0-9]+).*/$1/; + +push @text, "The source is <a href=\"//dl.winehq.org/wine/source/$dir/wine-$rel.tar.bz2\">available now</a>.\n"; push @text, "Binary packages are in the process of being built, and will appear soon at their respective <a href=\"{\$root}/download\">download locations</a>.\n"; push @text, "</body></news>\n"; close ANNOUNCE;

1 0

Jacek Caban : Use dl.winehq.org for downloading Gecko and Mono.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: tools Branch: master Commit: 7d0e36c8e152664b3f221cf85af763b28f63681a URL: http://source.winehq.org/git/tools.git/?a=commit;h=7d0e36c8e152664b3f221cf8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 5 15:19:04 2015 +0100 Use dl.winehq.org for downloading Gecko and Mono. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- download.inc.php | 105 +------------------------------------------------------ winegecko.php | 51 +-------------------------- winemono.php | 17 +-------- 3 files changed, 3 insertions(+), 170 deletions(-) diff --git a/download.inc.php b/download.inc.php index 17811a6..14287da 100644 --- a/download.inc.php +++ b/download.inc.php @@ -5,108 +5,5 @@ * Copyright (c) 2006 Jonathan Ernst */ -// SourceForge can do better job at redirecting to the mirror than us. However, -// it redirects to HTML page by default for web browser user agents. New enough -// Wine set user agent to 'Wine Addon Downloader', so redirect them directly -// to SourceForge. For older Wine and other user agents, fallback to random -// known mirror. -if(strcmp($_SERVER['HTTP_USER_AGENT'], 'Wine Addon Downloader') === 0) { - header("Location: http://sourceforge.net/projects/wine/files/".$sFileName); - exit; -} - -if(!$iFileSize) { - header("HTTP/1.0 404 Not Found"); - exit; -} - -// List of common locations for files -$aList += array("http://freefr.dl.sourceforge.net/project/wine/", - "http://heanet.dl.sourceforge.net/project/wine/", - "http://garr.dl.sourceforge.net/project/wine/", - "http://mesh.dl.sourceforge.net/project/wine/", - "http://puzzle.dl.sourceforge.net/project/wine/", - "http://switch.dl.sourceforge.net/project/wine/", - "http://kent.dl.sourceforge.net/project/wine/", - "http://netcologne.dl.sourceforge.net/project/wine/", - "http://ignum.dl.sourceforge.net/project/wine/", - "http://ovh.dl.sourceforge.net/project/wine/", - "http://sunet.dl.sourceforge.net/project/wine/", - "http://surfnet.dl.sourceforge.net/project/wine/", - "http://citylan.dl.sourceforge.net/project/wine/", - "http://space.dl.sourceforge.net/project/wine/", - "http://iweb.dl.sourceforge.net/project/wine/", - "http://voxel.dl.sourceforge.net/project/wine/", - "http://cdnetworks-kr-1.dl.sourceforge.net/project/wine/", - "http://cdnetworks-kr-2.dl.sourceforge.net/project/wine/", - "http://nchc.dl.sourceforge.net/project/wine/", - "http://ncu.dl.sourceforge.net/project/wine/", - "http://jaist.dl.sourceforge.net/project/wine/", - "http://superb-sea2.dl.sourceforge.net/project/wine/", - "http://softlayer.dl.sourceforge.net/project/wine/", - "http://biznetnetworks.dl.sourceforge.net/project/wine/", - "http://ufpr.dl.sourceforge.net/project/wine/", - "http://cdnetworks-us-2.dl.sourceforge.net/project/wine/", - "http://cdnetworks-us-1.dl.sourceforge.net/project/wine/", - "http://waix.dl.sourceforge.net/project/wine/", - "http://internode.dl.sourceforge.net/project/wine/", - "http://transact.dl.sourceforge.net/project/wine/" - ); - - -function is_downloadable($sUrl) -{ - global $iFileSize; - $parse = parse_url($sUrl); - // open a socket connection - if($fp = @fsockopen($parse['host'], 80, $errno, $errstr, 10)) - { - // set request - $get = "HEAD ".$parse['path']." HTTP/1.1\r\n". - "Host: ".$parse['host']."\r\n". - "Connection: close\r\n\r\n"; - fputs($fp, $get); - while(!feof($fp)) - { - // get ONLY header information - $header .= fgets($fp, 128); - } - fclose($fp); - // match file size - preg_match('/Content-Length:\s([0-9].+?)\s/', $header, $matches); - $iSize = intval($matches[1]); - if($iSize == $iFileSize) return TRUE; - } - return FALSE; -} - - -if($_REQUEST['action']=="showlist") -{ - echo "<h2>List of mirrors available for file ".$sFileName." (".$iFileSize." bytes)</h2>"; - foreach($aList as $sLocation) - { - echo $sLocation.": "; - if(is_downloadable($sLocation.$sFileName)) - echo "online"; - else - echo "offline"; - echo "\n "; - flush(); - } -} else -{ - $iRand = rand(0, (sizeof($aList)-1)); - $sUrl = $aList[$iRand].$sFileName; - // we continue as long as we didn't find a working mirror and we didn't tried all the mirrors - while(!is_downloadable($sUrl) && sizeof($aAlreadyTried)<sizeof($aList)) - { - $aAlreadyTried[$iRand] = true; - // we loop until we take a random mirror that we didn't already tried ; of course if we have already tried all mirrors we stop - while($aAlreadyTried[$iRand] == true && sizeof($aAlreadyTried)<sizeof($aList)) - $iRand = rand(0, (sizeof($aList)-1)); - $sUrl = $aList[$iRand].$sFileName; - } - header("Location: ".$sUrl); -} +header("Location: http://dl.winehq.org/wine/".$sFileName); ?> diff --git a/winegecko.php b/winegecko.php index 0e07406..5afaa1f 100644 --- a/winegecko.php +++ b/winegecko.php @@ -19,7 +19,7 @@ $sVersion = '0.0.1'; $sFileSuffix = ''; // Folder which contains wine gecko files -$sFolder = 'Wine%20Gecko'; +$sFolder = 'wine-gecko'; // Check if a specific version was passed if(isset($_GET['v'])) { @@ -48,55 +48,6 @@ default: // Name of the file $sFileName = sprintf('%s/%s/wine_gecko-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); -// Size array -$aFileSizes = array( - '0.0.1'=>5219822, - '0.1.0'=>5746895, - '0.9.0'=>7806669, - '0.9.1'=>7806837, - '1.0.0-x86'=>8119486, - '1.1.0-x86'=>8868851, - '1.1.0-x86_64'=>8940997, - '1.2.0-x86'=>12604928, - '1.2.0-x86_64'=>12841472, - '1.3-x86'=>13609984, - '1.3-x86_64'=>13835776, - '1.4-x86'=>14732288, - '1.4-x86_64'=>14980096, - '1.5-x86'=>15950848, - '1.5-x86_64'=>16345088, - '1.6-x86'=>16802816, - '1.6-x86_64'=>17251328, - '1.7-x86'=>16995328, - '1.7-x86_64'=>17438720, - '1.8-x86'=>17774592, - '1.8-x86_64'=>18238976, - '1.9-x86'=>19060224, - '1.9-x86_64'=>19622400, - '2.21-x86'=>20871680, - '2.21-x86_64'=>21646336, - '2.24-beta1-x86'=>22354944, - '2.24-beta1-x86_64'=>23590400, - '2.24-x86'=>22373888, - '2.24-x86_64'=>23608320, - '2.34-beta1-x86'=>28131328, - '2.34-beta1-x86_64'=>29696000, - '2.34-beta2-x86'=>28270080, - '2.34-beta2-x86_64'=>29807616, - '2.34-x86'=>28269568, - '2.34-x86_64'=>29802496, - '2.36-beta1-x86'=>29698560, - '2.36-beta1-x86_64'=>31211008, - '2.36-x86'=>29718016, - '2.36-x86_64'=>31222784 -); - -// Exact size of the file: -$iFileSize = $aFileSizes[$sFileSuffix]; - -// List of additional locations (commonly used locations are already in download.inc.php) -$aList = array(); - // Common code for Wine downloader scripts require("download.inc.php"); ?> diff --git a/winemono.php b/winemono.php index a6d7583..799c3d7 100644 --- a/winemono.php +++ b/winemono.php @@ -10,7 +10,7 @@ $sVersion = '4.5.6'; $sFileSuffix = ''; // Folder which contains files -$sFolder = 'Wine%20Mono'; +$sFolder = 'wine-mono'; // Check if a specific version was passed if(isset($_GET['v'])) { @@ -25,21 +25,6 @@ $sExt = 'msi'; // Name of the file $sFileName = sprintf('%s/%s/wine-mono-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); -// Size array -$aFileSizes = array( - '0.0.4'=>44408320, - '0.0.8'=>46967296, - '4.5.2'=>52502528, - '4.5.4'=>53706752, - '4.5.6'=>53705216 -); - -// Exact size of the file: -$iFileSize = $aFileSizes[$sFileSuffix]; - -// List of additional locations (commonly used locations are already in download.inc.php) -$aList = array(); - // Common code for Wine downloader scripts require("download.inc.php"); ?>

1 0

Alexandre Julliard : Update source download URLs.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: website Branch: master Commit: aaf9d2057c75cf1728241c52544b1b5a7a6a32be URL: http://source.winehq.org/git/website.git/?a=commit;h=aaf9d2057c75cf1728241c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 00:22:29 2015 +0900 Update source download URLs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/de/download.template | 4 ++-- templates/en/download.template | 4 ++-- templates/fr/download.template | 4 ++-- templates/he/download.template | 4 ++-- templates/pl/download.template | 4 ++-- templates/pt/download.template | 4 ++-- templates/tr/download.template | 4 ++-- templates/uk/download.template | 4 ++-- templates/zh-cn/download.template | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index c44773a..b1cd325 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -140,7 +140,7 @@ für das Hosten der Wine-Webseite erbeten hat. </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Unsere offizielle Website für freigegebenen Quellcode. </td> </tr> @@ -150,7 +150,7 @@ für das Hosten der Wine-Webseite erbeten hat. </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> Alternative Downloadseite für offizielle Quellcode- und Dokumentations-Tarballs. </td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index 7001c9b..eadf9e8 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -135,7 +135,7 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Our official source release site. </td> </tr> @@ -145,7 +145,7 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> Alternative download site for the official source and documentation tarballs. </td> </tr> diff --git a/templates/fr/download.template b/templates/fr/download.template index 971e073..0391209 100644 --- a/templates/fr/download.template +++ b/templates/fr/download.template @@ -146,7 +146,7 @@ href="http://wiki.winehq.org/ThirdPartyApplications">applications tierces</a>.</ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Site officiel de téléchargement. </td> </tr> @@ -156,7 +156,7 @@ href="http://wiki.winehq.org/ThirdPartyApplications">applications tierces</a>.</ </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <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> diff --git a/templates/he/download.template b/templates/he/download.template index 1a36569..53107ba 100644 --- a/templates/he/download.template +++ b/templates/he/download.template @@ -133,7 +133,7 @@ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> אתר הפצת קוד המקור הרשמי שלנו. </td> </tr> @@ -143,7 +143,7 @@ </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> אתר הורדה חלופי לקוד המקור הרשמי וקובצי ה־tarball של התיעוד. </td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index 10e09f8..c22d2d7 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -139,7 +139,7 @@ stronę wiki</a> w poszukiwaniu aplikacji osób trzecich. </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Nasza oficjalna strona źródeł. </td> </tr> @@ -149,7 +149,7 @@ stronę wiki</a> w poszukiwaniu aplikacji osób trzecich. </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <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> diff --git a/templates/pt/download.template b/templates/pt/download.template index fad296b..fdc1dca 100644 --- a/templates/pt/download.template +++ b/templates/pt/download.template @@ -130,7 +130,7 @@ de terceiros. </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://ftp.winehq.org/pub/wine/source/" target="_blank">winehq.org</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Nosso sítio oficial para lançamentos. </td> </tr> @@ -140,7 +140,7 @@ de terceiros. </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> Sítio alternativo para o descarregamento dos tarballs com código fonte e documentação oficiais. </td> </tr> diff --git a/templates/tr/download.template b/templates/tr/download.template index 8689d07..7ee7d98 100644 --- a/templates/tr/download.template +++ b/templates/tr/download.template @@ -129,7 +129,7 @@ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Resmi kaynak yayın sitemiz. </td> </tr> @@ -139,7 +139,7 @@ </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <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> diff --git a/templates/uk/download.template b/templates/uk/download.template index a36ebc1..3f2751f 100644 --- a/templates/uk/download.template +++ b/templates/uk/download.template @@ -136,7 +136,7 @@ </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> Наш офіційний сайт. </td> </tr> @@ -146,7 +146,7 @@ </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> Альтернативний лінк для завантаження вихідних файлів та документації. </td> </tr> diff --git a/templates/zh-cn/download.template b/templates/zh-cn/download.template index 3ce949d..265afba 100644 --- a/templates/zh-cn/download.template +++ b/templates/zh-cn/download.template @@ -133,7 +133,7 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td> <a href="http://sourceforge.net/projects/wine/files/Source/" target="_blank">sourceforge.net</a></td> + <td> <a href="//dl.winehq.org/wine/source/" target="_blank">winehq.org</a></td> <td> 我们的正式源码发布站点。</td> </tr> @@ -143,7 +143,7 @@ requested in exchange for hosting the Wine web site. </tr> <tr bgcolor="#ffffff"> - <td><a href="http://ibiblio.org/pub/linux/system/emulators/wine/">ibiblio.org</a></td> + <td><a href="http://mirrors.ibiblio.org/wine/source/">ibiblio.org</a></td> <td> 正式源码和文档包可选下载站点。</td> </tr>

1 0