winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
July 2012
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
712 discussions
Start a n
N
ew thread
Jacek Caban : ieframe: Added more DoVerb tests.
by Alexandre Julliard
09 Jul '12
09 Jul '12
Module: wine Branch: master Commit: 4bc259951b4bc0cb0a345e061482e3b538be53b3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4bc259951b4bc0cb0a345e061…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 9 17:46:10 2012 +0200 ieframe: Added more DoVerb tests. --- dlls/ieframe/tests/webbrowser.c | 95 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 12d2bba..6711c77 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1753,8 +1753,7 @@ static HWND create_container_window(void) RegisterClassExW(&wndclass); return CreateWindowW(wszWebBrowserContainer, wszWebBrowserContainer, - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, NULL, NULL, NULL, NULL); + WS_OVERLAPPEDWINDOW, 10, 10, 600, 600, NULL, NULL, NULL, NULL); } static void test_DoVerb(IUnknown *unk) @@ -1805,6 +1804,40 @@ static void test_DoVerb(IUnknown *unk) IOleObject_Release(oleobj); } +static void call_DoVerb(IUnknown *unk, LONG verb) +{ + IOleObject *oleobj; + RECT rect = {60,60,600,600}; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IOleObject_DoVerb(oleobj, verb, NULL, &ClientSite, + -1, container_hwnd, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + + IOleObject_Release(oleobj); +} + +static HWND get_hwnd(IUnknown *unk) +{ + IOleInPlaceObject *inplace; + HWND hwnd; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); + ok(hres == S_OK, "QueryInterface(IID_OleInPlaceObject) failed: %08x\n", hres); + + hres = IOleInPlaceObject_GetWindow(inplace, &hwnd); + ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + + IOleInPlaceObject_Release(inplace); + return hwnd; +} + static void test_GetMiscStatus(IOleObject *oleobj) { DWORD st, i; @@ -3423,6 +3456,62 @@ static void test_WebBrowser_slim_container(void) ok(ref == 0, "ref=%d, expected 0\n", ref); } +static void test_WebBrowser_DoVerb(void) +{ + IUnknown *unk = NULL; + HRESULT hres; + RECT rect; + HWND hwnd; + ULONG ref; + BOOL res; + + is_downloading = FALSE; + is_first_load = TRUE; + use_container_olecmd = FALSE; + + if (FAILED(create_WebBrowser(&unk))) + return; + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); + ok(hres == S_OK, "QueryInterface(IID_IWebBrowser) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + test_ClientSite(unk, &ClientSite, FALSE); + + SET_EXPECT(CanInPlaceActivate); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(OnInPlaceActivate); + SET_EXPECT(GetWindowContext); + SET_EXPECT(ShowObject); + SET_EXPECT(GetContainer); + SET_EXPECT(Frame_GetWindow); + call_DoVerb(unk, OLEIVERB_INPLACEACTIVATE); + CHECK_CALLED(CanInPlaceActivate); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(OnInPlaceActivate); + CHECK_CALLED(GetWindowContext); + CHECK_CALLED(ShowObject); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Frame_GetWindow); + + hwnd = get_hwnd(unk); + + memset(&rect, 0xa, sizeof(rect)); + res = GetWindowRect(hwnd, &rect); + ok(res, "GetWindowRect failed: %u\n", GetLastError()); + + SET_EXPECT(OnInPlaceDeactivate); + call_DoVerb(unk, OLEIVERB_HIDE); + CHECK_CALLED(OnInPlaceDeactivate); + + test_ClientSite(unk, NULL, FALSE); + + IWebBrowser2_Release(wb); + ref = IUnknown_Release(unk); + ok(ref == 0, "ref=%d, expected 0\n", ref); +} + + /* Check if Internet Explorer is configured to run in "Enhanced Security Configuration" (aka hardened mode) */ /* Note: this code is duplicated in dlls/mshtml/tests/mshtml_test.h and dlls/urlmon/tests/sec_mgr.c */ static BOOL is_ie_hardened(void) @@ -3461,6 +3550,8 @@ START_TEST(webbrowser) win_skip("Skipping http tests in hardened mode\n"); } + trace("Testing WebBrowser DoVerb\n"); + test_WebBrowser_DoVerb(); trace("Testing WebBrowser (with close)...\n"); test_WebBrowser(TRUE, TRUE); trace("Testing WebBrowser w/o container-based olecmd...\n");
1
0
0
0
Jacek Caban : ieframe: Call OnInPlaceDeactivate in DoVerb(OLEIVERB_HIDE) implementation.
by Alexandre Julliard
09 Jul '12
09 Jul '12
Module: wine Branch: master Commit: edcc38c6d1e5ea41863aa765b09213067f10cb20 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=edcc38c6d1e5ea41863aa765b…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 9 17:45:57 2012 +0200 ieframe: Call OnInPlaceDeactivate in DoVerb(OLEIVERB_HIDE) implementation. --- dlls/ieframe/oleobject.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index f0b769e..caef72d 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -557,8 +557,8 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag { WebBrowser *This = impl_from_IOleObject(iface); - TRACE("(%p)->(%d %p %p %d %p %p)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, - lprcPosRect); + TRACE("(%p)->(%d %p %p %d %p %s)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, + wine_dbgstr_rect(lprcPosRect)); switch (iVerb) { @@ -573,6 +573,8 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag return activate_inplace(This, pActiveSite); case OLEIVERB_HIDE: TRACE("OLEIVERB_HIDE\n"); + if(This->inplace) + IOleInPlaceSite_OnInPlaceDeactivate(This->inplace); if(This->shell_embedding_hwnd) ShowWindow(This->shell_embedding_hwnd, SW_HIDE); return S_OK;
1
0
0
0
Huw Davies : winspool: Don't assume that CUPS is available.
by Alexandre Julliard
09 Jul '12
09 Jul '12
Module: wine Branch: master Commit: c4457ec19142392bd06014489cb6bac7cc98b5a2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c4457ec19142392bd06014489…
Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 9 13:28:32 2012 +0100 winspool: Don't assume that CUPS is available. --- dlls/winspool.drv/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bb530de..8027a1a 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -801,6 +801,8 @@ static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, if (pcupsGetPPD3) return pcupsGetPPD3( http, name, modtime, buffer, bufsize ); + if (!pcupsGetPPD) return HTTP_NOT_FOUND; + TRACE( "No cupsGetPPD3 implementation, so calling cupsGetPPD\n" ); *modtime = 0;
1
0
0
0
Hans Leidekker : msi: Don't hard-code the ServicePackLevel property.
by Alexandre Julliard
09 Jul '12
09 Jul '12
Module: wine Branch: master Commit: 32fa9db88863485059d2d1aeb55137e81abf7cdb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=32fa9db88863485059d2d1aeb…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:08:37 2012 +0200 msi: Don't hard-code the ServicePackLevel property. --- dlls/msi/package.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4944065..1115942 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -666,12 +666,11 @@ done: static VOID set_installer_properties(MSIPACKAGE *package) { - WCHAR pth[MAX_PATH]; WCHAR *ptr; OSVERSIONINFOEXW OSVersion; MEMORYSTATUSEX msex; DWORD verval, len; - WCHAR verstr[10], bufstr[20]; + WCHAR pth[MAX_PATH], verstr[11], bufstr[22]; HDC dc; HKEY hkey; LPWSTR username, companyname; @@ -701,14 +700,13 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szVersion9x[] = {'V','e','r','s','i','o','n','9','X',0}; static const WCHAR szVersionNT[] = {'V','e','r','s','i','o','n','N','T',0}; static const WCHAR szMsiNTProductType[] = {'M','s','i','N','T','P','r','o','d','u','c','t','T','y','p','e',0}; - static const WCHAR szFormat[] = {'%','l','i',0}; + static const WCHAR szFormat[] = {'%','u',0}; + static const WCHAR szFormat2[] = {'%','u','.','%','u',0}; static const WCHAR szWindowsBuild[] = {'W','i','n','d','o','w','s','B','u','i','l','d',0}; static const WCHAR szServicePackLevel[] = {'S','e','r','v','i','c','e','P','a','c','k','L','e','v','e','l',0}; - static const WCHAR szSix[] = {'6',0 }; static const WCHAR szVersionMsi[] = { 'V','e','r','s','i','o','n','M','s','i',0 }; static const WCHAR szVersionDatabase[] = { 'V','e','r','s','i','o','n','D','a','t','a','b','a','s','e',0 }; static const WCHAR szPhysicalMemory[] = { 'P','h','y','s','i','c','a','l','M','e','m','o','r','y',0 }; - static const WCHAR szFormat2[] = {'%','l','i','.','%','l','i',0}; static const WCHAR szScreenX[] = {'S','c','r','e','e','n','X',0}; static const WCHAR szScreenY[] = {'S','c','r','e','e','n','Y',0}; static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; @@ -871,8 +869,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) } sprintfW(verstr, szFormat, OSVersion.dwBuildNumber); msi_set_property(package->db, szWindowsBuild, verstr); - /* just fudge this */ - msi_set_property(package->db, szServicePackLevel, szSix); + sprintfW(verstr, szFormat, OSVersion.wServicePackMajor); + msi_set_property(package->db, szServicePackLevel, verstr); sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION); msi_set_property( package->db, szVersionMsi, bufstr );
1
0
0
0
Hans Leidekker : msi: Don' t crash if no working directory is specified for custom action type 34.
by Alexandre Julliard
09 Jul '12
09 Jul '12
Module: wine Branch: master Commit: f55ee1a21291ab1f0ad3c4cf010fecd4d95b5e92 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f55ee1a21291ab1f0ad3c4cf0…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:08:06 2012 +0200 msi: Don't crash if no working directory is specified for custom action type 34. --- dlls/msi/custom.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index c1aa627..88dcf87 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -935,13 +935,15 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - const WCHAR *workingdir; + const WCHAR *workingdir = NULL; HANDLE handle; WCHAR *cmd; - workingdir = msi_get_target_folder( package, source ); - if (!workingdir) return ERROR_FUNCTION_FAILED; - + if (source) + { + workingdir = msi_get_target_folder( package, source ); + if (!workingdir) return ERROR_FUNCTION_FAILED; + } deformat_string( package, target, &cmd ); if (!cmd) return ERROR_FUNCTION_FAILED;
1
0
0
0
Hans Leidekker : setupapi: SetupInstallServicesFromInfSection doesn' t fail if there are no AddService or DelService directives in the section.
by Alexandre Julliard
09 Jul '12
09 Jul '12
Module: wine Branch: master Commit: da922769c5536932185d7bfce604ee1b7885b75d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=da922769c5536932185d7bfce…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:07:37 2012 +0200 setupapi: SetupInstallServicesFromInfSection doesn't fail if there are no AddService or DelService directives in the section. --- dlls/setupapi/install.c | 13 ++++++++----- dlls/setupapi/tests/install.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 874b4a9..1c8236a 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1447,12 +1447,16 @@ BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR section, DWOR SC_HANDLE scm; INFCONTEXT context; INT section_flags; - BOOL ok, ret = FALSE; + BOOL ok, ret = TRUE; + if (!(ok = SetupFindFirstLineW( hinf, section, NULL, &context ))) + { + SetLastError( ERROR_SECTION_NOT_FOUND ); + return FALSE; + } if (!(scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ))) return FALSE; - if (!(ok = SetupFindFirstLineW( hinf, section, AddService, &context ))) - SetLastError( ERROR_SECTION_NOT_FOUND ); + ok = SetupFindFirstLineW( hinf, section, AddService, &context ); while (ok) { if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) @@ -1465,8 +1469,7 @@ BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR section, DWOR ok = SetupFindNextMatchLineW( &context, AddService, &context ); } - if (!(ok = SetupFindFirstLineW( hinf, section, DelService, &context ))) - SetLastError( ERROR_SECTION_NOT_FOUND ); + ok = SetupFindFirstLineW( hinf, section, DelService, &context ); while (ok) { if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 1c204b5..a2fa00b 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -322,6 +322,20 @@ static void test_install_svc_from(void) CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + strcat(inf, "[XSP.InstallPerVer]\n"); + strcat(inf, "AddReg=AspEventlogMsg.Reg,Perf.Reg,AspVersions.Reg,FreeADO.Reg,IndexServer.Reg\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "XSP.InstallPerVer", 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + /* TODO: Test the Flags */ }
1
0
0
0
Hans Leidekker : ntdll: Report 3dnow and sse features if the processor supports them.
by Alexandre Julliard
09 Jul '12
09 Jul '12
Module: wine Branch: master Commit: 700eec9687139fa9793ee038393ea8cc8d0e72fe URL:
http://source.winehq.org/git/wine.git/?a=commit;h=700eec9687139fa9793ee0383…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:07:05 2012 +0200 ntdll: Report 3dnow and sse features if the processor supports them. --- dlls/ntdll/nt.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b90672b..6d6e0b0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -920,9 +920,9 @@ void fill_cpu_info(void) #else #error Unknown CPU #endif - cached_sci.Revision = 0; - cached_sci.Reserved = 0; - cached_sci.FeatureSet = 0x1fff; /* FIXME: set some sensible defaults out of ProcessFeatures[] */ + cached_sci.Revision = 0; + cached_sci.Reserved = 0; + cached_sci.FeatureSet = 0x1fff; NtCurrentTeb()->Peb->NumberOfProcessors = 1; @@ -1049,13 +1049,22 @@ void fill_cpu_info(void) if (strstr(value, "tsc")) user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE; if (strstr(value, "3dnow")) + { user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = TRUE; + cached_sci.FeatureSet |= CPU_FEATURE_3DNOW; + } /* This will also catch sse2, but we have sse itself * if we have sse2, so no problem */ if (strstr(value, "sse")) + { user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = TRUE; + cached_sci.FeatureSet |= CPU_FEATURE_SSE; + } if (strstr(value, "sse2")) + { user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = TRUE; + cached_sci.FeatureSet |= CPU_FEATURE_SSE2; + } if (strstr(value, "pni")) user_shared_data->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(value, "pae"))
1
0
0
0
Nikolay Sivov : msxml3: Add VT_I1 type to variant dump helper.
by Alexandre Julliard
09 Jul '12
09 Jul '12
Module: wine Branch: master Commit: ec8ec0fa9bf6259331527fd1c2e72ef0ddc5d80b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ec8ec0fa9bf6259331527fd1c…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 8 22:54:20 2012 +0400 msxml3: Add VT_I1 type to variant dump helper. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 6ecfdbc..3debd06 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -267,6 +267,8 @@ const char *debugstr_variant(const VARIANT *v) return "{VT_EMPTY}"; case VT_NULL: return "{VT_NULL}"; + case VT_I1: + return wine_dbg_sprintf("{VT_I1: %d}", V_I1(v)); case VT_I2: return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); case VT_I4:
1
0
0
0
Nikolay Sivov : msxml3: Remove unneeded xmlInitParser call.
by Alexandre Julliard
09 Jul '12
09 Jul '12
Module: wine Branch: master Commit: 9a28ac8f7b9923829f3ae67ff0309772fe042028 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9a28ac8f7b9923829f3ae67ff…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 8 22:53:20 2012 +0400 msxml3: Remove unneeded xmlInitParser call. --- dlls/msxml3/domdoc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 5711daf..cbbebf2 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -488,7 +488,6 @@ static xmlDocPtr doparse(domdoc* This, char const* ptr, int len, xmlCharEncoding xmlSAX2EndElementNs, /* endElementNs */ sax_serror /* serror */ }; - xmlInitParser(); pctx = xmlCreateMemoryParserCtxt(ptr, len); if (!pctx)
1
0
0
0
Nikolay Sivov : msxml3: Fix xml declaration output when it' s specified in loaded document (in case of file).
by Alexandre Julliard
09 Jul '12
09 Jul '12
Module: wine Branch: master Commit: 41aa34758e18f89b6d912e15177eafba12d10d6a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=41aa34758e18f89b6d912e151…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 8 22:51:52 2012 +0400 msxml3: Fix xml declaration output when it's specified in loaded document (in case of file). --- dlls/msxml3/domdoc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 5ac03e1..5711daf 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2403,6 +2403,8 @@ static HRESULT WINAPI domdoc_save( case VT_BSTR: case VT_BSTR | VT_BYREF: { + int options = get_doc(This)->standalone == -1 ? XML_SAVE_NO_DECL : 0; + /* save with file path */ HANDLE handle = CreateFileW( (V_VT(&destination) & VT_BYREF)? *V_BSTRREF(&destination) : V_BSTR(&destination), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); @@ -2414,7 +2416,7 @@ static HRESULT WINAPI domdoc_save( /* disable top XML declaration */ ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, - handle, NULL, XML_SAVE_NO_DECL); + handle, NULL, options); if (!ctx) { CloseHandle(handle);
1
0
0
0
← Newer
1
...
54
55
56
57
58
59
60
...
72
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
Results per page:
10
25
50
100
200