wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

André Hentschel : oleaut32: Fix localized date parsing .
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 71f24431b987d70053063a9f206913e7fff53edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f24431b987d70053063a9f2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 3 19:57:27 2010 +0100 oleaut32: Fix localized date parsing. --- dlls/oleaut32/tests/vartype.c | 4 ++-- dlls/oleaut32/vartype.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 0c23a11..6742fce 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3435,10 +3435,10 @@ static void test_VarDateFromStr(void) DFS("1-2-1970"); EXPECT_DBL(25570.0); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ - /* test a none english data string */ + /* test a non-english data string */ DFS("02.01.1970 00:00:00"); EXPECT_MISMATCH; lcid = MAKELCID(MAKELANGID(LANG_GERMAN,SUBLANG_GERMAN),SORT_DEFAULT); - DFS("02.01.1970"); todo_wine EXPECT_DBL(25570.0); + DFS("02.01.1970"); EXPECT_DBL(25570.0); DFS("02.01.1970 00:00:00"); todo_wine EXPECT_DBL(25570.0); } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 6d604f3..580209b 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7607,6 +7607,14 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd break; case 0x3: /* TTT TTTDD TTTDDD */ + if (iDate && dp.dwCount == 3) + { + /* DDD */ + if ((dp.dwFlags[0] & (DP_AM|DP_PM)) || (dp.dwFlags[1] & (DP_AM|DP_PM)) || + (dp.dwFlags[2] & (DP_AM|DP_PM))) + hRet = DISP_E_TYPEMISMATCH; + break; + } if (dp.dwCount > 4 && ((dp.dwFlags[3] & (DP_AM|DP_PM)) || (dp.dwFlags[4] & (DP_AM|DP_PM)) || (dp.dwFlags[5] & (DP_AM|DP_PM))))

1 0

Jörg Höhle : winex11: Log keycode decimal <-> hex for keysym & MS vkey and scancode.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 9079109a4531359d4023bbbfc80d9a6c77696383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9079109a4531359d4023bbbfc… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 13 22:47:08 2010 +0100 winex11: Log keycode decimal <-> hex for keysym & MS vkey and scancode. --- dlls/user32/input.c | 6 ++-- dlls/user32/message.c | 2 +- dlls/winex11.drv/keyboard.c | 63 +++++++++++++++++++++++------------------- 3 files changed, 38 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9079109a4531359d4023b…

1 0

Alexandre Julliard : ntdll: Return STATUS_IMAGE_NOT_AT_BASE when an image mapping has to be relocated.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 83c272a258c337f64dd57048a7b265390ed151e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c272a258c337f64dd57048a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 20:04:55 2010 +0100 ntdll: Return STATUS_IMAGE_NOT_AT_BASE when an image mapping has to be relocated. --- dlls/kernel32/virtual.c | 2 +- dlls/ntdll/loader.c | 2 +- dlls/ntdll/virtual.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 9ad941b..dcd5b85 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -545,7 +545,7 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, if (access & FILE_MAP_EXECUTE) protect <<= 4; if ((status = NtMapViewOfSection( handle, GetCurrentProcess(), &addr, 0, 0, &offset, - &count, ViewShare, 0, protect ))) + &count, ViewShare, 0, protect )) < 0) { SetLastError( RtlNtStatusToDosError(status) ); addr = NULL; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7bbcf95..1723f18 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1498,7 +1498,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, status = NtMapViewOfSection( mapping, NtCurrentProcess(), &module, 0, 0, &size, &len, ViewShare, 0, PAGE_READONLY ); NtClose( mapping ); - if (status != STATUS_SUCCESS) return status; + if (status < 0) return status; /* create the MODREF */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9731069..15973fb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1296,6 +1296,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz #ifdef VALGRIND_LOAD_PDB_DEBUGINFO VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, delta); #endif + if (ptr != base) return STATUS_IMAGE_NOT_AT_BASE; return STATUS_SUCCESS; error: @@ -2409,7 +2410,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p res = NTDLL_queue_process_apc( process, &call, &result ); if (res != STATUS_SUCCESS) return res; - if (result.map_view.status == STATUS_SUCCESS) + if ((NTSTATUS)result.map_view.status >= 0) { *addr_ptr = wine_server_get_ptr( result.map_view.addr ); *size_ptr = result.map_view.size; @@ -2461,7 +2462,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p -1, dup_mapping, addr_ptr ); } if (needs_close) close( unix_handle ); - if (!res) *size_ptr = size; + if (res >= 0) *size_ptr = size; return res; }

1 0

Jeremy White : Switch the information to the new Slackware package maintainer.
by Jeremy Newman 04 Mar '10

04 Mar '10

Module: website Branch: master Commit: af0b581afe60c6ec55344324a1d9de0768e7c2b3 URL: http://source.winehq.org/git/website.git/?a=commit;h=af0b581afe60c6ec553443… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Mar 3 15:49:34 2010 -0600 Switch the information to the new Slackware package maintainer. --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/pl/download.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 7730baf..6642219 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -128,7 +128,7 @@ erbeten hat, dass sie die Wine-Website hosten. </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Slackware</a> binär .tgz für Slackware 10.2</td> - <td><a href="mailto:sadam@clemson.edu">Adam Schreiber</a></td> + <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/en/download.template b/templates/en/download.template index 30bbacd..e58e5e1 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -115,7 +115,7 @@ requested in exchange for hosting the Wine web site. </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Download Slackware packages</a> - binary .tgz for Slackware 10.2</td> - <td><a href="mailto:sadam@clemson.edu">Adam Schreiber</a></td> + <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> </tr> <tr bgcolor="#ffffff"> diff --git a/templates/pl/download.template b/templates/pl/download.template index 6fa59be..a96e606 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -112,7 +112,7 @@ </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Slackware</a> binarne .tgz dla Slackware 10.2</td> - <td><a href="mailto:sadam@clemson.edu">Adam Schreiber</a></td> + <td><a href="mailto:studiosg@giustetti.net">Simone Giustetti</a></td> </tr> <tr bgcolor="#ffffff">

1 0

Paul Andrew Panon : wined3d: Add Mesa ATI card detection code.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 74a059d21b36b7aa0b852955e9254e7d0fbf7d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a059d21b36b7aa0b852955e… Author: Paul Andrew Panon <ppanon(a)shaw.ca> Date: Mon Mar 1 10:31:00 2010 -0800 wined3d: Add Mesa ATI card detection code. --- dlls/wined3d/directx.c | 239 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 237 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74a059d21b36b7aa0b852…

1 0

Paul Andrew Panon : wined3d: Add a card detection table and refactor wined3d_guess_card.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 85b07b9d380a7caced3bb58f92150a096daa1427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b07b9d380a7caced3bb58f9… Author: Paul Andrew Panon <ppanon(a)shaw.ca> Date: Mon Mar 1 10:29:32 2010 -0800 wined3d: Add a card detection table and refactor wined3d_guess_card. --- dlls/wined3d/directx.c | 895 +++++++++++++++++++++++++----------------------- 1 files changed, 468 insertions(+), 427 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85b07b9d380a7caced3bb…

1 0

Paul Andrew Panon : wined3d: Adjust the quirks to use the new GL_VENDOR codes.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 1735b4ee92514c23a644de77135e5b99baebcb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1735b4ee92514c23a644de771… Author: Paul Andrew Panon <ppanon(a)shaw.ca> Date: Tue Mar 2 23:16:28 2010 -0800 wined3d: Adjust the quirks to use the new GL_VENDOR codes. --- dlls/wined3d/directx.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d3404ad..759e74c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -483,7 +483,6 @@ static BOOL match_apple(const struct wined3d_gl_info *gl_info, const char *gl_re return FALSE; } - /* Context activation is done by the caller. */ static void test_pbo_functionality(struct wined3d_gl_info *gl_info) { @@ -556,13 +555,13 @@ static void test_pbo_functionality(struct wined3d_gl_info *gl_info) static BOOL match_apple_intel(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - return card_vendor == HW_VENDOR_INTEL && match_apple(gl_info, gl_renderer, gl_vendor, card_vendor, device); + return (card_vendor == HW_VENDOR_INTEL) && (gl_vendor == GL_VENDOR_APPLE); } static BOOL match_apple_nonr500ati(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - if (!match_apple(gl_info, gl_renderer, gl_vendor, card_vendor, device)) return FALSE; + if (gl_vendor != GL_VENDOR_APPLE) return FALSE; if (card_vendor != HW_VENDOR_ATI) return FALSE; if (device == CARD_ATI_RADEON_X1600) return FALSE; return TRUE; @@ -571,10 +570,8 @@ static BOOL match_apple_nonr500ati(const struct wined3d_gl_info *gl_info, const static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - if (card_vendor != HW_VENDOR_ATI) return FALSE; - if (match_apple(gl_info, gl_renderer, gl_vendor, card_vendor, device)) return FALSE; - if (strstr(gl_renderer, "DRI")) return FALSE; /* Filter out Mesa DRI drivers. */ - return TRUE; + return (gl_vendor == GL_VENDOR_ATI); + } static BOOL match_dx10_capable(const struct wined3d_gl_info *gl_info, const char *gl_renderer, @@ -907,7 +904,7 @@ static const struct driver_quirk quirk_table[] = */ struct driver_version_information { - WORD card_vendor; /* reported PCI card vendor ID */ + WORD vendor; /* reported PCI card vendor ID */ WORD card; /* reported PCI card device ID */ const char *description; /* Description of the card e.g. NVIDIA RIVA TNT */ WORD d3d_level; /* driver hiword to report */ @@ -972,7 +969,7 @@ static const struct driver_version_information driver_version_table[] = }; static void init_driver_info(struct wined3d_driver_info *driver_info, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) + enum wined3d_pci_vendor vendor, enum wined3d_pci_device device) { OSVERSIONINFOW os_version; WORD driver_os_version; @@ -981,9 +978,9 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) { TRACE_(d3d_caps)("Overriding PCI vendor ID with: %04x\n", wined3d_settings.pci_vendor_id); - card_vendor = wined3d_settings.pci_vendor_id; + vendor = wined3d_settings.pci_vendor_id; } - driver_info->vendor = card_vendor; + driver_info->vendor = vendor; if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE) { @@ -992,7 +989,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } driver_info->device = device; - switch (card_vendor) + switch (vendor) { case HW_VENDOR_ATI: driver_info->name = "ati2dvag.dll"; @@ -1002,8 +999,9 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, driver_info->name = "nv4_disp.dll"; break; + case HW_VENDOR_INTEL: default: - FIXME_(d3d_caps)("Unhandled card vendor %04x.\n", card_vendor); + FIXME_(d3d_caps)("Unhandled vendor %04x.\n", vendor); driver_info->name = "Display"; break; } @@ -1058,9 +1056,9 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, for (i = 0; i < (sizeof(driver_version_table) / sizeof(driver_version_table[0])); ++i) { - if (card_vendor == driver_version_table[i].card_vendor && device == driver_version_table[i].card) + if (vendor == driver_version_table[i].vendor && device == driver_version_table[i].card) { - TRACE_(d3d_caps)("Found card %04x:%04x in driver DB.\n", card_vendor, device); + TRACE_(d3d_caps)("Found card %04x:%04x in driver DB.\n", vendor, device); driver_info->description = driver_version_table[i].description; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, driver_version_table[i].d3d_level); @@ -1171,13 +1169,14 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s || strstr(gl_vendor_string, "VMware, Inc.")) return HW_VENDOR_WINE; - FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning HW_VENDOR_WINE.\n", debugstr_a(gl_vendor_string)); + FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning HW_VENDOR_NVIDIA.\n", debugstr_a(gl_vendor_string)); - return HW_VENDOR_WINE; + return HW_VENDOR_NVIDIA; } + static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info *gl_info, const char *gl_renderer, - enum wined3d_pci_vendor *card_vendor, unsigned int *vidmem) + enum wined3d_gl_vendor *gl_vendor, enum wined3d_pci_vendor *card_vendor, unsigned int *vidmem) { /* Below is a list of Nvidia and ATI GPUs. Both vendors have dozens of * different GPUs with roughly the same features. In most cases GPUs from a @@ -2213,7 +2212,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) card_vendor = wined3d_guess_card_vendor(gl_string, gl_renderer); TRACE_(d3d_caps)("found GL_VENDOR (%s)->(0x%04x/0x%04x)\n", debugstr_a(gl_string), gl_vendor, card_vendor); - device = wined3d_guess_card(gl_info, gl_renderer, &card_vendor, &vidmem); + device = wined3d_guess_card(gl_info, gl_renderer, &gl_vendor, &card_vendor, &vidmem); TRACE_(d3d_caps)("FOUND (fake) card: 0x%x (vendor id), 0x%x (device id)\n", card_vendor, device); /* If we have an estimate use it, else default to 64MB; */

1 0

Paul Andrew Panon : wined3d: Add a real GL vendor detection.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 7a9734dc68b609606fd69911bc1c62275207b92e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a9734dc68b609606fd69911b… Author: Paul Andrew Panon <ppanon(a)shaw.ca> Date: Tue Mar 2 23:16:26 2010 -0800 wined3d: Add a real GL vendor detection. --- dlls/wined3d/directx.c | 110 +++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 20 ++++++-- 2 files changed, 91 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a9734dc68b609606fd69…

1 0

Paul Andrew Panon : wined3d: Rename GL_VENDOR to HW_VENDOR.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 31573b21b9d4601ab5def1d54fd59442000fbb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31573b21b9d4601ab5def1d54… Author: Paul Andrew Panon <ppanon(a)shaw.ca> Date: Mon Mar 1 10:26:04 2010 -0800 wined3d: Rename GL_VENDOR to HW_VENDOR. --- dlls/wined3d/directx.c | 210 ++++++++++++++++++++-------------------- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 10 +- 3 files changed, 111 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31573b21b9d4601ab5def…

1 0

Jacek Caban : mshtml: Call Exec(DOCHOST_DOCCANNAVIGATE) from IOleObject:: SetClientSite.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 2cf2d8fed27bd384fc4c84563902441bf4b371b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf2d8fed27bd384fc4c84563… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:56:56 2010 +0100 mshtml: Call Exec(DOCHOST_DOCCANNAVIGATE) from IOleObject::SetClientSite. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/oleobj.c | 17 +++++++++++++++-- dlls/mshtml/tests/htmldoc.c | 6 +++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 30d1edb..5a409b3 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -398,7 +398,7 @@ struct HTMLDocumentObj { BOOL in_place_active; BOOL ui_active; BOOL window_active; - BOOL has_key_path; + BOOL hostui_setup; BOOL container_locked; BOOL focus; INT download_state; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 3dec3dc..a33f479 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -34,9 +34,13 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); +#define DOCHOST_DOCCANNAVIGATE 0 + /********************************************************** * IOleObject implementation */ @@ -92,6 +96,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite HTMLDocument *This = OLEOBJ_THIS(iface); IDocHostUIHandler *pDocHostUIHandler = NULL; IOleCommandTarget *cmdtrg = NULL; + BOOL hostui_setup; VARIANT silent; HRESULT hres; @@ -116,6 +121,8 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite if(!pClientSite) return S_OK; + hostui_setup = This->doc_obj->hostui_setup; + hres = IOleObject_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&pDocHostUIHandler); if(SUCCEEDED(hres)) { DOCHOSTUIINFO hostinfo; @@ -133,7 +140,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->hostinfo = hostinfo; } - if(!This->doc_obj->has_key_path) { + if(!hostui_setup) { hres = IDocHostUIHandler_GetOptionKeyPath(pDocHostUIHandler, &key_path, 0); if(hres == S_OK && key_path) { if(key_path[0]) { @@ -157,7 +164,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite IDocHostUIHandler2_Release(pDocHostUIHandler2); } - This->doc_obj->has_key_path = TRUE; + This->doc_obj->hostui_setup = TRUE; } } @@ -179,6 +186,12 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite VARIANT var; OLECMD cmd = {OLECMDID_SETPROGRESSTEXT, 0}; + if(!hostui_setup) { + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)HTMLWINDOW2(This->window); + IOleCommandTarget_Exec(cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0, &var, NULL); + } + IOleCommandTarget_QueryStatus(cmdtrg, NULL, 1, &cmd, NULL); V_VT(&var) = VT_I4; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 20f9e74..c4c41a8 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3142,7 +3142,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) CHECK_CALLED(GetOptionKeyPath); CHECK_CALLED(GetOverrideKeyPath); CHECK_CALLED(GetWindow); - todo_wine CHECK_CALLED(Exec_DOCCANNAVIGATE); + CHECK_CALLED(Exec_DOCCANNAVIGATE); CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); CHECK_CALLED(Exec_SETPROGRESSMAX); CHECK_CALLED(Exec_SETPROGRESSPOS); @@ -3865,7 +3865,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) } CHECK_CALLED(GetWindow); if(flags & CLIENTSITE_EXPECTPATH) - todo_wine CHECK_CALLED(Exec_DOCCANNAVIGATE); + CHECK_CALLED(Exec_DOCCANNAVIGATE); CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); CHECK_CALLED(Exec_SETPROGRESSMAX); CHECK_CALLED(Exec_SETPROGRESSPOS); @@ -4987,7 +4987,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) CHECK_CALLED(GetOptionKeyPath); CHECK_CALLED(GetOverrideKeyPath); CHECK_CALLED(GetWindow); - todo_wine CHECK_CALLED(Exec_DOCCANNAVIGATE); + CHECK_CALLED(Exec_DOCCANNAVIGATE); CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); CHECK_CALLED(Exec_SETPROGRESSMAX); CHECK_CALLED(Exec_SETPROGRESSPOS);

1 0

← Newer
1
...
77
78
79
80
81
82
83
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2010