March 2015 - Wine-commits - list.winehq.org

Matteo Bruni : ddraw: D3DRENDERSTATE_NORMALIZENORMALS doesn' t exist before d3d7.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 382c8fde0897f1ed2250d6fd136122ae186f68a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=382c8fde0897f1ed2250d6fd1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:03 2015 +0200 ddraw: D3DRENDERSTATE_NORMALIZENORMALS doesn't exist before d3d7. --- dlls/ddraw/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 582a1d4..688f02b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2525,6 +2525,7 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, } case D3DRENDERSTATE_LIGHTING: + case D3DRENDERSTATE_NORMALIZENORMALS: *value = 0xffffffff; return D3D_OK; @@ -2884,6 +2885,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, } case D3DRENDERSTATE_LIGHTING: + case D3DRENDERSTATE_NORMALIZENORMALS: hr = D3D_OK; break;

1 0

Matteo Bruni : ddraw: Enable WINED3D_RS_NORMALIZENORMALS on d3d versions older than d3d7.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: fbffd8bae4144ef28a7f45af4514b0be9ba26506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbffd8bae4144ef28a7f45af4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:04 2015 +0200 ddraw: Enable WINED3D_RS_NORMALIZENORMALS on d3d versions older than d3d7. --- dlls/ddraw/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 688f02b..f0f4ac3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6839,6 +6839,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_COLORKEYENABLE, TRUE); else if (version == 2) wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_SPECULARENABLE, TRUE); + if (version < 7) + wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_NORMALIZENORMALS, TRUE); return D3D_OK; }

1 0

Nikolay Sivov : dwrite: Update to IDWriteRenderingParams2.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 7b664095aadfef5e670e8aa19d7dc84bbdcb457e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b664095aadfef5e670e8aa19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 31 11:39:59 2015 +0300 dwrite: Update to IDWriteRenderingParams2. --- dlls/dwrite/main.c | 121 +++++++++++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 45 +++++++++++++++++- 2 files changed, 125 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b664095aadfef5e670e8…

1 0

Michael Stefaniuc : wmp: Forward from a Release to a Release method.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: dbf8bde14616e54abbcf4caca92d4b708170b0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf8bde14616e54abbcf4caca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 31 14:25:07 2015 +0200 wmp: Forward from a Release to a Release method. --- dlls/wmp/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 33c0323..75957a4 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -671,7 +671,7 @@ static ULONG WINAPI OleControl_AddRef(IOleControl *iface) static ULONG WINAPI OleControl_Release(IOleControl *iface) { WindowsMediaPlayer *This = impl_from_IOleControl(iface); - return IOleObject_AddRef(&This->IOleObject_iface); + return IOleObject_Release(&This->IOleObject_iface); } static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI)

1 0

Sebastian Lackner : advapi32/tests: Add tests for NtCreateFile inheritance when security descriptor is set.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 3e47270b6843d0ee906694f39e2feda60923c347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e47270b6843d0ee906694f39… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 31 03:33:56 2015 +0200 advapi32/tests: Add tests for NtCreateFile inheritance when security descriptor is set. --- dlls/advapi32/tests/security.c | 55 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 065dd9a..4bee951 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3132,7 +3132,7 @@ static void test_CreateDirectoryA(void) DWORD error; PACL pDacl; - if (!pGetNamedSecurityInfoA || !pCreateWellKnownSid) + if (!pGetSecurityInfo || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) { win_skip("Required functions are not available\n"); return; @@ -3324,6 +3324,59 @@ static void test_CreateDirectoryA(void) LocalFree(pSD); CloseHandle(hTemp); + /* When a security descriptor is set, then inheritance doesn't take effect */ + pSD = &sd; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pDacl = HeapAlloc(GetProcessHeap(), 0, sizeof(ACL)); + bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); + ok(bret, "Failed to initialize ACL\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor\n"); + + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpfile"); + get_nt_pathW(tmpfile, &tmpfileW); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &tmpfileW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = pSD; + attr.SecurityQualityOfService = NULL; + + status = pNtCreateFile(&hTemp, GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, FILE_DELETE_ON_CLOSE, NULL, 0); + ok(!status, "NtCreateFile failed with %08x\n", status); + RtlFreeUnicodeString(&tmpfileW); + HeapFree(GetProcessHeap(), 0, pDacl); + + error = pGetSecurityInfo(hTemp, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + todo_wine + ok(error == ERROR_SUCCESS, "GetNamedSecurityInfo failed with error %d\n", error); + if (error == ERROR_SUCCESS) + { + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 0, "GetAclInformation returned unexpected entry count (%d != 0).\n", + acl_size.AceCount); + LocalFree(pSD); + } + CloseHandle(hTemp); + done: HeapFree(GetProcessHeap(), 0, user); bret = RemoveDirectoryA(tmpdir);

1 0

Bruno Jesus : ws2_32/tests: Add more WSAEnumNetworkEvents tests.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 5103291645f50261694c45281744c15121ff99d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5103291645f50261694c45281… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Mar 31 00:06:37 2015 -0300 ws2_32/tests: Add more WSAEnumNetworkEvents tests. --- dlls/ws2_32/tests/sock.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b7bc006..188e25c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2648,6 +2648,98 @@ static void test_WSADuplicateSocket(void) closesocket(source); } +static void test_WSAEnumNetworkEvents(void) +{ + SOCKET s, s2; + int sock_type[] = {SOCK_STREAM, SOCK_DGRAM, SOCK_STREAM}, i, j, k, l; + struct sockaddr_in address; + HANDLE event; + WSANETWORKEVENTS net_events; + /* Windows 2000 Pro without SP installed (testbot) will crash if + * WSAEnumNetworkEvents have a NULL event, so skip this test in <= 2000 */ + DWORD ver = GetVersion() & 0xFFFF; + BOOL supports_null = ((ver & 0xFF) << 8 | (ver >> 8)) > 0x0500; + + memset(&address, 0, sizeof(address)); + address.sin_addr.s_addr = htonl(INADDR_ANY); + address.sin_family = AF_INET; + + /* This test follows the steps from bugs 10204 and 24946 */ + for (l = 0; l < 2; l++) + { + if (l == 1 && !supports_null && broken(1)) continue; + + for (i = 0; i < sizeof(sock_type) / sizeof(sock_type[0]); i++) + { + if (i == 2) + ok(!tcp_socketpair(&s, &s2), "Test[%d]: creating socket pair failed\n", i); + else + { + s = socket(AF_INET, sock_type[i], 0); + ok (s != SOCKET_ERROR, "Test[%d]: failed to create socket\n", i); + ok (!bind(s, (struct sockaddr*) &address, sizeof(address)), "Test[%d]: bind failed\n", i); + } + event = WSACreateEvent(); + ok (event != NULL, "Test[%d]: failed to create event\n", i); + for (j = 0; j < 5; j++) /* Repeat sometimes and the result must be the same */ + { + /* When the TCP socket is not connected NO events will be returned. + * When connected and no data pending it will get the write event. + * UDP sockets don't have connections so as soon as they are bound + * they can read/write data. Since nobody is sendind us data only + * the write event will be returned and ONLY once. + */ + ok (!WSAEventSelect(s, event, FD_READ | FD_WRITE), "Test[%d]: WSAEventSelect failed\n", i); + memset(&net_events, 0xAB, sizeof(net_events)); + ok (!WSAEnumNetworkEvents(s, l == 0 ? event : NULL, &net_events), + "Test[%d]: WSAEnumNetworkEvents failed\n", i); + if (i >= 1 && j == 0) /* FD_WRITE is SET on first try for UDP and connected TCP */ + { + if (i == 0) /* Remove when fixed */ + { + todo_wine + ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", + i, net_events.lNetworkEvents); + } + else + ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", + i, net_events.lNetworkEvents); + } + else + { + if (i != 0) /* Remove when fixed */ + { + todo_wine + ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", + i, net_events.lNetworkEvents); + } + else + ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", + i, net_events.lNetworkEvents); + } + for (k = 0; k < FD_MAX_EVENTS; k++) + { + if (i >= 1 && j == 0 && k == 1) /* first UDP and connected TCP test, FD_WRITE bit no error*/ + { + ok (net_events.iErrorCode[k] == 0x0, "Test[%d][%d]: expected 0x0, got 0x%x\n", + i, k, net_events.iErrorCode[k]); + } + else + { + /* Bits that are not set in lNetworkEvents MUST not be changed */ + todo_wine + ok (net_events.iErrorCode[k] == 0xABABABAB, "Test[%d][%d]: expected 0xABABABAB, got 0x%x\n", + i, k, net_events.iErrorCode[k]); + } + } + } + closesocket(s); + WSACloseEvent(event); + if (i == 2) closesocket(s2); + } + } +} + static void test_WSAAddressToStringA(void) { SOCKET v6 = INVALID_SOCKET; @@ -8454,6 +8546,7 @@ START_TEST( sock ) test_getservbyname(); test_WSASocket(); test_WSADuplicateSocket(); + test_WSAEnumNetworkEvents(); test_WSAAddressToStringA(); test_WSAAddressToStringW();

1 0

Bruno Jesus : ws2_32/tests: Skip part of OOB test to unfreeze NT4 test.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 45d64ce26bf80d40ec30054740e9e85819ad9d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d64ce26bf80d40ec3005474… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Mar 31 00:06:40 2015 -0300 ws2_32/tests: Skip part of OOB test to unfreeze NT4 test. NT4 doesn't care about OOB_INLINE and receives data in the wrong recv call so the next call never receives data and hangs forever. Skip it to resume NT4 test normally. --- dlls/ws2_32/tests/sock.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 188e25c..533e58c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3741,11 +3741,14 @@ static void test_select(void) tmp_buf[0] = 0xAF; SetLastError(0xdeadbeef); ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), MSG_OOB); - ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); /* can't recv with MSG_OOB if OOBINLINED */ - ok(GetLastError() == WSAEINVAL, "expected 10022, got %d\n", GetLastError()); - ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); - ok(ret == 1, "expected 1, got %d\n", ret); - ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); + if (ret == SOCKET_ERROR) /* can't recv with MSG_OOB if OOBINLINED */ + { + ok(GetLastError() == WSAEINVAL, "expected 10022, got %d\n", GetLastError()); + ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); + } + else ok(broken(ret == 1) /* <= NT4 */, "expected error, got 1\n"); /* When the connection is closed the socket is set in the read descriptor */ ret = closesocket(fdRead); @@ -4724,15 +4727,18 @@ todo_wine i = MSG_OOB; SetLastError(0xdeadbeef); ret = recv(dst, &data, 1, i); - ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); - ret = GetLastError(); - ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); - bufs.len = sizeof(char); - bufs.buf = &data; - ret = WSARecv(dst, &bufs, 1, &bytes_rec, &i, NULL, NULL); - ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); - ret = GetLastError(); - ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); + if (ret == SOCKET_ERROR) + { + ret = GetLastError(); + ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); + bufs.len = sizeof(char); + bufs.buf = &data; + ret = WSARecv(dst, &bufs, 1, &bytes_rec, &i, NULL, NULL); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); + ret = GetLastError(); + ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); + } + else ok(broken(ret == 1) /* <= NT4 */, "expected error, got 1\n"); closesocket(dst); optval = 0xdeadbeef;

1 0

Bruno Jesus : ws2_32: Fix return value when receiving with MSG_OOB without data to read.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: e845bded34247dda124a6355dfd9beda2f17dd01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e845bded34247dda124a6355d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Mar 31 00:06:52 2015 -0300 ws2_32: Fix return value when receiving with MSG_OOB without data to read. --- dlls/ws2_32/socket.c | 5 +++++ dlls/ws2_32/tests/sock.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4444011..52fd03b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6837,6 +6837,11 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, n = WS2_recv( fd, wsa, flags ); if (n == -1) { + /* Unix-like systems return EINVAL when attempting to read OOB data from + * an empty socket buffer, convert that to a Windows expected return. */ + if ((flags & MSG_OOB) && errno == EINVAL) + errno = EWOULDBLOCK; + if (errno != EAGAIN) { int loc_errno = errno; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 533e58c..287a24b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4712,14 +4712,12 @@ static void test_ioctlsocket(void) ret = recv(dst, &data, 1, i); ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); ret = GetLastError(); -todo_wine ok(ret == WSAEWOULDBLOCK, "expected 10035, got %d\n", ret); bufs.len = sizeof(char); bufs.buf = &data; ret = WSARecv(dst, &bufs, 1, &bytes_rec, &i, NULL, NULL); ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); ret = GetLastError(); -todo_wine ok(ret == WSAEWOULDBLOCK, "expected 10035, got %d\n", ret); optval = 1; ret = setsockopt(dst, SOL_SOCKET, SO_OOBINLINE, (void *)&optval, sizeof(optval));

1 0

Nikolay Sivov : taskmgr: Set column order through listview.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: db4dd8cd382631cdce799b3d8f7bc1c0718e0dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4dd8cd382631cdce799b3d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 23:49:44 2015 +0300 taskmgr: Set column order through listview. --- programs/taskmgr/column.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/taskmgr/column.c b/programs/taskmgr/column.c index 4fd02dd..35ba2a0 100644 --- a/programs/taskmgr/column.c +++ b/programs/taskmgr/column.c @@ -171,7 +171,7 @@ void AddColumns(void) InsertColumn(24, wszIOOtherBytes, LVCFMT_RIGHT, TaskManagerSettings.ColumnSizeArray[24], -1); size = SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); - SendMessageW(hProcessPageHeaderCtrl, HDM_SETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); + SendMessageW(hProcessPageListCtrl, LVM_SETCOLUMNORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray); UpdateColumnDataHints(); }

1 0

Nikolay Sivov : comctl32/dsa: Implement DSA_Clone().
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: ff0634dfe18b87f75d2d00e8c114d25c27f0f0a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0634dfe18b87f75d2d00e8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 31 08:44:23 2015 +0300 comctl32/dsa: Implement DSA_Clone(). --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/dsa.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 0bd8b13..aff8c8b 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -131,6 +131,7 @@ @ stdcall DrawShadowText(long wstr long ptr long long long long long) @ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA @ stdcall DrawStatusTextW(long ptr wstr long) +@ stdcall DSA_Clone(ptr) @ stdcall FlatSB_EnableScrollBar (long long long) @ stdcall FlatSB_GetScrollInfo (long long ptr) @ stdcall FlatSB_GetScrollPos (long long) diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index 71837db..73f0d30 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -434,3 +434,39 @@ void WINAPI DSA_DestroyCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, DSA_EnumCallback (hdsa, enumProc, lParam); DSA_Destroy (hdsa); } + +/************************************************************************** + * DSA_Clone [COMCTL32.@] + * + * Creates a copy of a dsa + * + * PARAMS + * hdsa [I] handle to the dynamic storage array + * + * RETURNS + * Cloned dsa + */ +HDSA WINAPI DSA_Clone(HDSA hdsa) +{ + HDSA dest; + INT i; + + TRACE("(%p)\n", hdsa); + + if (!hdsa) + return NULL; + + dest = DSA_Create (hdsa->nItemSize, hdsa->nGrow); + if (!dest) + return NULL; + + for (i = 0; i < hdsa->nItemCount; i++) { + void *ptr = DSA_GetItemPtr (hdsa, i); + if (DSA_InsertItem (dest, DA_LAST, ptr) == -1) { + DSA_Destroy (dest); + return NULL; + } + } + + return dest; +}

1 0