February 2008 - Wine-commits

Jacek Caban : hlink: Added HlinkResolveMonikerForData implementation.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 9d6cf488b60e0ce55a46c1560af6bff8be4dc849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6cf488b60e0ce55a46c1560… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 29 00:22:12 2008 +0100 hlink: Added HlinkResolveMonikerForData implementation. --- dlls/hlink/hlink.spec | 2 +- dlls/hlink/hlink_main.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink.spec b/dlls/hlink/hlink.spec index 117327b..0cc761f 100644 --- a/dlls/hlink/hlink.spec +++ b/dlls/hlink/hlink.spec @@ -8,7 +8,7 @@ 10 stdcall HlinkNavigate(ptr ptr long ptr ptr ptr) 11 stdcall HlinkUpdateStackItem(ptr ptr long ptr wstr wstr) 12 stub HlinkOnRenameDocument -14 stub HlinkResolveMonikerForData +14 stdcall HlinkResolveMonikerForData(ptr long ptr long ptr ptr ptr) 15 stub HlinkResolveStringForData 16 stub OleSaveToStreamEx 18 stdcall HlinkParseDisplayName(ptr wstr long ptr ptr) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index b9ce4af..ed8d60f 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -347,6 +347,39 @@ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNo return hres; } +HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER pimkReference, DWORD reserved, LPBC pibc, + ULONG cFmtetc, FORMATETC *rgFmtetc, IBindStatusCallback *pibsc, LPMONIKER pimkBase) +{ + LPOLESTR name = NULL; + IBindCtx *bctx; + DWORD mksys = 0; + void *obj = NULL; + HRESULT hres; + + TRACE("(%p %x %p %d %p %p %p)\n", pimkReference, reserved, pibc, cFmtetc, rgFmtetc, pibsc, pimkBase); + + if(cFmtetc || rgFmtetc || pimkBase) + FIXME("Unsupported args\n"); + + hres = RegisterBindStatusCallback(pibc, pibsc, NULL /* FIXME */, 0); + if(FAILED(hres)) + return hres; + + hres = IMoniker_IsSystemMoniker(pimkReference, &mksys); + if(SUCCEEDED(hres) && mksys != MKSYS_URLMONIKER) + WARN("sysmk = %x\n", mksys); + + /* FIXME: What is it for? */ + CreateBindCtx(0, &bctx); + hres = IMoniker_GetDisplayName(pimkReference, bctx, NULL, &name); + IBindCtx_Release(bctx); + if(SUCCEEDED(hres)) { + TRACE("got display name %s\n", debugstr_w(name)); + CoTaskMemFree(name); + } + + return IMoniker_BindToStorage(pimkReference, pibc, NULL, &IID_IUnknown, &obj); +} static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) {

1 0

Marcus Meissner : atl: Check for NULL.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: c46327b40cd16c09d0ad62acc3664b4fedbaed37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46327b40cd16c09d0ad62acc… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 26 09:40:42 2008 +0100 atl: Check for NULL. --- dlls/atl/atl_ax.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 64b338b..6ffccde 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1026,7 +1026,8 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, IUnknown_AddRef( pUnkControl ); } - IUnknown_Release( pUnkControl ); + if ( pUnkControl ) + IUnknown_Release( pUnkControl ); if ( pContainer ) IUnknown_Release( pContainer );

1 0

Marcus Meissner : pdh: Fixed wrong condition.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 22aed3267b27667e87dc7654f838621abc0337ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=22aed3267b27667e87dc7654f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jan 26 09:43:10 2008 +0100 pdh: Fixed wrong condition. --- dlls/pdh/pdh_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index a7aa21b..d78af4a 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -873,7 +873,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexW( LPCWSTR machine, DWORD index, LPWST return PDH_CSTATUS_NO_MACHINE; } - if (!buffer && !size) return PDH_INVALID_ARGUMENT; + if (!buffer || !size) return PDH_INVALID_ARGUMENT; if (!index) return ERROR_SUCCESS; for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++)

1 0

Paul Vriens : include/wintrust.h: Add missing members to CRYPT_PROVIDER_DATA struct ( fixes some wintrust tests on Windows).
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 254000dc99085030d5e5780d937305e9a4540799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=254000dc99085030d5e5780d9… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Jan 27 17:28:18 2008 +0100 include/wintrust.h: Add missing members to CRYPT_PROVIDER_DATA struct (fixes some wintrust tests on Windows). --- include/wintrust.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index 0c4d535..bc1c367 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -341,6 +341,8 @@ typedef struct _CRYPT_PROVIDER_DATA { HCRYPTMSG hMsg; DWORD csSigners; CRYPT_PROVIDER_SGNR *pasSigners; + DWORD csProvPrivData; + CRYPT_PROVIDER_PRIVDATA *pasProvPrivData; DWORD dwSubjectChoice; union { struct _PROVDATA_SIP *pPDSip;

1 0

Francois Gouget : user32: Fix a typo in the StretchDIBits stub name.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 5caa63cae180027654fa7501a4957c9fb98bc312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5caa63cae180027654fa7501a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 26 03:06:49 2008 +0100 user32: Fix a typo in the StretchDIBits stub name. --- dlls/user32/display.drv.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/display.drv.spec b/dlls/user32/display.drv.spec index 82af0e5..2a805d6 100644 --- a/dlls/user32/display.drv.spec +++ b/dlls/user32/display.drv.spec @@ -27,7 +27,7 @@ 25 stub GetPaletteTranslate 26 stub UpdateColors 27 stub StretchBlt -28 stub StrechDIBits +28 stub StretchDIBits 29 stub SelectBitmap 30 stub BitmapBits 31 stub ReEnable

1 0

Francois Gouget : winedump: Use the standard SLDF_XXX flag names instead of inventing new ones. Add the missing flags.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 85eac20afdc0c64650054e0eded45ea2dbe3ac9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=85eac20afdc0c64650054e0ed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Jan 26 03:10:44 2008 +0100 winedump: Use the standard SLDF_XXX flag names instead of inventing new ones. Add the missing flags. --- tools/winedump/lnk.c | 102 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 67 insertions(+), 35 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 529e4ef..2754602 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -38,16 +38,36 @@ #include "pshpack1.h" -#define SCF_PIDL 1 -#define SCF_LOCATION 2 -#define SCF_DESCRIPTION 4 -#define SCF_RELATIVE 8 -#define SCF_WORKDIR 0x10 -#define SCF_ARGS 0x20 -#define SCF_CUSTOMICON 0x40 -#define SCF_UNICODE 0x80 -#define SCF_PRODUCT 0x800 -#define SCF_COMPONENT 0x1000 +typedef enum { + SLDF_HAS_ID_LIST = 0x00000001, + SLDF_HAS_LINK_INFO = 0x00000002, + SLDF_HAS_NAME = 0x00000004, + SLDF_HAS_RELPATH = 0x00000008, + SLDF_HAS_WORKINGDIR = 0x00000010, + SLDF_HAS_ARGS = 0x00000020, + SLDF_HAS_ICONLOCATION = 0x00000040, + SLDF_UNICODE = 0x00000080, + SLDF_FORCE_NO_LINKINFO = 0x00000100, + SLDF_HAS_EXP_SZ = 0x00000200, + SLDF_RUN_IN_SEPARATE = 0x00000400, + SLDF_HAS_LOGO3ID = 0x00000800, + SLDF_HAS_DARWINID = 0x00001000, + SLDF_RUNAS_USER = 0x00002000, + SLDF_HAS_EXP_ICON_SZ = 0x00004000, + SLDF_NO_PIDL_ALIAS = 0x00008000, + SLDF_FORCE_UNCNAME = 0x00010000, + SLDF_RUN_WITH_SHIMLAYER = 0x00020000, + SLDF_FORCE_NO_LINKTRACK = 0x00040000, + SLDF_ENABLE_TARGET_METADATA = 0x00080000, + SLDF_DISABLE_KNOWNFOLDER_RELATIVE_TRACKING = 0x00200000, + SLDF_RESERVED = 0x80000000, +} SHELL_LINK_DATA_FLAGS; + +typedef struct tagDATABLOCKHEADER +{ + DWORD cbSize; + DWORD dwSignature; +} DATABLOCK_HEADER; typedef struct _LINK_HEADER { @@ -351,39 +371,51 @@ void lnk_dump(void) /* dump out all the flags */ printf("Flags: %04x ( ", hdr->dwFlags); -#define FLAG(x) if(hdr->dwFlags & SCF_##x) printf("%s ",#x); - FLAG(PIDL) - FLAG(LOCATION) - FLAG(DESCRIPTION) - FLAG(RELATIVE) - FLAG(WORKDIR) - FLAG(ARGS) - FLAG(CUSTOMICON) - FLAG(UNICODE) - FLAG(PRODUCT) - FLAG(COMPONENT) +#define FLAG(x) if(hdr->dwFlags & SLDF_##x) printf("%s ",#x) + FLAG(HAS_ID_LIST); + FLAG(HAS_LINK_INFO); + FLAG(HAS_NAME); + FLAG(HAS_RELPATH); + FLAG(HAS_WORKINGDIR); + FLAG(HAS_ARGS); + FLAG(HAS_ICONLOCATION); + FLAG(UNICODE); + FLAG(FORCE_NO_LINKINFO); + FLAG(HAS_EXP_SZ); + FLAG(RUN_IN_SEPARATE); + FLAG(HAS_LOGO3ID); + FLAG(HAS_DARWINID); + FLAG(RUNAS_USER); + FLAG(HAS_EXP_ICON_SZ); + FLAG(NO_PIDL_ALIAS); + FLAG(FORCE_UNCNAME); + FLAG(RUN_WITH_SHIMLAYER); + FLAG(FORCE_NO_LINKTRACK); + FLAG(ENABLE_TARGET_METADATA); + FLAG(DISABLE_KNOWNFOLDER_RELATIVE_TRACKING); + FLAG(RESERVED); #undef FLAG printf(")\n"); printf("Length: %04x\n", hdr->dwFileLength); printf("\n"); - if (hdr->dwFlags & SCF_PIDL) + if (hdr->dwFlags & SLDF_HAS_ID_LIST) dump_pidl(); - if (hdr->dwFlags & SCF_LOCATION) + if (hdr->dwFlags & SLDF_HAS_LINK_INFO) dump_location(); - if (hdr->dwFlags & SCF_DESCRIPTION) - dump_string("Description", hdr->dwFlags & SCF_UNICODE); - if (hdr->dwFlags & SCF_RELATIVE) - dump_string("Relative path", hdr->dwFlags & SCF_UNICODE); - if (hdr->dwFlags & SCF_WORKDIR) - dump_string("Working directory", hdr->dwFlags & SCF_UNICODE); - if (hdr->dwFlags & SCF_ARGS) - dump_string("Arguments", hdr->dwFlags & SCF_UNICODE); - if (hdr->dwFlags & SCF_CUSTOMICON) - dump_string("Icon path", hdr->dwFlags & SCF_UNICODE); - if (hdr->dwFlags & SCF_PRODUCT) + if (hdr->dwFlags & SLDF_HAS_NAME) + dump_string("Description", hdr->dwFlags & SLDF_UNICODE); + if (hdr->dwFlags & SLDF_HAS_RELPATH) + dump_string("Relative path", hdr->dwFlags & SLDF_UNICODE); + if (hdr->dwFlags & SLDF_HAS_WORKINGDIR) + dump_string("Working directory", hdr->dwFlags & SLDF_UNICODE); + if (hdr->dwFlags & SLDF_HAS_ARGS) + dump_string("Arguments", hdr->dwFlags & SLDF_UNICODE); + if (hdr->dwFlags & SLDF_HAS_ICONLOCATION) + dump_string("Icon path", hdr->dwFlags & SLDF_UNICODE); + if (hdr->dwFlags & SLDF_HAS_LOGO3ID) dump_advertise_info("product"); - if (hdr->dwFlags & SCF_COMPONENT) + if (hdr->dwFlags & SLDF_HAS_DARWINID) dump_advertise_info("msi string"); }

1 0

Francois Gouget : winedump: Track unknown lnk flags and dump them.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 74d8536414c0cf11014ca7ba1ae1578ae54811fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d8536414c0cf11014ca7ba1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Jan 26 03:11:02 2008 +0100 winedump: Track unknown lnk flags and dump them. --- tools/winedump/lnk.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 2754602..1da0176 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -352,6 +352,7 @@ enum FileSig get_kind_lnk(void) void lnk_dump(void) { const LINK_HEADER* hdr; + DWORD dwFlags; offset = 0; hdr = fetch_block(); @@ -371,7 +372,15 @@ void lnk_dump(void) /* dump out all the flags */ printf("Flags: %04x ( ", hdr->dwFlags); -#define FLAG(x) if(hdr->dwFlags & SLDF_##x) printf("%s ",#x) + dwFlags=hdr->dwFlags; +#define FLAG(x) do \ + { \ + if (dwFlags & SLDF_##x) \ + { \ + printf("%s ", #x); \ + dwFlags&=~SLDF_##x; \ + } \ + } while (0) FLAG(HAS_ID_LIST); FLAG(HAS_LINK_INFO); FLAG(HAS_NAME); @@ -395,6 +404,8 @@ void lnk_dump(void) FLAG(DISABLE_KNOWNFOLDER_RELATIVE_TRACKING); FLAG(RESERVED); #undef FLAG + if (dwFlags) + printf("+%04x", dwFlags); printf(")\n"); printf("Length: %04x\n", hdr->dwFileLength);

1 0

Francois Gouget : winedump: Dump the raw data when finding an unknown block in an lnk file.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 9fc80d212fd892d24081c7d30c38a81a017d6e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fc80d212fd892d24081c7d30… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Jan 26 03:13:26 2008 +0100 winedump: Dump the raw data when finding an unknown block in an lnk file. --- tools/winedump/lnk.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 1da0176..c63a1c6 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -336,6 +336,58 @@ static int dump_advertise_info(const char *type) return 0; } +static int dump_raw_block(void) +{ + const DATABLOCK_HEADER *bhdr; + int data_size; + + bhdr = fetch_block(); + if (!bhdr) + { + printf("\n"); + printf("No end block!\n"); + return 0; + } + if (!bhdr->cbSize) + return 0; + + printf("Raw Block\n"); + printf("---------\n\n"); + printf("size = %d\n", bhdr->cbSize); + printf("magic = %x\n", bhdr->dwSignature); + + data_size=bhdr->cbSize-sizeof(*bhdr); + if (data_size > 0) + { + unsigned int i; + const unsigned char *data; + + printf("data = "); + data=(const unsigned char*)bhdr+sizeof(*bhdr); + while (data_size > 0) + { + for (i=0; i < 16; i++) + { + if (i < data_size) + printf("%02x ", data[i]); + else + printf(" "); + } + for (i=0; i < data_size && i < 16; i++) + printf("%c", (data[i] >= 32 && data[i] < 128 ? data[i] : '.')); + printf("\n"); + data_size-=16; + if (data_size <= 0) + break; + data+=16; + printf(" "); + } + } + printf("\n"); + + return 1; +} + static const GUID CLSID_ShellLink = {0x00021401L, 0, 0, {0xC0,0,0,0,0,0,0,0x46}}; enum FileSig get_kind_lnk(void) @@ -429,4 +481,5 @@ void lnk_dump(void) dump_advertise_info("product"); if (hdr->dwFlags & SLDF_HAS_DARWINID) dump_advertise_info("msi string"); + while (dump_raw_block()); }

1 0

Francois Gouget : winedump: Switch the block dumping code to be block-oriented, rather then flag oriented, so it is resilient to order changes.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: 79a6f4193541a0f3d98e46e1b79908bd0c80947e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a6f4193541a0f3d98e46e1b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Jan 26 03:13:58 2008 +0100 winedump: Switch the block dumping code to be block-oriented, rather then flag oriented, so it is resilient to order changes. --- tools/winedump/lnk.c | 124 +++++++++++++++++++++++++++----------------------- 1 files changed, 67 insertions(+), 57 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index c63a1c6..590a9d1 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -63,6 +63,9 @@ typedef enum { SLDF_RESERVED = 0x80000000, } SHELL_LINK_DATA_FLAGS; +#define EXP_DARWIN_ID_SIG 0xa0000006 +#define EXP_SZ_ICON_SIG 0xa0000007 + typedef struct tagDATABLOCKHEADER { DWORD cbSize; @@ -86,13 +89,13 @@ typedef struct _LINK_HEADER DWORD Unknown6; /* 0x48 */ } LINK_HEADER, * PLINK_HEADER; -typedef struct tagLINK_ADVERTISEINFO +typedef struct tagLINK_SZ_BLOCK { DWORD size; DWORD magic; CHAR bufA[MAX_PATH]; WCHAR bufW[MAX_PATH]; -} LINK_ADVERTISEINFO; +} LINK_SZ_BLOCK; typedef struct _LOCATION_INFO { @@ -285,72 +288,64 @@ static int base85_to_guid( const char *str, LPGUID guid ) return 1; } -static int dump_advertise_info(const char *type) +static int dump_sz_block(const DATABLOCK_HEADER* bhdr, const char* label) { - const LINK_ADVERTISEINFO *avt; + const LINK_SZ_BLOCK *szp = (const LINK_SZ_BLOCK*)bhdr; + printf("String block\n"); + printf("-----------\n\n"); + printf("magic = %x\n", szp->magic); + printf("%s = %s\n", label, szp->bufA); + printf("\n"); + return 0; +} - avt = fetch_block(); - if (!avt) - return -1; +static int dump_darwin_id(const DATABLOCK_HEADER* bhdr) +{ + const LINK_SZ_BLOCK *szp = (const LINK_SZ_BLOCK*)bhdr; + char comp_str[40]; + const char *feat, *comp, *prod_str, *feat_str; + GUID guid; printf("Advertise Info\n"); printf("--------------\n\n"); - printf("magic = %x\n", avt->magic); - printf("%s = %s\n", type, avt->bufA); - if (avt->magic == 0xa0000006) - { - char comp_str[40]; - const char *feat, *comp, *prod_str, *feat_str; - GUID guid; - - if (base85_to_guid(avt->bufA, &guid)) - prod_str = get_guid_str( &guid ); - else - prod_str = "?"; - - comp = &avt->bufA[20]; - feat = strchr(comp,'>'); - if (!feat) - feat = strchr(comp,'<'); - if (feat) - { - memcpy( comp_str, comp, feat - comp ); - comp_str[feat-comp] = 0; - } - else - { - strcpy( comp_str, "?" ); - } + printf("msi string = %s\n", szp->bufA); - if (feat && feat[0] == '>' && base85_to_guid( &feat[1], &guid )) - feat_str = get_guid_str( &guid ); - else - feat_str = ""; + if (base85_to_guid(szp->bufA, &guid)) + prod_str = get_guid_str(&guid); + else + prod_str = "?"; - printf(" product: %s\n", prod_str); - printf(" component: %s\n", comp_str ); - printf(" feature: %s\n", feat_str); + comp = &szp->bufA[20]; + feat = strchr(comp, '>'); + if (!feat) + feat = strchr(comp, '<'); + if (feat) + { + memcpy(comp_str, comp, feat - comp); + comp_str[feat-comp] = 0; + } + else + { + strcpy(comp_str, "?"); } + + if (feat && feat[0] == '>' && base85_to_guid( &feat[1], &guid )) + feat_str = get_guid_str( &guid ); + else + feat_str = ""; + + printf(" product: %s\n", prod_str); + printf(" component: %s\n", comp_str ); + printf(" feature: %s\n", feat_str); printf("\n"); return 0; } -static int dump_raw_block(void) +static int dump_raw_block(const DATABLOCK_HEADER* bhdr) { - const DATABLOCK_HEADER *bhdr; int data_size; - bhdr = fetch_block(); - if (!bhdr) - { - printf("\n"); - printf("No end block!\n"); - return 0; - } - if (!bhdr->cbSize) - return 0; - printf("Raw Block\n"); printf("---------\n\n"); printf("size = %d\n", bhdr->cbSize); @@ -404,6 +399,7 @@ enum FileSig get_kind_lnk(void) void lnk_dump(void) { const LINK_HEADER* hdr; + const DATABLOCK_HEADER* bhdr; DWORD dwFlags; offset = 0; @@ -477,9 +473,23 @@ void lnk_dump(void) dump_string("Arguments", hdr->dwFlags & SLDF_UNICODE); if (hdr->dwFlags & SLDF_HAS_ICONLOCATION) dump_string("Icon path", hdr->dwFlags & SLDF_UNICODE); - if (hdr->dwFlags & SLDF_HAS_LOGO3ID) - dump_advertise_info("product"); - if (hdr->dwFlags & SLDF_HAS_DARWINID) - dump_advertise_info("msi string"); - while (dump_raw_block()); + + bhdr=fetch_block(); + while (bhdr) + { + if (!bhdr->cbSize) + break; + switch (bhdr->dwSignature) + { + case EXP_SZ_ICON_SIG: + dump_sz_block(bhdr, "icon"); + break; + case EXP_DARWIN_ID_SIG: + dump_darwin_id(bhdr); + break; + default: + dump_raw_block(bhdr); + } + bhdr=fetch_block(); + } }

1 0

Francois Gouget : winedump: Add support for dumping SZ_LINK and SPECIAL_FOLDER data blocks.
by Alexandre Julliard 04 Feb '08

04 Feb '08

Module: wine Branch: master Commit: fa9950f93e70b6358a69e85fa3f5e9671b5f7535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9950f93e70b6358a69e85fa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Jan 26 03:15:52 2008 +0100 winedump: Add support for dumping SZ_LINK and SPECIAL_FOLDER data blocks. --- tools/winedump/lnk.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 590a9d1..53d2a55 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -63,6 +63,8 @@ typedef enum { SLDF_RESERVED = 0x80000000, } SHELL_LINK_DATA_FLAGS; +#define EXP_SZ_LINK_SIG 0xa0000001 +#define EXP_SPECIAL_FOLDER_SIG 0xa0000005 #define EXP_DARWIN_ID_SIG 0xa0000006 #define EXP_SZ_ICON_SIG 0xa0000007 @@ -116,6 +118,14 @@ typedef struct _LOCAL_VOLUME_INFO DWORD dwVolLabelOfs; } LOCAL_VOLUME_INFO; +typedef struct +{ + DWORD cbSize; + DWORD dwSignature; + DWORD idSpecialFolder; + DWORD cbOffset; +} EXP_SPECIAL_FOLDER; + typedef struct lnk_string_tag { unsigned short size; @@ -288,6 +298,17 @@ static int base85_to_guid( const char *str, LPGUID guid ) return 1; } +static int dump_special_folder_block(const DATABLOCK_HEADER* bhdr) +{ + const EXP_SPECIAL_FOLDER *sfb = (const EXP_SPECIAL_FOLDER*)bhdr; + printf("Special folder block\n"); + printf("--------------------\n\n"); + printf("folder = 0x%04x\n", sfb->idSpecialFolder); + printf("offset = %d\n", sfb->cbOffset); + printf("\n"); + return 0; +} + static int dump_sz_block(const DATABLOCK_HEADER* bhdr, const char* label) { const LINK_SZ_BLOCK *szp = (const LINK_SZ_BLOCK*)bhdr; @@ -481,6 +502,12 @@ void lnk_dump(void) break; switch (bhdr->dwSignature) { + case EXP_SZ_LINK_SIG: + dump_sz_block(bhdr, "exp.link"); + break; + case EXP_SPECIAL_FOLDER_SIG: + dump_special_folder_block(bhdr); + break; case EXP_SZ_ICON_SIG: dump_sz_block(bhdr, "icon"); break;

1 0