February 2014 - Wine-Commits

Ken Thomases : kernel32: Consolidate some duplicate variable declarations.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: 69531892713f6ad4e375e63f4e95a99d96ebdcca URL: http://source.winehq.org/git/wine.git/?a=commit;h=69531892713f6ad4e375e63f4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:35 2014 -0600 kernel32: Consolidate some duplicate variable declarations. --- dlls/kernel32/heap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 8d4325a..c88d31c 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1146,12 +1146,12 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) SYSTEM_INFO si; #ifdef linux FILE *f; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) - unsigned long val; - int mib[2]; - size_t size_sys; -#elif defined(__APPLE__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) +#ifdef __APPLE__ unsigned int val; +#else + unsigned long val; +#endif int mib[2]; size_t size_sys; #elif defined(sun)

1 0

Ken Thomases : kernel32: Use sysctl(VM_SWAPUSAGE) to get swap sizes on BSDs, if available.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: 9b7c94bc55379941dd549c492424e3079b914b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7c94bc55379941dd549c492… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:42 2014 -0600 kernel32: Use sysctl(VM_SWAPUSAGE) to get swap sizes on BSDs, if available. --- dlls/kernel32/heap.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 646890a..fb0b07d 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1158,6 +1158,9 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #ifdef HW_MEMSIZE uint64_t val64; #endif +#ifdef VM_SWAPUSAGE + struct xsw_usage swap; +#endif #elif defined(sun) unsigned long pagesize,maxpages,freepages,swapspace,swapfree; struct anoninfo swapinf; @@ -1253,6 +1256,17 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) lpmemex->ullTotalPageFile = lpmemex->ullAvailPhys; lpmemex->ullAvailPageFile = lpmemex->ullAvailPhys; + +#ifdef VM_SWAPUSAGE + mib[0] = CTL_VM; + mib[1] = VM_SWAPUSAGE; + size_sys = sizeof(swap); + if (!sysctl(mib, 2, &swap, &size_sys, NULL, 0) && size_sys == sizeof(swap)) + { + lpmemex->ullTotalPageFile = swap.xsu_total; + lpmemex->ullAvailPageFile = swap.xsu_avail; + } +#endif #elif defined ( sun ) pagesize=sysconf(_SC_PAGESIZE); maxpages=sysconf(_SC_PHYS_PAGES);

1 0

Ken Thomases : kernel32: Use the Mach host_info(HOST_BASIC_INFO) API to obtain total RAM after trying sysctl(HW_MEMSIZE) and before HW_PHYSMEM.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: f40c5484fc4a1b52e51be267e853f902743cac98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40c5484fc4a1b52e51be267e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:45 2014 -0600 kernel32: Use the Mach host_info(HOST_BASIC_INFO) API to obtain total RAM after trying sysctl(HW_MEMSIZE) and before HW_PHYSMEM. --- dlls/kernel32/heap.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index fb0b07d..cd3a752 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -40,6 +40,9 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#ifdef HAVE_MACH_MACH_H +#include <mach/mach.h> +#endif #ifdef sun /* FIXME: Unfortunately swapctl can't be used with largefile.... */ @@ -1236,6 +1239,25 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) total = val64; #endif +#ifdef HAVE_MACH_MACH_H + if (!total) + { + host_name_port_t host; + mach_msg_type_number_t count; + kern_return_t kr; + host_basic_info_data_t info; + + host = mach_host_self(); + + count = HOST_BASIC_INFO_COUNT; + kr = host_info(host, HOST_BASIC_INFO, (host_info_t)&info, &count); + if (kr == KERN_SUCCESS) + total = info.max_mem; + + mach_port_deallocate(mach_task_self(), host); + } +#endif + if (!total) { mib[1] = HW_PHYSMEM;

1 0

Ken Thomases : kernel32: Prefer the Mach host_statistics64(HOST_VM_INFO64) API over sysctl(HW_USERMEM) to obtain free memory.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: a34e52cc9374c56cce0bc47555c6390defbfe252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34e52cc9374c56cce0bc4755… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:48 2014 -0600 kernel32: Prefer the Mach host_statistics64(HOST_VM_INFO64) API over sysctl(HW_USERMEM) to obtain free memory. --- dlls/kernel32/heap.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index cd3a752..1c38ae5 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1164,6 +1164,14 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #ifdef VM_SWAPUSAGE struct xsw_usage swap; #endif +#ifdef HAVE_MACH_MACH_H + host_name_port_t host; + mach_msg_type_number_t count; + kern_return_t kr; + host_basic_info_data_t info; + vm_statistics64_data_t vm_stat; + vm_size_t page_size; +#endif #elif defined(sun) unsigned long pagesize,maxpages,freepages,swapspace,swapfree; struct anoninfo swapinf; @@ -1240,22 +1248,22 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) #endif #ifdef HAVE_MACH_MACH_H + host = mach_host_self(); + if (!total) { - host_name_port_t host; - mach_msg_type_number_t count; - kern_return_t kr; - host_basic_info_data_t info; - - host = mach_host_self(); - count = HOST_BASIC_INFO_COUNT; kr = host_info(host, HOST_BASIC_INFO, (host_info_t)&info, &count); if (kr == KERN_SUCCESS) total = info.max_mem; - - mach_port_deallocate(mach_task_self(), host); } + + count = HOST_VM_INFO64_COUNT; + kr = host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stat, &count); + if (kr == KERN_SUCCESS) + kr = host_page_size(host, &page_size); + + mach_port_deallocate(mach_task_self(), host); #endif if (!total) @@ -1269,11 +1277,22 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) if (total) lpmemex->ullTotalPhys = total; - mib[1] = HW_USERMEM; - size_sys = sizeof(val); - if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) - lpmemex->ullAvailPhys = val; - else + lpmemex->ullAvailPhys = 0; + +#ifdef HAVE_MACH_MACH_H + if (kr == KERN_SUCCESS) + lpmemex->ullAvailPhys = (vm_stat.free_count + vm_stat.inactive_count) * (DWORDLONG)page_size; +#endif + + if (!lpmemex->ullAvailPhys) + { + mib[1] = HW_USERMEM; + size_sys = sizeof(val); + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) + lpmemex->ullAvailPhys = val; + } + + if (!lpmemex->ullAvailPhys) lpmemex->ullAvailPhys = lpmemex->ullTotalPhys; lpmemex->ullTotalPageFile = lpmemex->ullAvailPhys;

1 0

Ken Thomases : kernel32: Check that sysctl() call succeeded before using its output.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: 89a96db01ff5aee1c25cbb8e0590fdd81d6b5614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a96db01ff5aee1c25cbb8e0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:28 2014 -0600 kernel32: Check that sysctl() call succeeded before using its output. --- dlls/kernel32/heap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 51bd235..578cb43 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1222,12 +1222,12 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) mib[0] = CTL_HW; mib[1] = HW_PHYSMEM; size_sys = sizeof(val); - sysctl(mib, 2, &val, &size_sys, NULL, 0); - if (val) lpmemex->ullTotalPhys = val; + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) + lpmemex->ullTotalPhys = val; mib[1] = HW_USERMEM; size_sys = sizeof(val); - sysctl(mib, 2, &val, &size_sys, NULL, 0); - if (!val) val = lpmemex->ullTotalPhys; + if (sysctl(mib, 2, &val, &size_sys, NULL, 0) || size_sys != sizeof(val) || !val) + val = lpmemex->ullTotalPhys; lpmemex->ullAvailPhys = val; lpmemex->ullTotalPageFile = val; lpmemex->ullAvailPageFile = val;

1 0

Ken Thomases : kernel32: Avoid truncating 64-bit ullTotalPhys value to 32 bits when copying to ullAvailPhys , ullTotalPageFile, and ullAvailPageFile.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: c91dd240987ed8f54e6d2d6ffb9ecbae33f05015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c91dd240987ed8f54e6d2d6ff… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 16 20:43:32 2014 -0600 kernel32: Avoid truncating 64-bit ullTotalPhys value to 32 bits when copying to ullAvailPhys, ullTotalPageFile, and ullAvailPageFile. --- dlls/kernel32/heap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 578cb43..8d4325a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1226,11 +1226,13 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) lpmemex->ullTotalPhys = val; mib[1] = HW_USERMEM; size_sys = sizeof(val); - if (sysctl(mib, 2, &val, &size_sys, NULL, 0) || size_sys != sizeof(val) || !val) - val = lpmemex->ullTotalPhys; - lpmemex->ullAvailPhys = val; - lpmemex->ullTotalPageFile = val; - lpmemex->ullAvailPageFile = val; + if (!sysctl(mib, 2, &val, &size_sys, NULL, 0) && size_sys == sizeof(val) && val) + lpmemex->ullAvailPhys = val; + else + lpmemex->ullAvailPhys = lpmemex->ullTotalPhys; + + lpmemex->ullTotalPageFile = lpmemex->ullAvailPhys; + lpmemex->ullAvailPageFile = lpmemex->ullAvailPhys; #elif defined ( sun ) pagesize=sysconf(_SC_PAGESIZE); maxpages=sysconf(_SC_PHYS_PAGES);

1 0

Bruno Jesus : ws2_32: Fix edge case for getaddrinfo in BSD and OSX.
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: da16d6b66003f05e39c92897bb973f4b79fce7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da16d6b66003f05e39c92897b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Feb 14 08:44:21 2014 -0200 ws2_32: Fix edge case for getaddrinfo in BSD and OSX. --- dlls/ws2_32/socket.c | 3 +++ dlls/ws2_32/tests/sock.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7a9440f..a9ac79d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5466,6 +5466,9 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr else node = nodename; + /* servname tweak required by OSX and BSD kernels */ + if (servname && !servname[0]) servname = "0"; + if (hints) { punixhints = &unixhints; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cb67533..e146548 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5402,12 +5402,24 @@ static void test_GetAddrInfoW(void) pFreeAddrInfoW(result); result = NULL; + ret = pGetAddrInfoW(NULL, empty, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + pFreeAddrInfoW(result); + + result = NULL; ret = pGetAddrInfoW(empty, zero, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); pFreeAddrInfoW(result); result = NULL; + ret = pGetAddrInfoW(empty, empty, NULL, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(result != NULL, "GetAddrInfoW failed\n"); + pFreeAddrInfoW(result); + + result = NULL; ret = pGetAddrInfoW(localhost, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result); @@ -5529,12 +5541,24 @@ static void test_getaddrinfo(void) pfreeaddrinfo(result); result = NULL; + ret = pgetaddrinfo(NULL, "", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "getaddrinfo failed\n"); + pfreeaddrinfo(result); + + result = NULL; ret = pgetaddrinfo("", "0", NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); ok(result != NULL, "getaddrinfo failed\n"); pfreeaddrinfo(result); result = NULL; + ret = pgetaddrinfo("", "", NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(result != NULL, "getaddrinfo failed\n"); + pfreeaddrinfo(result); + + result = NULL; ret = pgetaddrinfo("localhost", NULL, NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); pfreeaddrinfo(result);

1 0

Henri Verbeet : d3d10core: Implement d3d10_sampler_state_GetDevice().
by Alexandre Julliard Feb. 17, 2014

Feb. 17, 2014

Module: wine Branch: master Commit: 3363d4923675d0f54278065a4923df78f002b77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3363d4923675d0f54278065a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 17 11:24:29 2014 +0100 d3d10core: Implement d3d10_sampler_state_GetDevice(). --- dlls/d3d10core/d3d10core_private.h | 7 ++++++- dlls/d3d10core/device.c | 5 ----- dlls/d3d10core/state.c | 16 +++++++++++++--- dlls/d3d10core/tests/device.c | 14 ++++++++++++-- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 8fdef8a..4f5abad 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -272,10 +272,10 @@ struct d3d10_sampler_state ID3D10SamplerState ID3D10SamplerState_iface; LONG refcount; - struct d3d10_device *device; struct wined3d_sampler *wined3d_sampler; D3D10_SAMPLER_DESC desc; struct wine_rb_entry entry; + ID3D10Device1 *device; }; HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10_device *device, @@ -319,6 +319,11 @@ struct d3d10_device struct d3d10_rasterizer_state *rasterizer_state; }; +static inline struct d3d10_device *impl_from_ID3D10Device(ID3D10Device1 *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_device, ID3D10Device1_iface); +} + HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) DECLSPEC_HIDDEN; /* Layered device */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 8085e56..0bd9883 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -101,11 +101,6 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) /* IUnknown methods */ -static inline struct d3d10_device *impl_from_ID3D10Device(ID3D10Device1 *iface) -{ - return CONTAINING_RECORD(iface, struct d3d10_device, ID3D10Device1_iface); -} - static HRESULT STDMETHODCALLTYPE d3d10_device_QueryInterface(ID3D10Device1 *iface, REFIID riid, void **ppv) { diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index f0d162b..3e4e8ef 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -487,8 +487,11 @@ static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *i if (!refcount) { + struct d3d10_device *device = impl_from_ID3D10Device(state->device); + wined3d_sampler_decref(state->wined3d_sampler); - wine_rb_remove(&state->device->sampler_states, &state->desc); + wine_rb_remove(&device->sampler_states, &state->desc); + ID3D10Device1_Release(state->device); HeapFree(GetProcessHeap(), 0, state); } @@ -499,7 +502,12 @@ static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *i static void STDMETHODCALLTYPE d3d10_sampler_state_GetDevice(ID3D10SamplerState *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_sampler_state *state = impl_from_ID3D10SamplerState(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)state->device; + ID3D10Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10SamplerState *iface, @@ -562,7 +570,6 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10 state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; - state->device = device; state->desc = *desc; if (FAILED(hr = wined3d_sampler_create(state, &state->wined3d_sampler))) @@ -578,6 +585,9 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10 return E_FAIL; } + state->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(state->device); + return S_OK; } diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7eef19a..d0ad0c4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -605,9 +605,9 @@ float4 main(const float4 color : COLOR) : SV_TARGET static void test_create_sampler_state(void) { ID3D10SamplerState *sampler_state1, *sampler_state2; + ULONG refcount, expected_refcount; D3D10_SAMPLER_DESC sampler_desc; - ID3D10Device *device; - ULONG refcount; + ID3D10Device *device, *tmp; HRESULT hr; if (!(device = create_device())) @@ -633,11 +633,21 @@ static void test_create_sampler_state(void) sampler_desc.MinLOD = 0.0f; sampler_desc.MaxLOD = 16.0f; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state1); ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state2); ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); ok(sampler_state1 == sampler_state2, "Got different sampler state objects.\n"); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10SamplerState_GetDevice(sampler_state1, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp); refcount = ID3D10SamplerState_Release(sampler_state2); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);

1 0

André Hentschel : Add WWN 363
by Jeremy Newman Feb. 14, 2014

Feb. 14, 2014

Module: website Branch: master Commit: 85b5b572ee938a70173ced101e53d5aaa2b07579 URL: http://source.winehq.org/git/website.git/?a=commit;h=85b5b572ee938a70173ced… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 14 22:51:52 2014 +0100 Add WWN 363 --- wwn/en/wn20140214_363.xml | 1063 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1063 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=85b5b572ee938a7017…

1 0

Jeremy Newman : fix author parsing
by Jeremy Newman Feb. 14, 2014

Feb. 14, 2014

Module: website Branch: master Commit: 62e764e9c24d4cfc86a89bab1e830ddc45b8f825 URL: http://source.winehq.org/git/website.git/?a=commit;h=62e764e9c24d4cfc86a89b… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Feb 14 17:46:28 2014 -0600 fix author parsing --- include/wwn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wwn.php b/include/wwn.php index f4eb3a1..1d81e7c 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -559,7 +559,7 @@ class wwn case "TITLE": break; case "AUTHOR": - $this->author = $data; + $this->author .= $data; break; default: $this->body .= $data;

1 0