July 2013 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Add support for the hyperlink control.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 3169db2b5423c3a4a3710138b738fc7194389a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3169db2b5423c3a4a3710138b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 17:18:57 2013 +0200 msi: Add support for the hyperlink control. --- dlls/msi/dialog.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 662d09a..80e2d68 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -39,6 +39,7 @@ #include "winreg.h" #include "shlwapi.h" #include "msiserver.h" +#include "shellapi.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -144,6 +145,7 @@ static const WCHAR szVolumeSelectCombo[] = { 'V','o','l','u','m','e','S','e','l' static const WCHAR szSelectionDescription[] = {'S','e','l','e','c','t','i','o','n','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; static const WCHAR szProperty[] = {'P','r','o','p','e','r','t','y',0}; +static const WCHAR szHyperLink[] = {'H','y','p','e','r','L','i','n','k',0}; /* dialog sequencing */ @@ -3306,6 +3308,80 @@ static UINT msi_dialog_volumeselect_combo( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +static UINT msi_dialog_hyperlink_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +{ + static const WCHAR hrefW[] = {'h','r','e','f'}; + static const WCHAR openW[] = {'o','p','e','n',0}; + int len, len_href = sizeof(hrefW) / sizeof(hrefW[0]); + const WCHAR *p, *q; + WCHAR quote = 0; + LITEM item; + + item.mask = LIF_ITEMINDEX | LIF_URL; + item.iLink = 0; + item.szUrl[0] = 0; + + SendMessageW( control->hwnd, LM_GETITEM, 0, (LPARAM)&item ); + + p = item.szUrl; + while (*p && *p != '<') p++; + if (!*p++) return ERROR_SUCCESS; + if (toupperW( *p++ ) != 'A' || !isspaceW( *p++ )) return ERROR_SUCCESS; + while (*p && isspaceW( *p )) p++; + + len = strlenW( p ); + if (len > len_href && !memicmpW( p, hrefW, len_href )) + { + p += len_href; + while (*p && isspaceW( *p )) p++; + if (!*p || *p++ != '=') return ERROR_SUCCESS; + while (*p && isspaceW( *p )) p++; + + if (*p == '\"' || *p == '\'') quote = *p++; + q = p; + if (quote) + { + while (*q && *q != quote) q++; + if (*q != quote) return ERROR_SUCCESS; + } + else + { + while (*q && *q != '>' && !isspaceW( *q )) q++; + if (!*q) return ERROR_SUCCESS; + } + item.szUrl[q - item.szUrl] = 0; + ShellExecuteW( NULL, openW, p, NULL, NULL, SW_SHOWNORMAL ); + } + return ERROR_SUCCESS; +} + +static UINT msi_dialog_hyperlink( msi_dialog *dialog, MSIRECORD *rec ) +{ + msi_control *control; + DWORD style = WS_CHILD | WS_TABSTOP | WS_GROUP; + const WCHAR *text = MSI_RecordGetString( rec, 10 ); + int len = strlenW( text ); + LITEM item; + + control = msi_dialog_add_control( dialog, rec, WC_LINK, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + + control->attributes = MSI_RecordGetInteger( rec, 8 ); + control->handler = msi_dialog_hyperlink_handler; + + item.mask = LIF_ITEMINDEX | LIF_STATE | LIF_URL; + item.iLink = 0; + item.state = LIS_ENABLED; + item.stateMask = LIS_ENABLED; + if (len < L_MAX_URL_LENGTH) strcpyW( item.szUrl, text ); + else item.szUrl[0] = 0; + + SendMessageW( control->hwnd, LM_SETITEM, 0, (LPARAM)&item ); + + return ERROR_SUCCESS; +} + static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, @@ -3328,6 +3404,7 @@ static const struct control_handler msi_dialog_handler[] = { szDirectoryList, msi_dialog_directory_list }, { szVolumeCostList, msi_dialog_volumecost_list }, { szVolumeSelectCombo, msi_dialog_volumeselect_combo }, + { szHyperLink, msi_dialog_hyperlink } }; #define NUM_CONTROL_TYPES (sizeof msi_dialog_handler/sizeof msi_dialog_handler[0])

1 0

Hans Leidekker : msi: Merge events.c into dialog.c.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: ec7650908afcccd354b8e4450a31fda63d9cde45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7650908afcccd354b8e4450… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 17:19:34 2013 +0200 msi: Merge events.c into dialog.c. --- dlls/msi/Makefile.in | 1 - dlls/msi/dialog.c | 573 ++++++++++++++++++++++++++++++++++++++++---------- dlls/msi/events.c | 449 --------------------------------------- dlls/msi/msipriv.h | 17 +-- dlls/msi/package.c | 10 +- 5 files changed, 466 insertions(+), 584 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec7650908afcccd354b8e…

1 0

Hans Leidekker : msi: Subscribe to all control events instead of just the first.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: 4759dcc3c1f24b19ef08adce48656d9d148bab8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4759dcc3c1f24b19ef08adce4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 17:20:04 2013 +0200 msi: Subscribe to all control events instead of just the first. --- dlls/msi/dialog.c | 46 ++++++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 943b631..1e02467 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -735,27 +735,41 @@ static void event_subscribe( msi_dialog *dialog, const WCHAR *event, const WCHAR list_add_tail( &dialog->package->subscriptions, &sub->entry ); } +struct dialog_control +{ + msi_dialog *dialog; + const WCHAR *control; +}; + +static UINT map_event( MSIRECORD *row, void *param ) +{ + struct dialog_control *dc = param; + const WCHAR *event = MSI_RecordGetString( row, 3 ); + const WCHAR *attribute = MSI_RecordGetString( row, 4 ); + + event_subscribe( dc->dialog, event, dc->control, attribute ); + return ERROR_SUCCESS; +} + static void dialog_map_events( msi_dialog *dialog, const WCHAR *control ) { - static const WCHAR Query[] = { - 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','E','v','e','n','t','M','a','p','p','i','n','g','`',' ', - 'W','H','E','R','E',' ', - '`','D','i','a','l','o','g','_','`',' ','=',' ','\'','%','s','\'',' ', - 'A','N','D',' ', - '`','C','o','n','t','r','o','l','_','`',' ','=',' ','\'','%','s','\'',0 + 'W','H','E','R','E',' ','`','D','i','a','l','o','g','_','`',' ','=',' ','\'','%','s','\'',' ', + 'A','N','D',' ','`','C','o','n','t','r','o','l','_','`',' ','=',' ','\'','%','s','\'',0}; + MSIQUERY *view; + struct dialog_control dialog_control = + { + dialog, + control }; - MSIRECORD *row; - LPCWSTR event, attribute; - row = MSI_QueryGetRecord( dialog->package->db, Query, dialog->name, control ); - if (!row) - return; - - event = MSI_RecordGetString( row, 3 ); - attribute = MSI_RecordGetString( row, 4 ); - event_subscribe( dialog, event, control, attribute ); - msiobj_release( &row->hdr ); + if (!MSI_OpenQuery( dialog->package->db, &view, queryW, dialog->name, control )) + { + MSI_IterateRecords( view, NULL, map_event, &dialog_control ); + msiobj_release( &view->hdr ); + } } /* everything except radio buttons */

1 0

Hans Leidekker : msi: Format text set by means of a control event.
by Alexandre Julliard 27 Jul '13

27 Jul '13

Module: wine Branch: master Commit: fdf8ab11d9a2886d5a5e8c04f71c9619dceecfef URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf8ab11d9a2886d5a5e8c04f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 26 17:20:39 2013 +0200 msi: Format text set by means of a control event. --- dlls/msi/dialog.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1e02467..5a7cbe7 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -621,19 +621,25 @@ static void dialog_handle_event( msi_dialog *dialog, const WCHAR *control, const WCHAR *attribute, MSIRECORD *rec ) { msi_control* ctrl; - LPCWSTR font_text, text = NULL; - LPWSTR font; ctrl = msi_dialog_find_control( dialog, control ); if (!ctrl) return; if( !strcmpW( attribute, szText ) ) { + const WCHAR *font_text, *text = NULL; + WCHAR *font, *text_fmt = NULL; + font_text = MSI_RecordGetString( rec , 1 ); font = msi_dialog_get_style( font_text, &text ); - if (!text) text = szEmpty; + deformat_string( dialog->package, text, &text_fmt ); + if (text_fmt) text = text_fmt; + else text = szEmpty; + SetWindowTextW( ctrl->hwnd, text ); + msi_free( font ); + msi_free( text_fmt ); msi_dialog_check_messages( NULL ); } else if( !strcmpW( attribute, szProgress ) )

1 0

Lucas Zawacki : Portuguese translation for release 1.6-rc4
by Jeremy Newman 25 Jul '13

25 Jul '13

Module: website Branch: master Commit: fae365a245ea1ac713b35df1b8725488c9121683 URL: http://source.winehq.org/git/website.git/?a=commit;h=fae365a245ea1ac713b35d… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed Jul 24 01:17:01 2013 -0300 Portuguese translation for release 1.6-rc4 --- news/pt/2013062801.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pt/2013062801.xml b/news/pt/2013062801.xml new file mode 100644 index 0000000..1276ac0 --- /dev/null +++ b/news/pt/2013062801.xml @@ -0,0 +1,12 @@ +<news> +<date>28 de Junho de 2013</date> +<title>Wine 1.6-rc4 lançado</title> +<body> + A versão de desenvolvimento 1.6-rc4 já está disponível. + <a href="{$root}/announce/1.6-rc4">Novidades</a> nesta versão: +<ul> + <li>Apenas correções de bugs, o código está congelado.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.6-rc4.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.6-rc5
by Jeremy Newman 25 Jul '13

25 Jul '13

Module: website Branch: master Commit: 4f090d7102a015888a6d02c0a2bbc71568feec61 URL: http://source.winehq.org/git/website.git/?a=commit;h=4f090d7102a015888a6d02… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed Jul 24 01:17:02 2013 -0300 Portuguese translation for release 1.6-rc5 --- news/pt/2013071201.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pt/2013071201.xml b/news/pt/2013071201.xml new file mode 100644 index 0000000..a304368 --- /dev/null +++ b/news/pt/2013071201.xml @@ -0,0 +1,12 @@ +<news> +<date>12 de Julho de 2013</date> +<title>Wine 1.6-rc5 lançado</title> +<body> + A versão de desenvolvimento 1.6-rc5 já está disponível. + <a href="{$root}/announce/1.6-rc5">Novidades</a> nesta versão: +<ul> + <li>Apenas correções de bugs, o código está congelado.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.6-rc5.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.6
by Jeremy Newman 25 Jul '13

25 Jul '13

Module: website Branch: master Commit: 7e86c031addd48048d2cb454aa06d5ff979cac2c URL: http://source.winehq.org/git/website.git/?a=commit;h=7e86c031addd48048d2cb4… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Wed Jul 24 01:17:03 2013 -0300 Portuguese translation for release 1.6 --- news/pt/2013071801.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/news/pt/2013071801.xml b/news/pt/2013071801.xml new file mode 100644 index 0000000..03b48f1 --- /dev/null +++ b/news/pt/2013071801.xml @@ -0,0 +1,10 @@ +<news> +<date>18 de Julho de 2013</date> +<title>Wine 1.6 lançado</title> +<body> + O time do Wine se orgulha ao anunciar que a versão estável Wine 1.6 já está disponível. + Esta versão representa 16 meses de desenvolvimento e aproximadamente 10,000 mudanças individuais. Os principais destaques são o novo driver para Mac, suporte completo para transparência de janelas e novo pacote Mono para suporte a aplicativos .NET. + Ela também contém diversas melhorias em todas as áreas, bem como suporte a diversos novos aplicativos e jogos. Leia as <a href="{$root}/announce/1.6">notas de lançamento</a> para um resumo das maiores mudanças. +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Piotr Caban : scrrun: Add IFileSystem3::GetParentFolderName implementation.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: d51a35c565ca4e39faa4eb2999d7c54878a43405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51a35c565ca4e39faa4eb299… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 23 18:50:46 2013 +0200 scrrun: Add IFileSystem3::GetParentFolderName implementation. --- dlls/scrrun/filesystem.c | 45 +++++++++++++++++++++++++++++++++++- dlls/scrrun/tests/filesystem.c | 49 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4f0b163..6af8123 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -728,12 +728,53 @@ static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR Path, return E_NOTIMPL; } +static inline DWORD get_parent_folder_name(const WCHAR *path, DWORD len) +{ + int i; + + if(!path) + return 0; + + for(i=len-1; i>=0; i--) + if(path[i]!='/' && path[i]!='\\') + break; + + for(; i>=0; i--) + if(path[i]=='/' || path[i]=='\\') + break; + + for(; i>=0; i--) + if(path[i]!='/' && path[i]!='\\') + break; + + if(i < 0) + return 0; + + if(path[i]==':' && i==1) + i++; + return i+1; +} + static HRESULT WINAPI filesys_GetParentFolderName(IFileSystem3 *iface, BSTR Path, BSTR *pbstrResult) { - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + DWORD len; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + + if(!pbstrResult) + return E_POINTER; + + len = get_parent_folder_name(Path, SysStringLen(Path)); + if(!len) { + *pbstrResult = NULL; + return S_OK; + } + + *pbstrResult = SysAllocStringLen(Path, len); + if(!*pbstrResult) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI filesys_GetFileName(IFileSystem3 *iface, BSTR Path, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b93927c..3f0f959 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -254,6 +254,54 @@ static void test_GetFileVersion(void) SysFreeString(path); } +static void test_GetParentFolderName(void) +{ + static const WCHAR path1[] = {'a',0}; + static const WCHAR path2[] = {'a','/','a','/','a',0}; + static const WCHAR path3[] = {'a','\\','a','\\','a',0}; + static const WCHAR path4[] = {'a','/','a','/','/','\\','\\',0}; + static const WCHAR path5[] = {'c',':','\\','\\','a',0}; + static const WCHAR path6[] = {'a','c',':','\\','a',0}; + static const WCHAR result2[] = {'a','/','a',0}; + static const WCHAR result3[] = {'a','\\','a',0}; + static const WCHAR result4[] = {'a',0}; + static const WCHAR result5[] = {'c',':','\\',0}; + static const WCHAR result6[] = {'a','c',':',0}; + + static const struct { + const WCHAR *path; + const WCHAR *result; + } tests[] = { + {NULL, NULL}, + {path1, NULL}, + {path2, result2}, + {path3, result3}, + {path4, result4}, + {path5, result5}, + {path6, result6} + }; + + BSTR path, result; + HRESULT hr; + int i; + + hr = IFileSystem3_GetParentFolderName(fs3, NULL, NULL); + ok(hr == E_POINTER, "GetParentFolderName returned %x, expected E_POINTER\n", hr); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + result = (BSTR)0xdeadbeef; + path = tests[i].path ? SysAllocString(tests[i].path) : NULL; + hr = IFileSystem3_GetParentFolderName(fs3, path, &result); + ok(hr == S_OK, "%d) GetParentFolderName returned %x, expected S_OK\n", i, hr); + if(!tests[i].result) + ok(!result, "%d) result = %s\n", i, wine_dbgstr_w(result)); + else + ok(!lstrcmpW(result, tests[i].result), "%d) result = %s\n", i, wine_dbgstr_w(result)); + SysFreeString(path); + SysFreeString(result); + } +} + START_TEST(filesystem) { HRESULT hr; @@ -271,6 +319,7 @@ START_TEST(filesystem) test_createfolder(); test_textstream(); test_GetFileVersion(); + test_GetParentFolderName(); IFileSystem3_Release(fs3);

1 0

Piotr Caban : scrrun: Add IFileSystem3::GetFileName implementation.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: fab963cdcc6e8250bd4693c0c574521dd1923258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab963cdcc6e8250bd4693c0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 23 18:50:57 2013 +0200 scrrun: Add IFileSystem3::GetFileName implementation. --- dlls/scrrun/filesystem.c | 31 ++++++++++++++++++++++++++- dlls/scrrun/tests/filesystem.c | 44 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 6af8123..9099951 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -780,9 +780,36 @@ static HRESULT WINAPI filesys_GetParentFolderName(IFileSystem3 *iface, BSTR Path static HRESULT WINAPI filesys_GetFileName(IFileSystem3 *iface, BSTR Path, BSTR *pbstrResult) { - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + int i, end; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + + if(!pbstrResult) + return E_POINTER; + + if(!Path) { + *pbstrResult = NULL; + return S_OK; + } + + for(end=strlenW(Path)-1; end>=0; end--) + if(Path[end]!='/' && Path[end]!='\\') + break; + + for(i=end; i>=0; i--) + if(Path[i]=='/' || Path[i]=='\\') + break; + i++; + + if(i>end || (i==0 && end==1 && Path[1]==':')) { + *pbstrResult = NULL; + return S_OK; + } + + *pbstrResult = SysAllocStringLen(Path+i, end-i+1); + if(!*pbstrResult) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI filesys_GetBaseName(IFileSystem3 *iface, BSTR Path, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 3f0f959..940356f 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -302,6 +302,49 @@ static void test_GetParentFolderName(void) } } +static void test_GetFileName(void) +{ + static const WCHAR path1[] = {'a',0}; + static const WCHAR path2[] = {'a','/','a','.','b',0}; + static const WCHAR path3[] = {'a','\\',0}; + static const WCHAR path4[] = {'c',':',0}; + static const WCHAR path5[] = {'/','\\',0}; + static const WCHAR result2[] = {'a','.','b',0}; + static const WCHAR result3[] = {'a',0}; + + static const struct { + const WCHAR *path; + const WCHAR *result; + } tests[] = { + {NULL, NULL}, + {path1, path1}, + {path2, result2}, + {path3, result3}, + {path4, NULL}, + {path5, NULL} + }; + + BSTR path, result; + HRESULT hr; + int i; + + hr = IFileSystem3_GetFileName(fs3, NULL, NULL); + ok(hr == E_POINTER, "GetFileName returned %x, expected E_POINTER\n", hr); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + result = (BSTR)0xdeadbeef; + path = tests[i].path ? SysAllocString(tests[i].path) : NULL; + hr = IFileSystem3_GetFileName(fs3, path, &result); + ok(hr == S_OK, "%d) GetFileName returned %x, expected S_OK\n", i, hr); + if(!tests[i].result) + ok(!result, "%d) result = %s\n", i, wine_dbgstr_w(result)); + else + ok(!lstrcmpW(result, tests[i].result), "%d) result = %s\n", i, wine_dbgstr_w(result)); + SysFreeString(path); + SysFreeString(result); + } +} + START_TEST(filesystem) { HRESULT hr; @@ -320,6 +363,7 @@ START_TEST(filesystem) test_textstream(); test_GetFileVersion(); test_GetParentFolderName(); + test_GetFileName(); IFileSystem3_Release(fs3);

1 0

Piotr Caban : scrrun: Add IFileSystem3::GetBaseName implementation.
by Alexandre Julliard 24 Jul '13

24 Jul '13

Module: wine Branch: master Commit: dd64952040b64293103f44f068026455c972fa42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd64952040b64293103f44f06… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 23 18:51:05 2013 +0200 scrrun: Add IFileSystem3::GetBaseName implementation. --- dlls/scrrun/filesystem.c | 34 +++++++++++++++++++++++++++- dlls/scrrun/tests/filesystem.c | 47 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 9099951..62bc676 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -815,9 +815,39 @@ static HRESULT WINAPI filesys_GetFileName(IFileSystem3 *iface, BSTR Path, static HRESULT WINAPI filesys_GetBaseName(IFileSystem3 *iface, BSTR Path, BSTR *pbstrResult) { - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + int i, end; - return E_NOTIMPL; + TRACE("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + + if(!pbstrResult) + return E_POINTER; + + if(!Path) { + *pbstrResult = NULL; + return S_OK; + } + + for(end=strlenW(Path)-1; end>=0; end--) + if(Path[end]!='/' && Path[end]!='\\') + break; + + for(i=end; i>=0; i--) { + if(Path[i]=='.' && Path[end+1]!='.') + end = i-1; + if(Path[i]=='/' || Path[i]=='\\') + break; + } + i++; + + if((i>end && Path[end+1]!='.') || (i==0 && end==1 && Path[1]==':')) { + *pbstrResult = NULL; + return S_OK; + } + + *pbstrResult = SysAllocStringLen(Path+i, end-i+1); + if(!*pbstrResult) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI filesys_GetExtensionName(IFileSystem3 *iface, BSTR Path, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 940356f..4cd4e2d 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -345,6 +345,52 @@ static void test_GetFileName(void) } } +static void test_GetBaseName(void) +{ + static const WCHAR path1[] = {'a',0}; + static const WCHAR path2[] = {'a','/','a','.','b','.','c',0}; + static const WCHAR path3[] = {'a','.','b','\\',0}; + static const WCHAR path4[] = {'c',':',0}; + static const WCHAR path5[] = {'/','\\',0}; + static const WCHAR path6[] = {'.','a',0}; + static const WCHAR result1[] = {'a',0}; + static const WCHAR result2[] = {'a','.','b',0}; + static const WCHAR result6[] = {0}; + + static const struct { + const WCHAR *path; + const WCHAR *result; + } tests[] = { + {NULL, NULL}, + {path1, result1}, + {path2, result2}, + {path3, result1}, + {path4, NULL}, + {path5, NULL}, + {path6, result6} + }; + + BSTR path, result; + HRESULT hr; + int i; + + hr = IFileSystem3_GetBaseName(fs3, NULL, NULL); + ok(hr == E_POINTER, "GetBaseName returned %x, expected E_POINTER\n", hr); + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + result = (BSTR)0xdeadbeef; + path = tests[i].path ? SysAllocString(tests[i].path) : NULL; + hr = IFileSystem3_GetBaseName(fs3, path, &result); + ok(hr == S_OK, "%d) GetBaseName returned %x, expected S_OK\n", i, hr); + if(!tests[i].result) + ok(!result, "%d) result = %s\n", i, wine_dbgstr_w(result)); + else + ok(!lstrcmpW(result, tests[i].result), "%d) result = %s\n", i, wine_dbgstr_w(result)); + SysFreeString(path); + SysFreeString(result); + } +} + START_TEST(filesystem) { HRESULT hr; @@ -364,6 +410,7 @@ START_TEST(filesystem) test_GetFileVersion(); test_GetParentFolderName(); test_GetFileName(); + test_GetBaseName(); IFileSystem3_Release(fs3);

1 0