March 2010 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added more navigation tests.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 80f8a0df8237217e5b811e0a6198683a841067e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f8a0df8237217e5b811e0a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 3 14:56:39 2010 +0100 mshtml: Added more navigation tests. --- dlls/mshtml/tests/htmldoc.c | 142 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 119 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80f8a0df8237217e5b811…

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

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

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: 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 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: 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

Nikolay Sivov : shell32: Remove WINAPI where it's not needed.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: ab0e037ee09716be92886601d94ca2c9e3d0da91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab0e037ee09716be92886601d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 05:16:49 2010 +0300 shell32: Remove WINAPI where it's not needed. --- dlls/shell32/pidl.c | 8 ++++---- dlls/shell32/pidl.h | 2 +- dlls/shell32/undocshell.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 0774fde..ecda891 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -92,7 +92,7 @@ static BOOL ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR pat return ret; } -BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) +BOOL ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) { LPSHELLFOLDER psfParent, lsf = psf; HRESULT ret = NO_ERROR; @@ -393,7 +393,7 @@ static HRESULT SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST * ppidl, DWORD * at return SHILCreateFromPathW(lpszDisplayName, ppidl, attributes); } -HRESULT WINAPI SHILCreateFromPathW(LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * attributes) +HRESULT SHILCreateFromPathW(LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * attributes) { LPSHELLFOLDER sf; DWORD pchEaten; @@ -1050,7 +1050,7 @@ static HRESULT _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, * exists on disk. * exported by ordinal. */ -LPITEMIDLIST WINAPI SHSimpleIDListFromPathA(LPCSTR lpszPath) +LPITEMIDLIST SHSimpleIDListFromPathA(LPCSTR lpszPath) { LPITEMIDLIST pidl = NULL; LPWSTR wPath = NULL; @@ -1072,7 +1072,7 @@ LPITEMIDLIST WINAPI SHSimpleIDListFromPathA(LPCSTR lpszPath) return pidl; } -LPITEMIDLIST WINAPI SHSimpleIDListFromPathW(LPCWSTR lpszPath) +LPITEMIDLIST SHSimpleIDListFromPathW(LPCWSTR lpszPath) { LPITEMIDLIST pidl = NULL; diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index 73bc3fb..3dbfaa6 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -271,6 +271,6 @@ void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl); LPITEMIDLIST * _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl); LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida); -BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type); +BOOL ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type); #endif diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index f8a1b70..513006d 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -52,10 +52,10 @@ BOOL WINAPI ILGetDisplayNameEx( LPITEMIDLIST WINAPI ILGlobalClone(LPCITEMIDLIST pidl); void WINAPI ILGlobalFree(LPITEMIDLIST pidl); -LPITEMIDLIST WINAPI SHSimpleIDListFromPathA (LPCSTR lpszPath); -LPITEMIDLIST WINAPI SHSimpleIDListFromPathW (LPCWSTR lpszPath); +LPITEMIDLIST SHSimpleIDListFromPathA (LPCSTR lpszPath); +LPITEMIDLIST SHSimpleIDListFromPathW (LPCWSTR lpszPath); -HRESULT WINAPI SHILCreateFromPathW ( +HRESULT SHILCreateFromPathW ( LPCWSTR path, LPITEMIDLIST * ppidl, DWORD *attributes);

1 0

Hans Leidekker : setupapi: Destination directory defaults to system directory.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 1b8ba2537111f0d691d2592bb4ffb6bc4fe4f20e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8ba2537111f0d691d2592bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 3 14:37:17 2010 +0100 setupapi: Destination directory defaults to system directory. --- dlls/setupapi/queue.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 6a2b8d6..d302924 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -338,10 +338,17 @@ static WCHAR *get_destination_dir( HINF hinf, const WCHAR *section ) static const WCHAR Dest[] = {'D','e','s','t','i','n','a','t','i','o','n','D','i','r','s',0}; static const WCHAR Def[] = {'D','e','f','a','u','l','t','D','e','s','t','D','i','r',0}; INFCONTEXT context; + WCHAR systemdir[MAX_PATH], *dir; + BOOL ret; - if (!SetupFindFirstLineW( hinf, Dest, section, &context ) && - !SetupFindFirstLineW( hinf, Dest, Def, &context )) return NULL; - return PARSER_get_dest_dir( &context ); + if (!(ret = SetupFindFirstLineW( hinf, Dest, section, &context ))) + ret = SetupFindFirstLineW( hinf, Dest, Def, &context ); + + if (ret && (dir = PARSER_get_dest_dir( &context ))) + return dir; + + GetSystemDirectoryW( systemdir, MAX_PATH ); + return strdupW( systemdir ); }

1 0

Hans Leidekker : msi: Strip leading text style label from control text before lookup in binary table .
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 7b6858546c7a1ed05e4ea85a6f1a387b75f3bb73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b6858546c7a1ed05e4ea85a6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 3 14:37:39 2010 +0100 msi: Strip leading text style label from control text before lookup in binary table. --- dlls/msi/dialog.c | 61 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5fd4bbd..ac2e95a 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -801,11 +801,31 @@ static UINT msi_dialog_text_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +/* strip any leading text style label from text field */ +static WCHAR *msi_get_binary_name( MSIPACKAGE *package, MSIRECORD *rec ) +{ + WCHAR *p, *text; + + text = msi_get_deformatted_field( package, rec, 10 ); + if (!text) + return NULL; + + p = text; + while (*p && *p != '{') p++; + if (!*p++) return text; + + while (*p && *p != '}') p++; + if (!*p++) return text; + + p = strdupW( p ); + msi_free( text ); + return p; +} + static UINT msi_dialog_button_control( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; UINT attributes, style; - LPWSTR text; TRACE("%p %p\n", dialog, rec); @@ -820,12 +840,19 @@ static UINT msi_dialog_button_control( msi_dialog *dialog, MSIRECORD *rec ) control->handler = msi_dialog_button_handler; - /* set the icon */ - text = msi_get_deformatted_field( dialog->package, rec, 10 ); - control->hIcon = msi_load_icon( dialog->package->db, text, attributes ); - if( attributes & msidbControlAttributesIcon ) - SendMessageW( control->hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM) control->hIcon ); - msi_free( text ); + if (attributes & msidbControlAttributesIcon) + { + /* set the icon */ + LPWSTR name = msi_get_binary_name( dialog->package, rec ); + control->hIcon = msi_load_icon( dialog->package->db, name, attributes ); + if (control->hIcon) + { + SendMessageW( control->hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM) control->hIcon ); + } + else + ERR("Failed to load icon %s\n", debugstr_w(name)); + msi_free( name ); + } return ERROR_SUCCESS; } @@ -1142,7 +1169,7 @@ static UINT msi_dialog_bitmap_control( msi_dialog *dialog, MSIRECORD *rec ) { UINT cx, cy, flags, style, attributes; msi_control *control; - LPWSTR text; + LPWSTR name; flags = LR_LOADFROMFILE; style = SS_BITMAP | SS_LEFT | WS_GROUP; @@ -1160,15 +1187,15 @@ static UINT msi_dialog_bitmap_control( msi_dialog *dialog, MSIRECORD *rec ) cx = msi_dialog_scale_unit( dialog, cx ); cy = msi_dialog_scale_unit( dialog, cy ); - text = msi_get_deformatted_field( dialog->package, rec, 10 ); - control->hBitmap = msi_load_picture( dialog->package->db, text, cx, cy, flags ); + name = msi_get_binary_name( dialog->package, rec ); + control->hBitmap = msi_load_picture( dialog->package->db, name, cx, cy, flags ); if( control->hBitmap ) SendMessageW( control->hwnd, STM_SETIMAGE, IMAGE_BITMAP, (LPARAM) control->hBitmap ); else - ERR("Failed to load bitmap %s\n", debugstr_w(text)); + ERR("Failed to load bitmap %s\n", debugstr_w(name)); - msi_free( text ); + msi_free( name ); return ERROR_SUCCESS; } @@ -1177,7 +1204,7 @@ static UINT msi_dialog_icon_control( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; DWORD attributes; - LPWSTR text; + LPWSTR name; TRACE("\n"); @@ -1185,13 +1212,13 @@ static UINT msi_dialog_icon_control( msi_dialog *dialog, MSIRECORD *rec ) SS_ICON | SS_CENTERIMAGE | WS_GROUP ); attributes = MSI_RecordGetInteger( rec, 8 ); - text = msi_get_deformatted_field( dialog->package, rec, 10 ); - control->hIcon = msi_load_icon( dialog->package->db, text, attributes ); + name = msi_get_binary_name( dialog->package, rec ); + control->hIcon = msi_load_icon( dialog->package->db, name, attributes ); if( control->hIcon ) SendMessageW( control->hwnd, STM_SETICON, (WPARAM) control->hIcon, 0 ); else - ERR("Failed to load bitmap %s\n", debugstr_w(text)); - msi_free( text ); + ERR("Failed to load bitmap %s\n", debugstr_w(name)); + msi_free( name ); return ERROR_SUCCESS; }

1 0