August 2009 - Wine-commits - list.winehq.org

Dylan Smith : richedit: Added missing style releases.
by Alexandre Julliard 10 Aug '09

10 Aug '09

Module: wine Branch: master Commit: 114a64ce5d83dd34e4b86df36925bf8c7feeb97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=114a64ce5d83dd34e4b86df36… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 10 10:53:53 2009 -0400 richedit: Added missing style releases. Style objects are referenced counted in richedit controls, so I tried to make sure styles were released properly. This can be checked using with the all_refs global reference count to see if everything is cleaned up. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 18 ++++++++++++------ dlls/riched20/style.c | 2 ++ dlls/riched20/table.c | 1 + 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 058d278..ca34977 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -475,7 +475,7 @@ void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) di = ME_InternalInsertTextFromCursor(editor, nCursor, &space, 1, pStyle, MERF_ENDROW); - ME_SendSelChange(editor); + ME_ReleaseStyle(pStyle); } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b08c238..2b6f61f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1355,15 +1355,13 @@ static void ME_RTFReadHook(RTF_Info *info) { RTFFlushOutputBuffer(info); info->stackTop--; - if (info->stackTop<=0) { + if (info->stackTop <= 0) info->rtfClass = rtfEOF; + if (info->stackTop < 0) return; - } - assert(info->stackTop >= 0); ME_ReleaseStyle(info->style); info->style = info->stack[info->stackTop].style; - ME_AddRefStyle(info->style); info->codePage = info->stack[info->stackTop].codePage; info->unicodeLength = info->stack[info->stackTop].unicodeLength; break; @@ -1530,8 +1528,16 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (parser.lpRichEditOle) IRichEditOle_Release(parser.lpRichEditOle); - if (!inStream.editstream->dwError && parser.stackTop > 0) - inStream.editstream->dwError = HRESULT_FROM_WIN32(ERROR_HANDLE_EOF); + if (parser.stackTop > 0) + { + while (--parser.stackTop >= 0) + { + ME_ReleaseStyle(parser.style); + parser.style = parser.stack[parser.stackTop].style; + } + if (!inStream.editstream->dwError) + inStream.editstream->dwError = HRESULT_FROM_WIN32(ERROR_HANDLE_EOF); + } /* Remove last line break, as mandated by tests. This is not affected by CR/LF counters, since RTF streaming presents only \para tokens, which diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index a3b532e..a479c0a 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -156,6 +156,7 @@ ME_Style *ME_MakeStyle(CHARFORMAT2W *style) { s->hFont = NULL; s->tm.tmAscent = -1; all_refs++; + TRACE_(richedit_style)("ME_MakeStyle %p, total refs=%d\n", s, all_refs); return s; } @@ -449,6 +450,7 @@ void ME_AddRefStyle(ME_Style *s) assert(s->nRefs>0); /* style with 0 references isn't supposed to exist */ s->nRefs++; all_refs++; + TRACE_(richedit_style)("ME_AddRefStyle %p, new refs=%d, total refs=%d\n", s, s->nRefs, all_refs); } void ME_ReleaseStyle(ME_Style *s) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 6c8ca76..69f4851 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -70,6 +70,7 @@ static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, } tp = ME_SplitParagraph(editor, cursor->pRun, pStyle, eol_str, paraFlags); + ME_ReleaseStyle(pStyle); cursor->pPara = tp; cursor->pRun = ME_FindItemFwd(tp, diRun); return tp;

1 0

Dylan Smith : richedit: Add closing actions for IRichEditOle_fnInsertObject .
by Alexandre Julliard 10 Aug '09

10 Aug '09

Module: wine Branch: master Commit: fc618ab041e3c45a10cdbecc44203d70d3bb73b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc618ab041e3c45a10cdbecc4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 10 10:53:48 2009 -0400 richedit: Add closing actions for IRichEditOle_fnInsertObject. Previously inserting the object didn't result in the text being wrapped, which would cause an assertion error when this is checked for during repainting the text. It is also important to invalidate the affected areas of text, update the scrollbar, and end the creation of undo transactions for this insertion. --- dlls/riched20/caret.c | 2 +- dlls/riched20/richole.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 33dbdaf..058d278 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -459,7 +459,7 @@ void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCur MERF_GRAPHICS); di->member.run.ole_obj = ALLOC_OBJ(*reo); ME_CopyReObject(di->member.run.ole_obj, reo); - ME_SendSelChange(editor); + ME_ReleaseStyle(pStyle); } diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 326ecc5..61cf6bb 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -388,6 +388,8 @@ IRichEditOle_fnInsertObject(IRichEditOle *me, REOBJECT *reo) if (reo->polesite) IOleClientSite_AddRef(reo->polesite); ME_InsertOLEFromCursor(This->editor, reo, 0); + ME_CommitUndo(This->editor); + ME_UpdateRepaint(This->editor); return S_OK; }

1 0

Dylan Smith : richedit: Use richedit class string macros from public headers.
by Alexandre Julliard 10 Aug '09

10 Aug '09

Module: wine Branch: master Commit: 71cb069246398cc01bbd883a8a6bfd7d1269d53a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cb069246398cc01bbd883a8… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 10 10:53:36 2009 -0400 richedit: Use richedit class string macros from public headers. --- dlls/riched20/editor.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ff26265..b08c238 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -243,8 +243,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_RegisterEditorClass(HINSTANCE); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, int sel_min, int sel_max); -static const WCHAR RichEdit20W[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0}; -static const WCHAR RichEdit50W[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; static const WCHAR REListBox20W[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; static const WCHAR REComboBox20W[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; static HCURSOR hLeft; @@ -2751,9 +2749,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; case DLL_PROCESS_DETACH: - UnregisterClassW(RichEdit20W, 0); - UnregisterClassW(RichEdit50W, 0); - UnregisterClassA("RichEdit20A", 0); + UnregisterClassW(RICHEDIT_CLASS20W, 0); + UnregisterClassW(MSFTEDIT_CLASS, 0); + UnregisterClassA(RICHEDIT_CLASS20A, 0); UnregisterClassA("RichEdit50A", 0); if (ME_ListBoxRegistered) UnregisterClassW(REListBox20W, 0); @@ -4566,9 +4564,9 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) if (is_version_nt()) { - wcW.lpszClassName = RichEdit20W; + wcW.lpszClassName = RICHEDIT_CLASS20W; if (!RegisterClassW(&wcW)) return FALSE; - wcW.lpszClassName = RichEdit50W; + wcW.lpszClassName = MSFTEDIT_CLASS; if (!RegisterClassW(&wcW)) return FALSE; } else @@ -4589,7 +4587,7 @@ static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) wcA.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); wcA.hbrBackground = GetStockObject(NULL_BRUSH); wcA.lpszMenuName = NULL; - wcA.lpszClassName = "RichEdit20A"; + wcA.lpszClassName = RICHEDIT_CLASS20A; if (!RegisterClassA(&wcA)) return FALSE; wcA.lpszClassName = "RichEdit50A"; if (!RegisterClassA(&wcA)) return FALSE;

1 0

Dylan Smith : richedit: Remove header function declarations with no definition.
by Alexandre Julliard 10 Aug '09

10 Aug '09

Module: wine Branch: master Commit: 832ffe108c0f9f02fb8f797d0baad0f53e6f0a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=832ffe108c0f9f02fb8f797d0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 10 10:53:25 2009 -0400 richedit: Remove header function declarations with no definition. --- dlls/riched20/editor.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 0929e82..7d9f704 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -95,7 +95,6 @@ ME_String *ME_VSplitString(ME_String *orig, int nVPos); int ME_IsWhitespaces(const ME_String *s); int ME_IsSplitable(const ME_String *s); int ME_FindNonWhitespaceV(const ME_String *s, int nVChar); -int ME_FindWhitespaceV(ME_String *s, int nVChar); int ME_CallWordBreakProc(ME_TextEditor *editor, ME_String *str, INT start, INT code); void ME_StrDeleteV(ME_String *s, int nVChar, int nChars); /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ @@ -120,7 +119,6 @@ int ME_ReverseFindWhitespaceV(const ME_String *s, int nVChar); /* row.c */ ME_DisplayItem *ME_RowStart(ME_DisplayItem *item); /* ME_DisplayItem *ME_RowEnd(ME_DisplayItem *item); */ -void ME_RenumberParagraphs(ME_DisplayItem *item); /* TODO */ ME_DisplayItem *ME_FindRowWithNumber(ME_TextEditor *editor, int nRow); int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs); @@ -136,14 +134,11 @@ int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run); /* this one accounts for 1/2 char tolerance */ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run); int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset); -int ME_GetLastSplittablePlace(ME_Context *c, ME_Run *run); int ME_CanJoinRuns(const ME_Run *run1, const ME_Run *run2); void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p); ME_DisplayItem *ME_SplitRun(ME_WrapContext *wc, ME_DisplayItem *item, int nChar); ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_DisplayItem *item, int nChar); -int ME_FindSplitPoint(ME_Context *c, POINT *pt, ME_Run *run, int desperate); void ME_UpdateRunFlags(ME_TextEditor *editor, ME_Run *run); -ME_DisplayItem *ME_SplitFurther(ME_TextEditor *editor, ME_DisplayItem *run); void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Run *run); SIZE ME_GetRunSize(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx); void ME_CursorFromCharOfs(ME_TextEditor *editor, int nCharOfs, ME_Cursor *pCursor); @@ -253,7 +248,6 @@ void ME_RTFTblAttrHook(struct _RTF_Info *info); void ME_RTFSpecialCharHook(struct _RTF_Info *info); void ME_StreamInFill(ME_InStream *stream); extern int me_debug; -extern void DoWrap(ME_TextEditor *editor); /* table.c */ BOOL ME_IsInTable(ME_DisplayItem *pItem);

1 0

Dylan Smith : richedit: Implement ME_DITypesEqual using a switch statment.
by Alexandre Julliard 10 Aug '09

10 Aug '09

Module: wine Branch: master Commit: 67826276248e98ddfc9c6fe1f1d0e6434aee84ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=67826276248e98ddfc9c6fe1f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 10 10:53:21 2009 -0400 richedit: Implement ME_DITypesEqual using a switch statment. --- dlls/riched20/list.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index d3d9463..06f1121 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -44,23 +44,23 @@ void ME_Remove(ME_DisplayItem *diWhere) static BOOL ME_DITypesEqual(ME_DIType type, ME_DIType nTypeOrClass) { - if (type==nTypeOrClass) - return TRUE; - if (nTypeOrClass==diRunOrParagraph && (type==diRun || type==diParagraph)) - return TRUE; - if (nTypeOrClass==diRunOrStartRow && (type==diRun || type==diStartRow)) - return TRUE; - if (nTypeOrClass==diParagraphOrEnd && (type==diTextEnd || type==diParagraph)) - return TRUE; - if (nTypeOrClass==diStartRowOrParagraph && (type==diStartRow || type==diParagraph)) - return TRUE; - if (nTypeOrClass==diStartRowOrParagraphOrEnd - && (type==diStartRow || type==diParagraph || type==diTextEnd)) - return TRUE; - if (nTypeOrClass==diRunOrParagraphOrEnd - && (type==diRun || type==diParagraph || type==diTextEnd)) - return TRUE; - return FALSE; + switch (nTypeOrClass) + { + case diRunOrParagraph: + return type == diRun || type == diParagraph; + case diRunOrStartRow: + return type == diRun || type == diStartRow; + case diParagraphOrEnd: + return type == diTextEnd || type == diParagraph; + case diStartRowOrParagraph: + return type == diStartRow || type == diParagraph; + case diStartRowOrParagraphOrEnd: + return type == diStartRow || type == diParagraph || type == diTextEnd; + case diRunOrParagraphOrEnd: + return type == diRun || type == diParagraph || type == diTextEnd; + default: + return type == nTypeOrClass; + } } ME_DisplayItem *ME_FindItemBack(ME_DisplayItem *di, ME_DIType nTypeOrClass)

1 0

Jeff Latimer : ws2_32/tests: Tests for invalid conditions in InetNtop.
by Alexandre Julliard 10 Aug '09

10 Aug '09

Module: wine Branch: master Commit: 694b6955a36cf1960a26aafbb72f7db15df4db07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694b6955a36cf1960a26aafbb… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Sun Aug 9 10:35:46 2009 +1000 ws2_32/tests: Tests for invalid conditions in InetNtop. --- dlls/ws2_32/socket.c | 25 +++++++++++++-- dlls/ws2_32/tests/sock.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 837aad6..9471a48 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4709,22 +4709,41 @@ PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, SIZE_T len ) #ifdef HAVE_INET_NTOP struct WS_in6_addr *in6; struct WS_in_addr *in; + PCSTR pdst; TRACE("family %d, addr (%p), buffer (%p), len %ld\n", family, addr, buffer, len); + if (!buffer) + { + WSASetLastError( STATUS_INVALID_PARAMETER ); + return NULL; + } + switch (family) { case WS_AF_INET: + { in = addr; - return inet_ntop( AF_INET, &in->WS_s_addr, buffer, len ); + pdst = inet_ntop( AF_INET, &in->WS_s_addr, buffer, len ); + break; + } case WS_AF_INET6: + { in6 = addr; - return inet_ntop( AF_INET6, in6->WS_s6_addr, buffer, len ); + pdst = inet_ntop( AF_INET6, in6->WS_s6_addr, buffer, len ); + break; + } + default: + WSASetLastError( WSAEAFNOSUPPORT ); + return NULL; } + + if (!pdst) WSASetLastError( STATUS_INVALID_PARAMETER ); + return pdst; #else FIXME( "not supported on this platform\n" ); -#endif WSASetLastError( WSAEAFNOSUPPORT ); return NULL; +#endif } /*********************************************************************** diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d372d4a..7aa727a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -22,6 +22,8 @@ #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winsock2.h> @@ -2234,7 +2236,10 @@ static void test_addr_to_print(void) PCSTR addr2_Str = "::fffe:cc98:bd74"; u_char addr3_Num[16] = {0x20,0x30,0xa4,0xb1}; PCSTR addr3_Str = "2030:a4b1::"; + u_char addr4_Num[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0xcC,0x98,0xbd,0x74}; + PCSTR addr4_Str = "::204.152.189.116"; + /* Test IPv4 addresses */ in.s_addr = addr0_Num; pdst = inet_ntoa(*((struct in_addr*)&in.s_addr)); @@ -2254,6 +2259,7 @@ static void test_addr_to_print(void) return; } + /* Second part of test */ pdst = pInetNtop(AF_INET,(void*)&in.s_addr, dst, sizeof(dst)); ok(pdst != NULL, "InetNtop failed %s\n", dst); ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); @@ -2263,6 +2269,38 @@ static void test_addr_to_print(void) ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); ok(WSAGetLastError() == WSAEAFNOSUPPORT, "Should be WSAEAFNOSUPPORT\n"); + /* Test Null destination */ + pdst = NULL; + pdst = pInetNtop(AF_INET, (void*)&in.s_addr, NULL, sizeof(dst)); + ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, + "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + + /* Test zero length passed */ + WSASetLastError(0); + pdst = NULL; + pdst = pInetNtop(AF_INET, (void*)&in.s_addr, dst, 0); + ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, + "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + + /* Test length one shorter than the address length */ + WSASetLastError(0); + pdst = NULL; + pdst = pInetNtop(AF_INET, (void*)&in.s_addr, dst, 6); + ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, + "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + + /* Test longer length is ok */ + WSASetLastError(0); + pdst = NULL; + pdst = pInetNtop(AF_INET, (void*)&in.s_addr, dst, sizeof(dst)+1); + ok(pdst != NULL, "The pointer should be returned (%p)\n", pdst); + ok(!strcmp(pdst, addr1_Str),"Address %s != %s\n", pdst, addr1_Str); + + /* Test the IPv6 addresses */ + /* Test an zero prefixed IPV6 address */ memcpy(in6.u.Byte, addr2_Num, sizeof(addr2_Num)); pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); @@ -2274,6 +2312,44 @@ static void test_addr_to_print(void) pdst = pInetNtop(AF_INET6,(void*)&in6.s6_addr, dst6, sizeof(dst6)); ok(pdst != NULL, "InetNtop failed %s\n", dst6); ok(!strcmp(pdst, addr3_Str),"Address %s != %s\n", pdst, addr3_Str); + + /* Test the IPv6 address contains the IPv4 address in IPv4 notation */ + memcpy(in6.s6_addr, addr4_Num, sizeof(addr4_Num)); + pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, sizeof(dst6)); + ok(pdst != NULL, "InetNtop failed %s\n", dst6); + ok(!strcmp(pdst, addr4_Str),"Address %s != %s\n", pdst, addr4_Str); + + /* Test invalid parm conditions */ + memcpy(in6.u.Byte, addr2_Num, sizeof(addr2_Num)); + + /* Test Null destination */ + pdst = NULL; + pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, NULL, sizeof(dst6)); + ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, + "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + + /* Test zero length passed */ + WSASetLastError(0); + pdst = NULL; + pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 0); + ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, + "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + + /* Test length one shorter than the address length */ + WSASetLastError(0); + pdst = NULL; + pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst6, 16); + ok(pdst == NULL, "The pointer should not be returned (%p)\n", pdst); + ok(WSAGetLastError() == STATUS_INVALID_PARAMETER, + "Should be STATUS_INVALID_PARAMETER not 0x%x\n", WSAGetLastError()); + + /* Test longer length is ok */ + WSASetLastError(0); + pdst = NULL; + pdst = pInetNtop(AF_INET6, (void*)&in6.s6_addr, dst, 18); + ok(pdst != NULL, "The pointer should be returned (%p)\n", pdst); } static void test_ioctlsocket(void)

1 0

Austin English : ntdll: Quiet a noisy fixme.
by Alexandre Julliard 10 Aug '09

10 Aug '09

Module: wine Branch: master Commit: eb8f95b5b6df05033d5c20145412cc7f7774835e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8f95b5b6df05033d5c20145… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Aug 8 17:17:15 2009 -0500 ntdll: Quiet a noisy fixme. --- dlls/ntdll/nt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c7d931c..8679da5 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1330,7 +1330,7 @@ NTSTATUS WINAPI NtPowerInformation( } case SystemExecutionState: { PULONG ExecutionState = lpOutputBuffer; - FIXME("semi-stub: SystemExecutionState\n"); + WARN("semi-stub: SystemExecutionState\n"); /* Needed for .NET Framework, but using a FIXME is really noisy. */ if (lpInputBuffer != NULL) return STATUS_INVALID_PARAMETER; /* FIXME: The actual state should be the value set by SetThreadExecutionState which is not currently implemented. */

1 0

Piotr Caban : jscript: Fixed var handling.
by Alexandre Julliard 10 Aug '09

10 Aug '09

Module: wine Branch: master Commit: 561437ad9838347ee75a489cfcdb9d03afffb9d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=561437ad9838347ee75a489cf… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 10 12:57:42 2009 +0200 jscript: Fixed var handling. --- dlls/jscript/engine.c | 9 ++++++++- dlls/jscript/tests/run.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index dbb186f..2f884b2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -407,8 +407,15 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so for(var = source->variables; var; var = var->next) { DISPID id = 0; + BSTR name; - hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); + name = SysAllocString(var->identifier); + if(!name) + return E_OUTOFMEMORY; + + if(!lookup_global_members(parser->script, name, NULL)) + hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); + SysFreeString(name); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index d176533..5475ebb 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -63,6 +63,7 @@ DEFINE_EXPECT(global_propput_d); DEFINE_EXPECT(global_propput_i); DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); +DEFINE_EXPECT(global_notexists_d); DEFINE_EXPECT(testobj_delete); DEFINE_EXPECT(GetItemInfo_testVal); @@ -288,6 +289,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_NULL_BSTR; return S_OK; } + if(!strcmp_wa(bstrName, "notExists")) { + CHECK_EXPECT(global_notexists_d); + ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); + return DISP_E_UNKNOWNNAME; + } if(strict_dispid_check) ok(0, "unexpected call %s\n", debugstr_w(bstrName)); @@ -837,6 +843,16 @@ static void run_tests(void) parse_script_a("function reportSuccess() {}; reportSuccess();"); + SET_EXPECT(global_propget_d); + parse_script_a("var testPropGet"); + CHECK_CALLED(global_propget_d); + + SET_EXPECT(global_notexists_d); + parse_script_a("var notExists; notExists = 1;"); + CHECK_CALLED(global_notexists_d); + + parse_script_a("function f() { var testPropGet; }"); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Piotr Caban : jscript: Lookup global members after script_disp.
by Alexandre Julliard 10 Aug '09

10 Aug '09

Module: wine Branch: master Commit: 6afd53547e734c2023148006f7404940bf42ecc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afd53547e734c2023148006f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Aug 10 12:57:23 2009 +0200 jscript: Lookup global members after script_disp. --- dlls/jscript/engine.c | 36 +++++++++++++++++++++++------------- dlls/jscript/tests/run.c | 2 ++ 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f120cc6..dbb186f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -356,6 +356,26 @@ static HRESULT literal_to_var(literal_t *literal, VARIANT *v) return S_OK; } +static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t *ret) +{ + named_item_t *item; + DISPID id; + HRESULT hres; + + for(item = ctx->named_items; item; item = item->next) { + if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { + hres = disp_get_id(item->disp, identifier, 0, &id); + if(SUCCEEDED(hres)) { + if(ret) + exprval_set_idref(ret, item->disp, id); + return TRUE; + } + } + } + + return FALSE; +} + HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, jsexcept_t *ei, VARIANT *retv) { script_ctx_t *script = parser->script; @@ -493,25 +513,15 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, js } } - for(item = ctx->parser->script->named_items; item; item = item->next) { - if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { - hres = disp_get_id(item->disp, identifier, 0, &id); - if(SUCCEEDED(hres)) - break; - } - } - - if(item) { - exprval_set_idref(ret, item->disp, id); - return S_OK; - } - hres = jsdisp_get_id(ctx->parser->script->script_disp, identifier, 0, &id); if(SUCCEEDED(hres)) { exprval_set_idref(ret, (IDispatch*)_IDispatchEx_(ctx->parser->script->script_disp), id); return S_OK; } + if(lookup_global_members(ctx->parser->script, identifier, ret)) + return S_OK; + if(flags & EXPR_NEWREF) { hres = jsdisp_get_id(ctx->var_disp, identifier, fdexNameEnsure, &id); if(FAILED(hres)) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index ffbbde3..d176533 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -835,6 +835,8 @@ static void run_tests(void) parse_script_a("ok(typeof(test) === 'object', \"typeof(test) != 'object'\");"); + parse_script_a("function reportSuccess() {}; reportSuccess();"); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Alexandre Julliard : configure: Regenerate with autoconf 2.64.
by Alexandre Julliard 10 Aug '09

10 Aug '09

Module: wine Branch: master Commit: 25e9e4f07b1427b77cd935e7d2098f25771ec332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e9e4f07b1427b77cd935e7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 10 14:27:28 2009 +0200 configure: Regenerate with autoconf 2.64. --- .gitignore | 1 + configure |17627 +++++++++----------------------------------------- configure.ac | 2 +- include/config.h.in | 55 +- tools/make_makefiles | 1 + 5 files changed, 3177 insertions(+), 14509 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25e9e4f07b1427b77cd93…

1 0