October 2013 - Wine-Commits

Akihiro Sagawa : gdi32/tests: Fix copy&paste issues related to gmBlackBoxY.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 24e0e4d1509d7370649e44532feaa08ab3ae3fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24e0e4d1509d7370649e44532… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 1 22:03:14 2013 +0900 gdi32/tests: Fix copy&paste issues related to gmBlackBoxY. --- dlls/gdi32/tests/font.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9f8d970..a6f439b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4122,7 +4122,7 @@ static void test_GetGlyphOutline(void) ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } @@ -4137,7 +4137,7 @@ static void test_GetGlyphOutline(void) ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } @@ -4152,7 +4152,7 @@ static void test_GetGlyphOutline(void) ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } @@ -4165,7 +4165,7 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); todo_wine { ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } } else

1 0

Francois Gouget : cmd: Standardize the references to directories in the builtin command usage messages .
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

1 0

Francois Gouget : winmm: Fix two error messages to not point users to a MIDI Mapper configuration applet we don 't have.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

1 0

Hans Leidekker : wmic: Convert integer property values to BSTR.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 471bcd7e134db2d7edc115859b794e285f829485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=471bcd7e134db2d7edc115859… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 1 11:35:46 2013 +0200 wmic: Convert integer property values to BSTR. --- programs/wmic/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 8d89bf4..5aee4c1 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -229,6 +229,7 @@ static int query_prop( const WCHAR *alias, const WCHAR *propname ) } if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { + VariantChangeType( &v, &v, 0, VT_BSTR ); output_string( fmtW, V_BSTR( &v ) ); VariantClear( &v ); }

1 0

Piotr Caban : msvcrt: Don't forward wcsncmp to ntdll.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 26721c25f6e3e070b0c7c7cd6fb62c94a4a55811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26721c25f6e3e070b0c7c7cd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:29:22 2013 +0200 msvcrt: Don't forward wcsncmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f8a4b73..43daf0f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1492,7 +1492,7 @@ @ cdecl wcslen(wstr) MSVCRT_wcslen @ cdecl wcsncat(wstr wstr long) ntdll.wcsncat @ cdecl wcsncat_s(wstr long wstr long) MSVCRT_wcsncat_s -@ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp +@ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp @ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4b23671..97d916f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1923,3 +1923,11 @@ __int64 CDECL _wtoi64(const MSVCRT_wchar_t *str) { return _wtoi64_l(str, NULL); } + +/********************************************************************* + * wcsncmp (MSVCRT.@) + */ +int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, int n) +{ + return strncmpW(str1, str2, n); +}

1 0

Piotr Caban : msvcrt: Don't forward qsort to ntdll.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 7fb5cca3e4bc50d5a02f4be500915a98372869a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb5cca3e4bc50d5a02f4be50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:29:10 2013 +0200 msvcrt: Don't forward qsort to ntdll. --- dlls/msvcrt/misc.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index effca2b..069f733 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -294,6 +294,15 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, } /********************************************************************* + * qsort (MSVCRT.@) + */ +void CDECL MSVCRT_qsort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, + int (CDECL *compar)(const void*, const void*)) +{ + return MSVCRT_qsort_s(base, nmemb, size, compare_wrapper, compar); +} + +/********************************************************************* * _get_output_format (MSVCRT.@) */ unsigned int CDECL _get_output_format(void) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 63e4f4c..f8a4b73 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1389,7 +1389,7 @@ @ cdecl puts(str) MSVCRT_puts @ cdecl putwc(long ptr) MSVCRT_fputwc @ cdecl putwchar(long) MSVCRT__fputwchar -@ cdecl qsort(ptr long long ptr) ntdll.qsort +@ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s @ cdecl raise(long) MSVCRT_raise @ cdecl rand() MSVCRT_rand

1 0

Piotr Caban : msvcrt: Add _wtoi64_l implementation.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 3868bf06b25b16ab8e92f0c51416a2eb325d0fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3868bf06b25b16ab8e92f0c51… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:28:29 2013 +0200 msvcrt: Add _wtoi64_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4323e45..646137d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1609,7 +1609,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 57bd107..b82a58e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1967,7 +1967,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b70d4fb..0a0adf6 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1291,7 +1291,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 36cf2e4..382a52e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1264,7 +1264,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7cfc370..acf53aa 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1229,8 +1229,8 @@ @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) MSVCRT__wtoi -@ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 -# stub -ret64 _wtoi64_l(wstr ptr) +@ cdecl -ret64 _wtoi64(wstr) +@ cdecl -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l @ cdecl _wtol(wstr) MSVCRT__wtol @ cdecl _wtol_l(wstr ptr) MSVCRT__wtol_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1cf2276..4b23671 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1888,3 +1888,38 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcsstr(const MSVCRT_wchar_t *str, const MSVCRT_wcha { return strstrW(str, sub); } + +/********************************************************************* + * _wtoi64_l (MSVCRT.@) + */ +__int64 CDECL _wtoi64_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +{ + ULONGLONG RunningTotal = 0; + char bMinus = 0; + + while (isspaceW(*str)) { + str++; + } /* while */ + + if (*str == '+') { + str++; + } else if (*str == '-') { + bMinus = 1; + str++; + } /* if */ + + while (*str >= '0' && *str <= '9') { + RunningTotal = RunningTotal * 10 + *str - '0'; + str++; + } /* while */ + + return bMinus ? -RunningTotal : RunningTotal; +} + +/********************************************************************* + * _wtoi64 (MSVCRT.@) + */ +__int64 CDECL _wtoi64(const MSVCRT_wchar_t *str) +{ + return _wtoi64_l(str, NULL); +}

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: d3672524ed2fe8835479322b27f148c3e99e2843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3672524ed2fe8835479322b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 1 17:02:00 2013 +0200 Assorted spelling fixes. --- dlls/comctl32/tests/trackbar.c | 2 +- dlls/gdi32/tests/font.c | 2 +- dlls/imm32/tests/imm32.c | 2 +- dlls/kernel32/tests/console.c | 6 +++--- dlls/mshtml/nsiface.idl | 2 +- dlls/mshtml/tests/htmldoc.c | 22 +++++++++++----------- tools/winebuild/utils.c | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 2e76000..3f57b1c 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -731,7 +731,7 @@ static void test_selection(HWND hWndTrackbar){ expect(8, r); ok_sequence(sequences, TRACKBAR_SEQ_INDEX, selection_test_seq, "selection test sequence", TRUE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_selection_test_seq, "parent selection test seqence", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_selection_test_seq, "parent selection test sequence", TRUE); } static void test_thumb_length(HWND hWndTrackbar){ diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index eed9cec..9f8d970 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1304,7 +1304,7 @@ static void test_GetCharABCWidths(void) strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; - trace("ABC sign test for a varity of transforms:\n"); + trace("ABC sign test for a variety of transforms:\n"); hfont = CreateFontIndirectA(&lf); hwnd = CreateWindowEx(0, "static", "", WS_POPUP, 0,0,100,100, 0, 0, 0, NULL); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index f92b2c1..0324304 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1056,7 +1056,7 @@ static void test_InvalidIMC(void) imc2 = ImmGetContext(hwnd); ok(imc1 == imc2, "imc should not changed! imc1 %p, imc2 %p\n", imc1, imc2); - /* Test associating NULL imc, which is different to invalid imc */ + /* Test associating NULL imc, which is different from an invalid imc */ oldimc = ImmAssociateContext(hwnd, imc_null); ok(oldimc != NULL, "Associating to NULL imc should success!\n"); imc2 = ImmGetContext(hwnd); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b02e723..d2ce294 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -458,7 +458,7 @@ static void testWriteWrappedProcessed(HANDLE hCon, COORD sbSize) static void testWrite(HANDLE hCon, COORD sbSize) { - /* FIXME: should in fact insure that the sb is at least 10 character wide */ + /* FIXME: should in fact ensure that the sb is at least 10 characters wide */ ok(SetConsoleTextAttribute(hCon, TEST_ATTRIB), "Setting default text color\n"); resetContent(hCon, sbSize, FALSE); testEmptyWrite(hCon); @@ -654,8 +654,8 @@ static void testCtrlHandler(void) ok(!SetConsoleCtrlHandler(mch, FALSE), "Shouldn't succeed\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Bad error %u\n", GetLastError()); ok(SetConsoleCtrlHandler(mch, TRUE), "Couldn't set handler\n"); - /* wine requires the event for the test, as we cannot insure, so far, that event - * are processed synchronously in GenerateConsoleCtrlEvent() + /* wine requires the event for the test, as we cannot ensure, so far, that + * events are processed synchronously in GenerateConsoleCtrlEvent() */ mch_event = CreateEventA(NULL, TRUE, FALSE, NULL); mch_count = 0; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index b4a7d82..ddb6d85 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3692,7 +3692,7 @@ interface nsIDocShell : nsIDocShellTreeItem nsresult GetHasEditingSession(bool *aHasEditingSession); nsresult MakeEditable(bool inWaitForUriLoad); nsresult GetChildSHEntry(int32_t aChildOffset, nsISHEntry **_retval); - nsresult AddChildSHEntry(nsISHEntry *aCloneReference, nsISHEntry *aHistoryEntry, int32_t aChildOffset, uint32_t aLoadType, bool aCloneChilden); + nsresult AddChildSHEntry(nsISHEntry *aCloneReference, nsISHEntry *aHistoryEntry, int32_t aChildOffset, uint32_t aLoadType, bool aCloneChildren); nsresult GetUseGlobalHistory(bool *aUseGlobalHistory); nsresult SetUseGlobalHistory(bool aUseGlobalHistory); nsresult RemoveFromSessionHistory(); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 02da764..f19f04d 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -219,7 +219,7 @@ static BOOL asynchronous_binding = FALSE; static BOOL support_wbapp, allow_new_window, no_travellog; static BOOL report_mime; static BOOL testing_submit; -static BOOL reseting_document; +static BOOL resetting_document; static int stream_read, protocol_read; static IStream *history_stream; static enum load_state_t { @@ -950,7 +950,7 @@ static ULONG WINAPI PropertyNotifySink_Release(IPropertyNotifySink *iface) static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, DISPID dispID) { - if(reseting_document) + if(resetting_document) return S_OK; switch(dispID) { @@ -1853,7 +1853,7 @@ static HRESULT WINAPI InPlaceFrame_RemoveMenus(IOleInPlaceFrame *iface, HMENU hm static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLESTR pszStatusText) { - if(!reseting_document) + if(!resetting_document) CHECK_EXPECT2(SetStatusText); if(!expect_status_text) ok(pszStatusText == NULL, "pszStatusText=%p, expected NULL\n", pszStatusText); @@ -2490,7 +2490,7 @@ static HRESULT WINAPI DocHostUIHandler_ShowContextMenu(IDocHostUIHandler2 *iface static HRESULT WINAPI DocHostUIHandler_GetHostInfo(IDocHostUIHandler2 *iface, DOCHOSTUIINFO *pInfo) { - if(!reseting_document) + if(!resetting_document) CHECK_EXPECT(GetHostInfo); ok(iface == expect_uihandler_iface, "called on unexpected iface\n"); ok(pInfo != NULL, "pInfo=NULL\n"); @@ -2783,7 +2783,7 @@ static void test_save_history(IUnknown *unk) static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - if(reseting_document) + if(resetting_document) return E_FAIL; if(!pguidCmdGroup) { @@ -3160,7 +3160,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - if(reseting_document) + if(resetting_document) return E_FAIL; ok(IsEqualGUID(&IID_NULL, riid), "riid != IID_NULL\n"); @@ -3231,7 +3231,7 @@ static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember IHTMLDocument2 *doc; BSTR state; - if(reseting_document) + if(resetting_document) return E_FAIL; ok(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid)); @@ -3514,7 +3514,7 @@ static HRESULT WINAPI DocObjectService_GetPendingUrl( IDocObjectService* This, BSTR *pbstrPendingUrl) { - if(!reseting_document) + if(!resetting_document) CHECK_EXPECT(GetPendingUrl); return E_NOTIMPL; } @@ -5294,7 +5294,7 @@ static void _test_readyState(unsigned line, IUnknown *unk) "uninitialized" }; - if(open_call || reseting_document) + if(open_call || resetting_document) return; /* FIXME */ if(!unk) @@ -7679,12 +7679,12 @@ static void reset_document(IHTMLDocument2 *doc) if(FAILED(hres)) return; - reseting_document = TRUE; + resetting_document = TRUE; hres = IPersistStreamInit_InitNew(init); ok(hres == S_OK, "Load failed: %08x\n", hres); - reseting_document = FALSE; + resetting_document = FALSE; test_GetCurMoniker((IUnknown*)doc, NULL, "about:blank", FALSE); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 9c497ed..d92a731 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -473,7 +473,7 @@ const char *get_nm_command(void) if (!nm_command) fatal_error( "cannot find suitable name lister\n" ); if (nm_command->count > 1) - fatal_error( "multiple arguemnts in nm command not supported yet\n" ); + fatal_error( "multiple arguments in nm command not supported yet\n" ); return nm_command->str[0]; }

1 0

Hans Leidekker : ntdll: Fix the version reported for 64-bit Windows XP.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: b0755344c46886f8ae1f294fdc207166dc6783fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0755344c46886f8ae1f294fd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 1 16:34:20 2013 +0200 ntdll: Fix the version reported for 64-bit Windows XP. --- dlls/ntdll/version.c | 15 +++++++++++++-- programs/winecfg/appdefaults.c | 4 ++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 86637fc..1939c76 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -50,6 +50,7 @@ typedef enum NT40, /* Windows NT 4.0 */ NT2K, /* Windows 2000 */ WINXP, /* Windows XP */ + WINXP64, /* Windows XP 64-bit */ WIN2K3, /* Windows 2003 */ WINVISTA,/* Windows Vista */ WIN2K8, /* Windows 2008 */ @@ -134,6 +135,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','3',0}, 3, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 30 /* FIXME: Great, a reserved field with a value! */ }, + /* WINXP64 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','1',0}, + 1, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, /* WIN2K3 */ { sizeof(RTL_OSVERSIONINFOEXW), 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, @@ -185,6 +192,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "nt40", /* NT40 */ "win2000,win2k,nt2k,nt2000", /* NT2K */ "winxp", /* WINXP */ + "winxp64", /* WINXP64 */ "win2003,win2k3", /* WIN2K3 */ "vista,winvista", /* WINVISTA*/ "win2008,win2k8", /* WIN2K8 */ @@ -468,13 +476,16 @@ void version_init( const WCHAR *appname ) { static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; - + static const int is_win64 = (sizeof(void *) > sizeof(int)); OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE root, hkey, config_key; BOOL got_win_ver = FALSE; - current_version = &VersionData[WINXP]; /* default if nothing else is specified */ + if (is_win64 || is_wow64) + current_version = &VersionData[WINXP64]; /* default if nothing else is specified */ + else + current_version = &VersionData[WINXP]; RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index c8940a6..fdb0a71 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -55,6 +55,9 @@ static const struct { "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"}, +#ifdef _WIN64 + { "winxp64", "Windows XP", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, +#else { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"}, { "winme", "Windows ME", 4, 90, 0xBB8, VER_PLATFORM_WIN32_WINDOWS, " ", 0, 0, ""}, @@ -65,6 +68,7 @@ static const struct { "win31", "Windows 3.1", 3, 10, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win30", "Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""}, { "win20", "Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, "Win32s 1.3", 0, 0, ""} +#endif }; #define NB_VERSIONS (sizeof(win_versions)/sizeof(win_versions[0]))

1 0

Jacek Caban : mshtml: Added support for 'document' and 'window' script for attribute values.
by Alexandre Julliard Oct. 1, 2013

Oct. 1, 2013

Module: wine Branch: master Commit: 5cdb4a273eefaa3c77e41e2875d7a759e8892d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cdb4a273eefaa3c77e41e287… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 1 15:43:52 2013 +0200 mshtml: Added support for 'document' and 'window' script for attribute values. --- dlls/mshtml/htmlevent.c | 6 ++-- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/script.c | 46 +++++++++++++++++++++++++++------------- dlls/mshtml/tests/events.html | 8 ++++++- 4 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a7b2969..a564907 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1510,11 +1510,11 @@ HRESULT detach_event(event_target_t *event_target, HTMLDocument *doc, BSTR name, return S_OK; } -void bind_elem_event(HTMLDocumentNode *doc, HTMLElement *elem, const WCHAR *event, IDispatch *disp) +void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLDOMNode *node, const WCHAR *event, IDispatch *disp) { eventid_t eid; - TRACE("(%p %p %s %p)\n", doc, elem, debugstr_w(event), disp); + TRACE("(%p %p %p %s %p)\n", doc, event_target, node, debugstr_w(event), disp); eid = attr_to_eid(event); if(eid == EVENTID_LAST) { @@ -1522,7 +1522,7 @@ void bind_elem_event(HTMLDocumentNode *doc, HTMLElement *elem, const WCHAR *even return; } - set_event_handler_disp(&elem->node.event_target, elem->node.nsnode, doc, eid, disp); + set_event_handler_disp(event_target, node ? node->nsnode : NULL, doc, eid, disp); } void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr, cp_static_data_t *cp, nsIDOMNode *nsnode) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index ca39038..abd19c2 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -62,7 +62,7 @@ void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*,nsIDOM HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; -void bind_elem_event(HTMLDocumentNode*,HTMLElement*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; +void bind_node_event(HTMLDocumentNode*,event_target_t**,HTMLDOMNode*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 3174bd2..8a74554 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1046,11 +1046,12 @@ IDispatch *get_script_disp(ScriptHost *script_host) return disp; } -static HTMLElement *find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem) +static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem, HTMLDOMNode **ret_target_node) { + HTMLDOMNode *target_node = NULL; + event_target_t **target = NULL; const PRUnichar *target_id; nsAString target_id_str; - HTMLElement *elem; nsresult nsres; HRESULT hres; @@ -1063,17 +1064,27 @@ static HTMLElement *find_event_target(HTMLDocumentNode *doc, HTMLScriptElement * } nsAString_GetData(&target_id_str, &target_id); - if(!*target_id || !strcmpW(target_id, documentW) || !strcmpW(target_id, windowW)) { - FIXME("for %s not supported\n", debugstr_w(target_id)); - elem = NULL; + if(!*target_id) { + FIXME("Empty for attribute\n"); + }else if(!strcmpW(target_id, documentW)) { + target = &doc->node.event_target; + target_node = &doc->node; + IHTMLDOMNode_AddRef(&target_node->IHTMLDOMNode_iface); + }else if(!strcmpW(target_id, windowW)) { + target = &doc->body_event_target; }else { - hres = get_doc_elem_by_id(doc, target_id, &elem); - if(FAILED(hres)) - elem = NULL; + HTMLElement *target_elem; + + hres = get_doc_elem_by_id(doc, target_id, &target_elem); + if(SUCCEEDED(hres) && target_elem) { + target_node = &target_elem->node; + target = &target_elem->node.event_target; + } } nsAString_Finish(&target_id_str); - return elem; + *ret_target_node = target_node; + return target; } static BOOL parse_event_str(WCHAR *event, const WCHAR **args) @@ -1168,8 +1179,9 @@ void bind_event_scripts(HTMLDocumentNode *doc) HTMLPluginContainer *plugin_container; nsIDOMHTMLScriptElement *nsscript; HTMLScriptElement *script_elem; - HTMLElement *event_target; + event_target_t **event_target; nsIDOMNodeList *node_list; + HTMLDOMNode *target_node; nsIDOMNode *script_node; nsAString selector_str; IDispatch *event_disp; @@ -1216,17 +1228,21 @@ void bind_event_scripts(HTMLDocumentNode *doc) event_disp = parse_event_elem(doc, script_elem, &event); if(event_disp) { - event_target = find_event_target(doc, script_elem); + event_target = find_event_target(doc, script_elem, &target_node); if(event_target) { - hres = IHTMLElement_QueryInterface(&event_target->IHTMLElement_iface, &IID_HTMLPluginContainer, - (void**)&plugin_container); + if(target_node) + hres = IHTMLDOMNode_QueryInterface(&target_node->IHTMLDOMNode_iface, &IID_HTMLPluginContainer, + (void**)&plugin_container); + else + hres = E_NOINTERFACE; if(SUCCEEDED(hres)) bind_activex_event(doc, plugin_container, event, event_disp); else - bind_elem_event(doc, event_target, event, event_disp); + bind_node_event(doc, event_target, target_node, event, event_disp); - IHTMLElement_Release(&event_target->IHTMLElement_iface); + if(target_node) + IHTMLDOMNode_Release(&target_node->IHTMLDOMNode_iface); } heap_free(event); diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 131ba19..bf8a21f 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -1,7 +1,7 @@ <html> <head> <script> -var testevent_divid2_called = false, cnt=0; +var testevent_divid2_called = false, testevent_document_called = false, cnt=0; function ok(b,m) { return external.ok(b, m); @@ -71,8 +71,11 @@ function test_scriptfor() { ok("onclick" in div, "testevent not in div"); ok(typeof(div.onclick) === "function", "typeof(div.onclick) = " + typeof(div.onclick)); ok(testevent_divid2_called === false, "testevent_divid2_called = " + testevent_divid2_called); + ok(typeof(document.onclick) === "function", "typeof(document.onclick) = " + typeof(document.onclick)); + ok(testevent_document_called === false, "testevent_document_called = " + testevent_document_called); div.click(); ok(testevent_divid2_called === true, "testevent_divid2_called = " + testevent_divid2_called); + ok(testevent_document_called === true, "testevent_document_called = " + testevent_document_called); ok(!("ontest" in div), "testevent in div"); ok(typeof(div.ontest) === "undefined", "typeof(div.ontest) = " + typeof(div.ontest)); @@ -136,6 +139,9 @@ function runTests(t) { <script event="onclick" for="divid2"> testevent_divid2_called = true; </script> +<script event="onclick" for="document"> + testevent_document_called = true; +</script> <script event="ontest" for="divid2"> ok(false, "unexpected ontest"); </script>

1 0