November 2007 - Wine-commits

Andrew Talbot : user32: Constify some variables.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 7a8eb4c5999120025a50b44eb1ba82861ba82ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8eb4c5999120025a50b44eb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:54:25 2007 +0000 user32: Constify some variables. --- dlls/user32/listbox.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 5d99670..d819684 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -131,7 +131,7 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); -static LRESULT LISTBOX_GetItemRect( LB_DESCR *descr, INT index, RECT *rect ); +static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); /********************************************************************* * listbox class descriptor @@ -177,7 +177,7 @@ static inline BOOL is_old_app( LB_DESCR *descr ) * * Return the current page size */ -static INT LISTBOX_GetCurrentPageSize( LB_DESCR *descr ) +static INT LISTBOX_GetCurrentPageSize( const LB_DESCR *descr ) { INT i, height; if (!(descr->style & LBS_OWNERDRAWVARIABLE)) return descr->page_size; @@ -195,7 +195,7 @@ static INT LISTBOX_GetCurrentPageSize( LB_DESCR *descr ) * * Return the maximum possible index for the top of the listbox. */ -static INT LISTBOX_GetMaxTopIndex( LB_DESCR *descr ) +static INT LISTBOX_GetMaxTopIndex( const LB_DESCR *descr ) { INT max, page; @@ -432,7 +432,7 @@ static void LISTBOX_UpdateSize( LB_DESCR *descr ) * Get the rectangle enclosing an item, in listbox client coordinates. * Return 1 if the rectangle is (partially) visible, 0 if hidden, -1 on error. */ -static LRESULT LISTBOX_GetItemRect( LB_DESCR *descr, INT index, RECT *rect ) +static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ) { /* Index <= 0 is legal even on empty listboxes */ if (index && (index >= descr->nb_items)) @@ -490,7 +490,7 @@ static LRESULT LISTBOX_GetItemRect( LB_DESCR *descr, INT index, RECT *rect ) * * Return the item nearest from point (x,y) (in client coordinates). */ -static INT LISTBOX_GetItemFromPoint( LB_DESCR *descr, INT x, INT y ) +static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) { INT index = descr->top_item; @@ -999,10 +999,10 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa /*********************************************************************** * LISTBOX_GetSelCount */ -static LRESULT LISTBOX_GetSelCount( LB_DESCR *descr ) +static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr ) { INT i, count; - LB_ITEMDATA *item = descr->items; + const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL) || (descr->style & LBS_NOSEL)) @@ -1016,10 +1016,10 @@ static LRESULT LISTBOX_GetSelCount( LB_DESCR *descr ) /*********************************************************************** * LISTBOX_GetSelItems16 */ -static LRESULT LISTBOX_GetSelItems16( LB_DESCR *descr, INT16 max, LPINT16 array ) +static LRESULT LISTBOX_GetSelItems16( const LB_DESCR *descr, INT16 max, LPINT16 array ) { INT i, count; - LB_ITEMDATA *item = descr->items; + const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; for (i = count = 0; (i < descr->nb_items) && (count < max); i++, item++) @@ -1031,10 +1031,10 @@ static LRESULT LISTBOX_GetSelItems16( LB_DESCR *descr, INT16 max, LPINT16 array /*********************************************************************** * LISTBOX_GetSelItems */ -static LRESULT LISTBOX_GetSelItems( LB_DESCR *descr, INT max, LPINT array ) +static LRESULT LISTBOX_GetSelItems( const LB_DESCR *descr, INT max, LPINT array ) { INT i, count; - LB_ITEMDATA *item = descr->items; + const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; for (i = count = 0; (i < descr->nb_items) && (count < max); i++, item++) @@ -1200,7 +1200,7 @@ static void LISTBOX_InvalidateItemRect( LB_DESCR *descr, INT index ) /*********************************************************************** * LISTBOX_GetItemHeight */ -static LRESULT LISTBOX_GetItemHeight( LB_DESCR *descr, INT index ) +static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) { if (descr->style & LBS_OWNERDRAWVARIABLE && descr->nb_items > 0) {

1 0

Vijay Kiran Kamuju : rsaenh: Add implementation of Enhanced RSA AES Provider.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 1dbaa8c619f8598ec7ce9b79347afd84c49ec1b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbaa8c619f8598ec7ce9b793… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Nov 20 16:58:23 2007 -0600 rsaenh: Add implementation of Enhanced RSA AES Provider. --- dlls/rsaenh/Makefile.in | 1 + dlls/rsaenh/aes.c | 1333 ++++++++++++++++++++++++++++++++++++++++++++ dlls/rsaenh/implglue.c | 29 + dlls/rsaenh/implglue.h | 1 + dlls/rsaenh/rsaenh.c | 94 +++- dlls/rsaenh/tests/rsaenh.c | 22 +- dlls/rsaenh/tomcrypt.h | 9 + 7 files changed, 1454 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1dbaa8c619f8598ec7ce9…

1 0

Divan Burger : user32: Fix colours to match exactly with Windows 2000.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 91d2b609c3d13ee7a2fcdf5529a8c0ea9d6f7266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d2b609c3d13ee7a2fcdf552… Author: Divan Burger <divan.burger(a)gmail.com> Date: Wed Nov 21 09:10:11 2007 +0200 user32: Fix colours to match exactly with Windows 2000. --- dlls/user32/sysparams.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3c314f9..60afd2e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -108,8 +108,8 @@ static const char * const DefSysColors[] = "ButtonText", "0 0 0", /* COLOR_BTNTEXT */ "InactiveTitleText", "212 208 200", /* COLOR_INACTIVECAPTIONTEXT */ "ButtonHilight", "255 255 255", /* COLOR_BTNHIGHLIGHT */ - "ButtonDkShadow", "0 0 0", /* COLOR_3DDKSHADOW */ - "ButtonLight", "224 224 224", /* COLOR_3DLIGHT */ + "ButtonDkShadow", "64 64 64", /* COLOR_3DDKSHADOW */ + "ButtonLight", "212 208 200", /* COLOR_3DLIGHT */ "InfoText", "0 0 0", /* COLOR_INFOTEXT */ "InfoWindow", "255 255 225", /* COLOR_INFOBK */ "ButtonAlternateFace", "180 180 180", /* COLOR_ALTERNATEBTNFACE */

1 0

Divan Burger : user32: Change the desktop colour and pattern to match win2k .
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 113f573b25f136674bfd7324b54ad7109d01142b URL: http://source.winehq.org/git/wine.git/?a=commit;h=113f573b25f136674bfd7324b… Author: Divan Burger <divan.burger(a)gmail.com> Date: Wed Nov 21 11:33:53 2007 +0200 user32: Change the desktop colour and pattern to match win2k. --- dlls/user32/sysparams.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 60afd2e..d5acd0b 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -88,7 +88,7 @@ enum spi_index static const char * const DefSysColors[] = { "Scrollbar", "212 208 200", /* COLOR_SCROLLBAR */ - "Background", "0 128 128", /* COLOR_BACKGROUND */ + "Background", "58 110 165", /* COLOR_BACKGROUND */ "ActiveTitle", "0 0 128", /* COLOR_ACTIVECAPTION */ "InactiveTitle", "128 128 128", /* COLOR_INACTIVECAPTION */ "Menu", "212 208 200", /* COLOR_MENU */ @@ -261,8 +261,7 @@ static const WCHAR MessageFontSize[]= {'M','e','s','s','a static const WCHAR System[]= {'S','y','s','t','e','m',0}; static const WCHAR IconTitleSize[]= {'I','c','o','n','T','i','t','l','e','S','i','z','e',0}; static const WCHAR IconTitleFaceName[]= {'I','c','o','n','T','i','t','l','e','F','a','c','e','N','a','m','e',0}; -static const WCHAR defPattern[]= {'1','7','0',' ','8','5',' ','1','7','0',' ','8','5',' ','1','7','0',' ','8','5', - ' ','1','7','0',' ','8','5',0}; +static const WCHAR defPattern[]= {'0',' ','0',' ','0',' ','0',' ','0',' ','0',' ','0',' ','0',0}; static const WCHAR CSu[]= {'%','u',0}; static const WCHAR CSd[]= {'%','d',0};

1 0

Alistair Leslie-Hughes : msxml: Always return a string in get_text.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: c443674d13117d3aec147f14b920ec0b1ae56325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c443674d13117d3aec147f14b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 20 21:31:43 2007 +1100 msxml: Always return a string in get_text. --- dlls/msxml3/node.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 298deff..e52718e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -564,7 +564,10 @@ static HRESULT WINAPI xmlnode_get_text( default: FIXME("Unhandled node type %d\n", This->node->type); } - + + /* Always return a string. */ + if (!str) str = SysAllocStringLen( NULL, 0 ); + TRACE("%p %s\n", This, debugstr_w(str) ); *text = str;

1 0

Alistair Leslie-Hughes : msxml: Implement createTextNode.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 43d92f4d76827e7dc0535b8d7e5665f205afab26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d92f4d76827e7dc0535b8d7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 16 09:55:49 2007 +1100 msxml: Implement createTextNode. --- dlls/msxml3/domdoc.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 9a1dba7..b4b8962 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -744,8 +744,29 @@ static HRESULT WINAPI domdoc_createTextNode( BSTR data, IXMLDOMText** text ) { - FIXME("\n"); - return E_NOTIMPL; + domdoc *This = impl_from_IXMLDOMDocument2( iface ); + xmlNodePtr xmlnode; + xmlChar *xml_content; + + TRACE("%p->(%s %p)\n", iface, debugstr_w(data), text); + + if(!text) + return E_INVALIDARG; + + *text = NULL; + + xml_content = xmlChar_from_wchar((WCHAR*)data); + xmlnode = xmlNewText(xml_content); + HeapFree(GetProcessHeap(), 0, xml_content); + + if(!xmlnode) + return E_FAIL; + + xmlnode->doc = get_doc( This ); + + *text = (IXMLDOMText*)create_text(xmlnode); + + return S_OK; }

1 0

Alistair Leslie-Hughes : msxml: Tests for createTextNode.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: f35673e9e94f486c0b0a27af0c1eef8bc8b02660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35673e9e94f486c0b0a27af0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 16 09:55:51 2007 +1100 msxml: Tests for createTextNode. --- dlls/msxml3/tests/domdoc.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bf272ff..937e2fd 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -333,6 +333,7 @@ static void test_domdoc( void ) IXMLDOMParseError *error; IXMLDOMElement *element = NULL; IXMLDOMNode *node; + IXMLDOMText *nodetext = NULL; VARIANT_BOOL b; VARIANT var; BSTR str; @@ -488,6 +489,15 @@ static void test_domdoc( void ) ok( code == 0, "code %ld\n", code ); IXMLDOMParseError_Release( error ); + /* test createTextNode */ + str = SysAllocString( szOpen ); + r = IXMLDOMDocument_createTextNode(doc, str, NULL); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + r = IXMLDOMDocument_createTextNode(doc, str, &nodetext); + ok( r == S_OK, "returns %08x\n", r ); + IXMLDOMText_Release( nodetext ); + SysFreeString( str ); + r = IXMLDOMDocument_Release( doc ); ok( r == 0, "document ref count incorrect\n");

1 0

Vijay Kiran Kamuju : rsaenh: Add tests for RSA_AES provider.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: ea1f8c7ad86e21603244180db10687e1cf3b6ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea1f8c7ad86e21603244180db… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Nov 20 16:56:15 2007 -0600 rsaenh: Add tests for RSA_AES provider. --- dlls/rsaenh/tests/rsaenh.c | 139 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 134 insertions(+), 5 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index a8c8c4f..38a28bf 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2,6 +2,8 @@ * Unit tests for rsaenh functions * * Copyright (c) 2004 Michael Jung + * Copyright (c) 2006 Juan Lang + * Copyright (c) 2007 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -83,7 +85,7 @@ static void trace_hex(BYTE *pbData, DWORD dwLen) { } */ -static int init_environment(void) +static int init_base_environment(void) { HCRYPTKEY hKey; BOOL result; @@ -100,7 +102,7 @@ static int init_environment(void) ok(GetLastError()==NTE_BAD_KEYSET, "%08x\n", GetLastError()); if (GetLastError()!=NTE_BAD_KEYSET) return 0; result = CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, - CRYPT_NEWKEYSET); + CRYPT_NEWKEYSET); ok(result, "%08x\n", GetLastError()); if (!result) return 0; result = CryptGenKey(hProv, AT_KEYEXCHANGE, 0, &hKey); @@ -113,7 +115,7 @@ static int init_environment(void) return 1; } -static void clean_up_environment(void) +static void clean_up_base_environment(void) { BOOL result; @@ -123,6 +125,61 @@ static void clean_up_environment(void) CryptAcquireContext(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } +static int init_aes_environment(void) +{ + HCRYPTKEY hKey; + BOOL result; + + pCryptDuplicateHash = (void *)GetProcAddress(GetModuleHandleA("advapi32.dll"), "CryptDuplicateHash"); + + hProv = (HCRYPTPROV)INVALID_HANDLE_VALUE; + + /* we are using NULL as provider name for RSA_AES provider as the provider + * names are different in Windows XP and Vista. Its different as to what + * its defined in the SDK on Windows XP. + * This provider is available on Windows XP, Windows 2003 and Vista. */ + + result = CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT); + todo_wine { + ok(!result && GetLastError()==NTE_BAD_FLAGS, "%d, %08x\n", result, GetLastError()); + } + + if (!CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, 0)) + { + todo_wine { + ok(GetLastError()==NTE_BAD_KEYSET, "%08x\n", GetLastError()); + } + if (GetLastError()!=NTE_BAD_KEYSET) return 0; + result = CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, + CRYPT_NEWKEYSET); + todo_wine { + ok(result, "%08x\n", GetLastError()); + } + if (!result) return 0; + result = CryptGenKey(hProv, AT_KEYEXCHANGE, 0, &hKey); + todo_wine { + ok(result, "%08x\n", GetLastError()); + } + if (result) CryptDestroyKey(hKey); + result = CryptGenKey(hProv, AT_SIGNATURE, 0, &hKey); + todo_wine { + ok(result, "%08x\n", GetLastError()); + } + if (result) CryptDestroyKey(hKey); + } + return 1; +} + +static void clean_up_aes_environment(void) +{ + BOOL result; + + result = CryptReleaseContext(hProv, 1); + todo_wine ok(!result && GetLastError()==NTE_BAD_FLAGS, "%08x\n", GetLastError()); + + CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_DELETEKEYSET); +} + static void test_prov(void) { BOOL result; @@ -586,6 +643,72 @@ static void test_3des(void) ok(result, "%08x\n", GetLastError()); } +static void test_aes(int keylen) +{ + HCRYPTKEY hKey; + BOOL result; + DWORD dwLen; + unsigned char pbData[16]; + int i; + + switch (keylen) + { + case 256: + result = derive_key(CALG_AES_256, &hKey, 0); + break; + case 192: + result = derive_key(CALG_AES_192, &hKey, 0); + break; + default: + case 128: + result = derive_key(CALG_AES_128, &hKey, 0); + break; + } + if (!result) return; + + for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; + + dwLen = 13; + result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, 16); + todo_wine { + ok(result, "%08x\n", GetLastError()); + } + + result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + todo_wine { + ok(result, "%08x\n", GetLastError()); + } + + for (i=0; i<4; i++) + { + memcpy(pbData,cTestData[i].origstr,cTestData[i].strlen); + + dwLen = cTestData[i].enclen; + result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); + todo_wine { + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); + } + + result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + todo_wine { + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); + if((dwLen != cTestData[i].enclen) || + memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)) + { + printBytes("expected",cTestData[i].decstr,cTestData[i].strlen); + printBytes("got",pbData,dwLen); + } + } + } + result = CryptDestroyKey(hKey); + todo_wine { + ok(result, "%08x\n", GetLastError()); + } +} + static void test_rc2(void) { static const BYTE rc2encrypted[16] = { @@ -1881,7 +2004,7 @@ static void test_null_provider(void) START_TEST(rsaenh) { - if (!init_environment()) + if (!init_base_environment()) return; test_prov(); test_gen_random(); @@ -1899,7 +2022,13 @@ START_TEST(rsaenh) test_rsa_encrypt(); test_import_export(); test_enum_container(); - clean_up_environment(); + clean_up_base_environment(); test_schannel_provider(); test_null_provider(); + if (!init_aes_environment()) + return; + test_aes(128); + test_aes(192); + test_aes(256); + clean_up_aes_environment(); }

1 0

Jacek Caban : hlink: Added HlinkUpdateStackItem stub.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 12d856e1002782c83f0b87e7d1f1e6e9ecd0a865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12d856e1002782c83f0b87e7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 02:13:16 2007 +0100 hlink: Added HlinkUpdateStackItem stub. --- dlls/hlink/hlink.spec | 2 +- dlls/hlink/hlink_main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/hlink.spec b/dlls/hlink/hlink.spec index e5ab631..280d21b 100644 --- a/dlls/hlink/hlink.spec +++ b/dlls/hlink/hlink.spec @@ -6,7 +6,7 @@ 8 stdcall HlinkNavigateToStringReference(wstr wstr ptr long ptr long ptr ptr ptr) 9 stdcall HlinkOnNavigate(ptr ptr long ptr wstr wstr ptr) 10 stdcall HlinkNavigate(ptr ptr long ptr ptr ptr) -11 stub HlinkUpdateStackItem +11 stdcall HlinkUpdateStackItem(ptr ptr long wstr wstr) 12 stub HlinkOnRenameDocument 14 stub HlinkResolveMonikerForData 15 stub HlinkResolveStringForData diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index a786b62..69e3cef 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -337,6 +337,14 @@ HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTra return E_NOTIMPL; } +HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *pihlframe, IHlinkBrowseContext *pihlbc, + ULONG uHLID, IMoniker *pimkTrgt, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) +{ + FIXME("(%p %p %u %p %s %s)\n", pihlframe, pihlbc, uHLID, pimkTrgt, debugstr_w(pwzLocation), + debugstr_w(pwzFriendlyName)); + return E_NOTIMPL; +} + static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) {

1 0

Jacek Caban : hlink: Move common includes and function declarations to header file.
by Alexandre Julliard 21 Nov '07

21 Nov '07

Module: wine Branch: master Commit: 59873a3748cb786fc74b26039e8375df6ac1b854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59873a3748cb786fc74b26039… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 02:13:36 2007 +0100 hlink: Move common includes and function declarations to header file. --- dlls/hlink/browse_ctx.c | 13 +------------ dlls/hlink/hlink_main.c | 16 ++-------------- dlls/hlink/hlink_private.h | 31 +++++++++++++++++++++++++++++++ dlls/hlink/link.c | 15 ++------------- 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index f36fd2f..bd9b6fc 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -18,20 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "unknwn.h" -#include "objidl.h" +#include "hlink_private.h" #include "wine/debug.h" -#include "hlink.h" WINE_DEFAULT_DEBUG_CHANNEL(hlink); diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 69e3cef..a68585f 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -18,28 +18,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#include "hlink_private.h" -#define COBJMACROS - -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #include "winreg.h" -#include "ole2.h" -#include "unknwn.h" +#include "hlguids.h" #include "wine/debug.h" #include "wine/unicode.h" -#include "hlink.h" -#include "hlguids.h" WINE_DEFAULT_DEBUG_CHANNEL(hlink); -extern HRESULT WINAPI HLink_Constructor(IUnknown *, REFIID, LPVOID*); -extern HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown *, REFIID, LPVOID*); - typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown*, REFIID, LPVOID*); typedef struct diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h new file mode 100644 index 0000000..0a765be --- /dev/null +++ b/dlls/hlink/hlink_private.h @@ -0,0 +1,31 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "hlink.h" + +extern HRESULT WINAPI HLink_Constructor(IUnknown*,REFIID,void**); +extern HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**); diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index c450951..e1eb6f9 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -18,25 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> +#include "hlink_private.h" -#define COBJMACROS - -#include "winerror.h" -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "unknwn.h" -#include "objidl.h" #include "shellapi.h" +#include "hlguids.h" #include "wine/debug.h" #include "wine/unicode.h" -#include "hlink.h" -#include "hlguids.h" - WINE_DEFAULT_DEBUG_CHANNEL(hlink); #define HLINK_SAVE_MAGIC 0x00000002

1 0