December 2012 - Wine-Commits

Daniel Jelinski : comctl32/listview: Forward more header notifications to parent window.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 06a0a01e18dc523480b224f9f270f61ae18843ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a0a01e18dc523480b224f9f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Dec 8 15:02:41 2012 +0100 comctl32/listview: Forward more header notifications to parent window. --- dlls/comctl32/listview.c | 26 +++++++++++--------------- dlls/comctl32/tests/listview.c | 8 +++----- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d823f26..cf7cc6d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10272,26 +10272,25 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, NMHDR *lpnmhdr) LISTVIEW_GetOrigin(infoPtr, &ptOrigin); infoPtr->xTrackLine = x + ptOrigin.x; LISTVIEW_DrawTrackLine(infoPtr); - break; + return notify_forward_header(infoPtr, lpnmh); } - + case HDN_ENDTRACKA: case HDN_ENDTRACKW: /* remove the track line (if any) */ LISTVIEW_DrawTrackLine(infoPtr); infoPtr->xTrackLine = -1; - break; + return notify_forward_header(infoPtr, lpnmh); case HDN_BEGINDRAG: - notify_forward_header(infoPtr, lpnmh); - return (infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) == 0; + if ((infoPtr->dwLvExStyle & LVS_EX_HEADERDRAGDROP) == 0) return 1; + return notify_forward_header(infoPtr, lpnmh); case HDN_ENDDRAG: infoPtr->colRectsDirty = TRUE; LISTVIEW_InvalidateList(infoPtr); - notify_forward_header(infoPtr, lpnmh); - return FALSE; - + return notify_forward_header(infoPtr, lpnmh); + case HDN_ITEMCHANGEDW: case HDN_ITEMCHANGEDA: { @@ -10371,8 +10370,8 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, NMHDR *lpnmhdr) LISTVIEW_InvalidateRect(infoPtr, &rcCol); } } - } - break; + break; + } case HDN_ITEMCLICKW: case HDN_ITEMCLICKA: @@ -10384,9 +10383,8 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, NMHDR *lpnmhdr) nmlv.iItem = -1; nmlv.iSubItem = lpnmh->iItem; notify_listview(infoPtr, LVN_COLUMNCLICK, &nmlv); - notify_forward_header(infoPtr, lpnmh); + return notify_forward_header(infoPtr, lpnmh); } - break; case HDN_DIVIDERDBLCLICKW: case HDN_DIVIDERDBLCLICKA: @@ -10394,10 +10392,8 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, NMHDR *lpnmhdr) we should use LVSCW_AUTOSIZE_USEHEADER, helper rework or split needed for that */ LISTVIEW_SetColumnWidth(infoPtr, lpnmh->iItem, LVSCW_AUTOSIZE); - notify_forward_header(infoPtr, lpnmh); - break; + return notify_forward_header(infoPtr, lpnmh); } - return 0; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5ea0b03..0dfddef 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5012,22 +5012,20 @@ static void test_header_notification2(void) ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); parent_header_notify_seq[0].id = HDN_ENDTRACKA; ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, - "header notify, parent", TRUE); - todo_wine + "header notify, parent", FALSE); ok(nmhdr.hdr.code == HDN_ENDTRACKA, "Expected ANSI notification code\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_TRACKW; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); parent_header_notify_seq[0].id = HDN_TRACKA; ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_notify_seq, - "header notify, parent", TRUE); - todo_wine + "header notify, parent", FALSE); ok(nmhdr.hdr.code == HDN_TRACKA, "Expected ANSI notification code\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_BEGINDRAG; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, - "header notify, parent", TRUE); + "header notify, parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_ENDDRAG; ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr);

1 0

Sylvain Petreolle : setupapi: Add stub for SetupAddToSourceListW.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 8a0442124462ac37273b94b22c35b6ccb8dc6145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0442124462ac37273b94b22… Author: Sylvain Petreolle <spetreolle(a)yahoo.fr> Date: Sat Dec 8 18:40:37 2012 +0100 setupapi: Add stub for SetupAddToSourceListW. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 38113e3..9733a08 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -249,7 +249,7 @@ @ stdcall SetupAddToDiskSpaceListA(long str int64 long ptr long) @ stdcall SetupAddToDiskSpaceListW(long wstr int64 long ptr long) @ stdcall SetupAddToSourceListA(long str) -@ stub SetupAddToSourceListW +@ stdcall SetupAddToSourceListW(long wstr) @ stub SetupAdjustDiskSpaceListA @ stub SetupAdjustDiskSpaceListW @ stub SetupCancelTemporarySourceList diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index db05e64..d6968a6 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -241,6 +241,15 @@ BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source) } /*********************************************************************** + * SetupAddToSourceListW (SETUPAPI.@) + */ +BOOL WINAPI SetupAddToSourceListW(DWORD flags, PCWSTR source) +{ + FIXME("0x%08x %s\n", flags, debugstr_w(source)); + return TRUE; +} + +/*********************************************************************** * SetupSetSourceListA (SETUPAPI.@) */ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count)

1 0

Alexandre Goujon : kernel32: Use the FSD sector location to compute the serial of a UDF volume.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: d0001e357a4e054a883a02cf97be02db90310088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0001e357a4e054a883a02cf9… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Sat Dec 8 10:55:19 2012 +0100 kernel32: Use the FSD sector location to compute the serial of a UDF volume. --- dlls/kernel32/volume.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 200c293..8ca4555 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -567,11 +567,72 @@ static void VOLUME_GetSuperblockLabel( const UNICODE_STRING *device, HANDLE hand /************************************************************************** + * UDF_Find_FSD_Sector + * Find the File Set Descriptor used to compute the serial of a UDF volume + */ +static int UDF_Find_FSD_Sector( HANDLE handle, BYTE block[] ) +{ + int i, PVD_sector, PD_sector, PD_length; + + if(!UDF_Find_PVD(handle,block)) + goto default_sector; + + /* Retrieve the tag location of the PVD -- [E] 3/7.2 */ + PVD_sector = block[12 + 0]; + PVD_sector |= block[12 + 1] << 8; + PVD_sector |= block[12 + 2] << 16; + PVD_sector |= block[12 + 3] << 24; + + /* Find the Partition Descriptor */ + for(i=PVD_sector+1; ; i++) + { + if(!VOLUME_ReadCDBlock(handle, block, i*BLOCK_SIZE)) + goto default_sector; + + /* Partition Descriptor Tag Id -- [E] 3/10.5.1 */ + if(block[0]==5 && block[1]==0) + break; + + /* Terminating Descriptor Tag Id -- [E] 3/10.9.1 */ + if(block[0]==8 && block[1]==0) + goto default_sector; + } + + /* Find the partition starting location -- [E] 3/10.5.8 */ + PD_sector = block[188 + 0]; + PD_sector |= block[188 + 1] << 8; + PD_sector |= block[188 + 2] << 16; + PD_sector |= block[188 + 3] << 24; + + /* Find the partition length -- [E] 3/10.5.9 */ + PD_length = block[192 + 0]; + PD_length |= block[192 + 1] << 8; + PD_length |= block[192 + 2] << 16; + PD_length |= block[192 + 3] << 24; + + for(i=PD_sector; i<PD_sector+PD_length; i++) + { + if(!VOLUME_ReadCDBlock(handle, block, i*BLOCK_SIZE)) + goto default_sector; + + /* File Set Descriptor Tag Id -- [E] 3/14.1.1 */ + if(block[0]==0 && block[1]==1) + return i; + } + +default_sector: + WARN("FSD sector not found, serial may be incorrect\n"); + return 257; +} + + +/************************************************************************** * VOLUME_GetSuperblockSerial */ static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, HANDLE handle, enum fs_type type, const BYTE *superblock ) { + int FSD_sector; BYTE block[BLOCK_SIZE]; switch(type) @@ -585,7 +646,8 @@ static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, HANDLE ha case FS_FAT32: return GETLONG( superblock, 0x33 ); case FS_UDF: - if (!VOLUME_ReadCDBlock(handle, block, 257*BLOCK_SIZE)) + FSD_sector = UDF_Find_FSD_Sector(handle, block); + if (!VOLUME_ReadCDBlock(handle, block, FSD_sector*BLOCK_SIZE)) break; superblock = block; /* fallthrough */

1 0

Amine Khaldi : include: Define CONTAINING_RECORD using the standard offsetof.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 649c982e60d312e0a539f0c20d6ee4f2ea37ba40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=649c982e60d312e0a539f0c20… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:15:36 2012 +0100 include: Define CONTAINING_RECORD using the standard offsetof. --- include/winnt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 5f753bc..467b427 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -749,7 +749,7 @@ typedef struct _MEMORY_BASIC_INFORMATION #define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field)) #define CONTAINING_RECORD(address, type, field) \ - ((type *)((PCHAR)(address) - (PCHAR)(&((type *)0)->field))) + ((type *)((PCHAR)(address) - offsetof(type, field))) /* Types */

1 0

Hans Leidekker : wininet: Don' t perform revocation checks when verifying a certificate.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 59247cf9db6b73023eb8e0215a2a4b08a2e4144c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59247cf9db6b73023eb8e0215… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 11 09:45:55 2012 +0100 wininet: Don't perform revocation checks when verifying a certificate. --- dlls/wininet/netconnection.c | 34 +++------------------------------- 1 files changed, 3 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a792a92..e7a3274 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -222,25 +222,19 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR PCCERT_CHAIN_CONTEXT chain; char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH; char *server_auth[] = { oid_server_auth }; - DWORD err = ERROR_SUCCESS, chainFlags = 0, errors; + DWORD err = ERROR_SUCCESS, errors; static const DWORD supportedErrors = CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN | - CERT_TRUST_IS_OFFLINE_REVOCATION | - CERT_TRUST_REVOCATION_STATUS_UNKNOWN | - CERT_TRUST_IS_REVOKED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE; TRACE("verifying %s\n", debugstr_w(conn->server->name)); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if (!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - chainFlags |= CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT; - - if (!(ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, chainFlags, NULL, &chain))) { + if (!(ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, 0, NULL, &chain))) { TRACE("failed\n"); return GetLastError(); } @@ -249,7 +243,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR do { /* This seems strange, but that's what tests show */ - if(errors & (CERT_TRUST_IS_PARTIAL_CHAIN|CERT_TRUST_IS_OFFLINE_REVOCATION)) { + if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { WARN("ERROR_INTERNET_SEC_CERT_REV_FAILED\n"); err = ERROR_INTERNET_SEC_CERT_REV_FAILED; if(conn->mask_errors) @@ -300,28 +294,6 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; } - if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { - WARN("CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) { - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_NO_REV; - if(!conn->mask_errors) - break; - conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; - } - errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); - } - - if(errors & CERT_TRUST_IS_REVOKED) { - WARN("CERT_TRUST_IS_REVOKED\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) { - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REVOKED; - if(!conn->mask_errors) - break; - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); - } - errors &= ~CERT_TRUST_IS_REVOKED; - } - if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) {

1 0

Amine Khaldi : include: Define WINE_RB_ENTRY_VALUE using the standard offsetof.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: d6617e1ec52a64b556b2ae6e6c732c748b05a23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6617e1ec52a64b556b2ae6e6… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:17:41 2012 +0100 include: Define WINE_RB_ENTRY_VALUE using the standard offsetof. --- include/wine/rbtree.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index de29d10..2276e30 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -23,7 +23,7 @@ #define __WINE_WINE_RBTREE_H #define WINE_RB_ENTRY_VALUE(element, type, field) \ - ((type *)((char *)(element) - FIELD_OFFSET(type, field))) + ((type *)((char *)(element) - offsetof(type, field))) struct wine_rb_entry {

1 0

Detlef Riekenberg : advapi32/tests: Accept win8 failure code.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: fa59d1e5d790fd6dbd8e7b44f93a56991bf76019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa59d1e5d790fd6dbd8e7b44f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 11 18:10:29 2012 +0100 advapi32/tests: Accept win8 failure code. --- dlls/advapi32/tests/registry.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 307d1c7..33b5d9b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -823,7 +823,8 @@ static void test_get_value(void) /* Query REG_EXPAND_SZ using RRF_RT_REG_EXPAND_SZ (not allowed without RRF_NOEXPAND) */ ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_EXPAND_SZ, NULL, NULL, NULL); - ok(ret == ERROR_INVALID_PARAMETER, "ret=%d\n", ret); + /* before win8: ERROR_INVALID_PARAMETER, win8: ERROR_UNSUPPORTED_TYPE */ + ok(ret == ERROR_INVALID_PARAMETER || ret == ERROR_UNSUPPORTED_TYPE, "ret=%d\n", ret); /* Query REG_EXPAND_SZ using RRF_RT_ANY */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf);

1 0

Daniel Jelinski : comctl32/listview: Convert header notifications to ANSI in place.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 12c065111bfd2afec67d4d57b82e3c1134b8a8ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c065111bfd2afec67d4d57b… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Dec 8 09:08:02 2012 +0100 comctl32/listview: Convert header notifications to ANSI in place. --- dlls/comctl32/listview.c | 47 +++++++++++++++++++-------------------- dlls/comctl32/tests/listview.c | 2 - 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 918faa8..d823f26 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -774,13 +774,11 @@ static int get_ansi_notification(UINT unicodeNotificationCode) } /* forwards header notifications to listview parent */ -static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADERW *lpnmh) +static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lpnmhW) { - NMHEADERA nmhA; - HDITEMA hditema; - HD_TEXTFILTERA textfilter; - LPSTR text = NULL, filter = NULL; + LPCWSTR text = NULL, filter = NULL; LRESULT ret; + NMHEADERA *lpnmh = (NMHEADERA*) lpnmhW; /* on unicode format exit earlier */ if (infoPtr->notifyFormat == NFR_UNICODE) @@ -789,37 +787,38 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADE /* header always supplies unicode notifications, all we have to do is to convert strings to ANSI */ - nmhA = *(const NMHEADERA*)lpnmh; if (lpnmh->pitem) { - hditema = *(HDITEMA*)lpnmh->pitem; - nmhA.pitem = &hditema; /* convert item text */ if (lpnmh->pitem->mask & HDI_TEXT) { - hditema.pszText = NULL; - Str_SetPtrWtoA(&hditema.pszText, lpnmh->pitem->pszText); - text = hditema.pszText; + text = (LPCWSTR)lpnmh->pitem->pszText; + Str_SetPtrWtoA(&lpnmh->pitem->pszText, text); } /* convert filter text */ if ((lpnmh->pitem->mask & HDI_FILTER) && (lpnmh->pitem->type == HDFT_ISSTRING) && lpnmh->pitem->pvFilter) { - hditema.pvFilter = &textfilter; - textfilter = *(HD_TEXTFILTERA*)(lpnmh->pitem->pvFilter); - textfilter.pszText = NULL; - Str_SetPtrWtoA(&textfilter.pszText, ((HD_TEXTFILTERW*)lpnmh->pitem->pvFilter)->pszText); - filter = textfilter.pszText; + filter = (LPCWSTR)((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText; + Str_SetPtrWtoA(&((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText, filter); } } - nmhA.hdr.code = get_ansi_notification(lpnmh->hdr.code); + lpnmh->hdr.code = get_ansi_notification(lpnmh->hdr.code); - ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmhA.hdr.idFrom, - (LPARAM)&nmhA); + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, lpnmh->hdr.idFrom, + (LPARAM)lpnmh); /* cleanup */ - Free(text); - Free(filter); + if(text) + { + Free(lpnmh->pitem->pszText); + lpnmh->pitem->pszText = (LPSTR)text; + } + if(filter) + { + Free(((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText); + ((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText = (LPSTR)filter; + } return ret; } @@ -10238,9 +10237,9 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) * RETURN: * Zero */ -static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr) +static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, NMHDR *lpnmhdr) { - const NMHEADERW *lpnmh; + NMHEADERW *lpnmh; TRACE("(lpnmhdr=%p)\n", lpnmhdr); @@ -10248,7 +10247,7 @@ static LRESULT LISTVIEW_Notify(LISTVIEW_INFO *infoPtr, const NMHDR *lpnmhdr) /* remember: HDN_LAST < HDN_FIRST */ if (lpnmhdr->code > HDN_FIRST || lpnmhdr->code < HDN_LAST) return 0; - lpnmh = (const NMHEADERW *)lpnmhdr; + lpnmh = (NMHEADERW *)lpnmhdr; if (lpnmh->iItem < 0 || lpnmh->iItem >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return 0; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6dfeb26..5ea0b03 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4988,7 +4988,6 @@ static void test_header_notification2(void) ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_click_seq, "header notify, parent", FALSE); - todo_wine ok(nmhdr.hdr.code == HDN_ITEMCLICKA, "Expected ANSI notification code\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_ITEMDBLCLICKW; @@ -5001,7 +5000,6 @@ static void test_header_notification2(void) ret = SendMessageW(list, WM_NOTIFY, 0, (LPARAM)&nmhdr); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_header_divider_dclick_seq, "header notify, parent", TRUE); - todo_wine ok(nmhdr.hdr.code == HDN_DIVIDERDBLCLICKA, "Expected ANSI notification code\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); nmhdr.hdr.code = HDN_BEGINTRACKW;

1 0

Andrew Talbot : comctl32: Indentation fix.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 441780b2f1375f3cded9ba6f90718871b839f22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=441780b2f1375f3cded9ba6f9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 10 22:43:34 2012 +0000 comctl32: Indentation fix. --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3b2f747..57cb70c 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1562,7 +1562,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM item) newFirstVisible = item->prevSibling; else if (item->parent != infoPtr->root) newFirstVisible = item->parent; - TREEVIEW_SetFirstVisible(infoPtr, NULL, TRUE); + TREEVIEW_SetFirstVisible(infoPtr, NULL, TRUE); } else newFirstVisible = infoPtr->firstVisible;

1 0

Francois Gouget : wined3d: Remove a stray semi-colon from the spec file.
by Alexandre Julliard Dec. 11, 2012

Dec. 11, 2012

Module: wine Branch: master Commit: 130cabbca6dd520d589f2e97614bd8b13289fd94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=130cabbca6dd520d589f2e976… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 11 10:52:12 2012 +0100 wined3d: Remove a stray semi-colon from the spec file. --- dlls/wined3d/wined3d.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1d6e2b3..3b39c41 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -154,7 +154,7 @@ @ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_i(ptr long ptr long) -@ cdecl wined3d_device_set_vs_sampler(ptr long ptr); +@ cdecl wined3d_device_set_vs_sampler(ptr long ptr) @ cdecl wined3d_device_setup_fullscreen_window(ptr ptr long long) @ cdecl wined3d_device_show_cursor(ptr long) @ cdecl wined3d_device_uninit_3d(ptr)

1 0