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

Rico Schüller : d3dx9: Fix initialization of D3DXPC_OBJECTs.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 55a4be12f85caa5b12f35845e24500cebc158431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a4be12f85caa5b12f35845e… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 24 09:51:39 2013 +0200 d3dx9: Fix initialization of D3DXPC_OBJECTs. --- dlls/d3dx9_36/effect.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 30ed36c..777a429 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4637,15 +4637,31 @@ static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char * if (size) { - value = HeapAlloc(GetProcessHeap(), 0, size); + value = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (!value) { ERR("Failed to allocate data memory.\n"); return E_OUTOFMEMORY; } - TRACE("Data: %s.\n", debugstr_an(ptr, size)); - memcpy(value, ptr, size); + switch(param->class) + { + case D3DXPC_OBJECT: + break; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + case D3DXPC_MATRIX_COLUMNS: + case D3DXPC_STRUCT: + TRACE("Data: %s.\n", debugstr_an(ptr, size)); + memcpy(value, ptr, size); + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } } hr = d3dx9_parse_value(param, value, data, &ptr, objects);

1 0

Hans Leidekker : msi: Add support for the hyperlink control.
by Alexandre Julliard July 27, 2013

July 27, 2013

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

Jacek Caban : mshtml: Use proper window in set_moniker when invoked on frame or iframe.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 99af1ee34c9350a30c4473e7c6635edc6dd2fbdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=99af1ee34c9350a30c4473e7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 25 14:15:54 2013 +0200 mshtml: Use proper window in set_moniker when invoked on frame or iframe. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/navigate.c | 5 ++- dlls/mshtml/persist.c | 62 ++++++++++++++++++++++++++++------------------- 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 63ac1ae..392713b 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -110,7 +110,7 @@ nsresult on_start_uri_open(NSContainer*,nsIURI*,cpp_bool*) DECLSPEC_HIDDEN; HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN; HRESULT create_doc_uri(HTMLOuterWindow*,IUri*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; -HRESULT set_moniker(HTMLDocument*,IMoniker*,IUri*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; +HRESULT set_moniker(HTMLOuterWindow*,IMoniker*,IUri*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 5661308..fb639a8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1132,7 +1132,7 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) WARN("OnStopRequest failed: %08x\n", nsres); } - if(This->nschannel->load_group) { + if(This->nschannel && This->nschannel->load_group) { nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, NULL, request_result); if(NS_FAILED(nsres)) @@ -1759,6 +1759,7 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, ret->bsc.post_data_len = post_data_size; } + TRACE("created %p\n", ret); *retval = ret; return S_OK; } @@ -1954,7 +1955,7 @@ static void navigate_proc(task_t *_task) navigate_task_t *task = (navigate_task_t*)_task; HRESULT hres; - hres = set_moniker(&task->window->doc_obj->basedoc, task->mon, task->uri, NULL, task->bscallback, TRUE); + hres = set_moniker(task->window, task->mon, task->uri, NULL, task->bscallback, TRUE); if(SUCCEEDED(hres)) { set_current_mon(task->window, task->bscallback->bsc.mon, task->flags); set_current_uri(task->window, task->uri); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 0038942..8f36c75 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -349,15 +349,20 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, DWORD flags) } } -HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IUri *nav_uri, IBindCtx *pibc, nsChannelBSC *async_bsc, BOOL set_download) +HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBindCtx *pibc, nsChannelBSC *async_bsc, + BOOL set_download) { download_proc_task_t *download_task; + HTMLDocumentObj *doc_obj = NULL; nsChannelBSC *bscallback; nsWineURI *nsuri; LPOLESTR url; IUri *uri; HRESULT hres; + if(window->doc_obj && window->doc_obj->basedoc.window == window) + doc_obj = window->doc_obj; + hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); if(FAILED(hres)) { WARN("GetDiaplayName failed: %08x\n", hres); @@ -376,9 +381,9 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IUri *nav_uri, IBindCtx * TRACE("got url: %s\n", debugstr_w(url)); - set_ready_state(This->window, READYSTATE_LOADING); + set_ready_state(window, READYSTATE_LOADING); - hres = create_doc_uri(This->window, uri, &nsuri); + hres = create_doc_uri(window, uri, &nsuri); if(!nav_uri) IUri_Release(uri); if(SUCCEEDED(hres)) { @@ -389,13 +394,16 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IUri *nav_uri, IBindCtx * } if(SUCCEEDED(hres)) { - remove_target_tasks(This->task_magic); - abort_window_bindings(This->window->base.inner_window); + if(window->base.inner_window->doc) + remove_target_tasks(window->base.inner_window->task_magic); + abort_window_bindings(window->base.inner_window); - hres = load_nsuri(This->window, nsuri, bscallback, LOAD_FLAGS_BYPASS_CACHE); + hres = load_nsuri(window, nsuri, bscallback, LOAD_FLAGS_BYPASS_CACHE); nsISupports_Release((nsISupports*)nsuri); /* FIXME */ - if(SUCCEEDED(hres)) - hres = create_pending_window(This->window, bscallback); + if(SUCCEEDED(hres)) { + hres = create_pending_window(window, bscallback); + TRACE("pending window for %p %p %p\n", window, bscallback, window->pending_window); + } if(bscallback != async_bsc) IBindStatusCallback_Release(&bscallback->bsc.IBindStatusCallback_iface); } @@ -405,25 +413,29 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IUri *nav_uri, IBindCtx * return hres; } - HTMLDocument_LockContainer(This->doc_obj, TRUE); + if(doc_obj) { + HTMLDocument_LockContainer(doc_obj, TRUE); - if(This->doc_obj->frame) { - docobj_task_t *task; + if(doc_obj->frame) { + docobj_task_t *task; - task = heap_alloc(sizeof(docobj_task_t)); - task->doc = This->doc_obj; - hres = push_task(&task->header, set_progress_proc, NULL, This->doc_obj->basedoc.task_magic); - if(FAILED(hres)) { - CoTaskMemFree(url); - return hres; + task = heap_alloc(sizeof(docobj_task_t)); + task->doc = doc_obj; + hres = push_task(&task->header, set_progress_proc, NULL, doc_obj->basedoc.task_magic); + if(FAILED(hres)) { + CoTaskMemFree(url); + return hres; + } } + + download_task = heap_alloc(sizeof(download_proc_task_t)); + download_task->doc = doc_obj; + download_task->set_download = set_download; + download_task->url = url; + return push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, doc_obj->basedoc.task_magic); } - download_task = heap_alloc(sizeof(download_proc_task_t)); - download_task->doc = This->doc_obj; - download_task->set_download = set_download; - download_task->url = url; - return push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, This->doc_obj->basedoc.task_magic); + return S_OK; } void set_ready_state(HTMLOuterWindow *window, READYSTATE readystate) @@ -562,7 +574,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva prepare_for_binding(This, pimkName, FALSE); call_docview_84(This->doc_obj); - hres = set_moniker(This, pimkName, NULL, pibc, NULL, TRUE); + hres = set_moniker(This->window, pimkName, NULL, pibc, NULL, TRUE); if(FAILED(hres)) return hres; @@ -831,7 +843,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM } prepare_for_binding(This, mon, FALSE); - hres = set_moniker(This, mon, NULL, NULL, NULL, TRUE); + hres = set_moniker(This->window, mon, NULL, NULL, NULL, TRUE); IMoniker_Release(mon); if(FAILED(hres)) return hres; @@ -888,7 +900,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) } prepare_for_binding(This, mon, FALSE); - hres = set_moniker(This, mon, NULL, NULL, NULL, FALSE); + hres = set_moniker(This->window, mon, NULL, NULL, NULL, FALSE); IMoniker_Release(mon); if(FAILED(hres)) return hres;

1 0

Ken Thomases : user32: Remove dead code for suppressing menu drawing.
by Alexandre Julliard July 27, 2013

July 27, 2013

Module: wine Branch: master Commit: 029aec19ff7676433b61896699fe452aad72f0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=029aec19ff7676433b6189669… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 24 17:35:50 2013 -0500 user32: Remove dead code for suppressing menu drawing. --- dlls/user32/controls.h | 3 +-- dlls/user32/menu.c | 19 ++----------------- dlls/user32/nonclient.c | 8 ++++---- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index e168f16..32e9815 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -160,8 +160,7 @@ extern UINT MENU_GetMenuBarHeight( HWND hwnd, UINT menubarWidth, extern BOOL MENU_SetMenu(HWND, HMENU) DECLSPEC_HIDDEN; extern void MENU_TrackMouseMenuBar( HWND hwnd, INT ht, POINT pt ) DECLSPEC_HIDDEN; extern void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar ) DECLSPEC_HIDDEN; -extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, - HWND hwnd, BOOL suppress_draw ) DECLSPEC_HIDDEN; +extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) DECLSPEC_HIDDEN; extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; /* nonclient area */ diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index f39ae7c..73b20b9 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1801,11 +1801,9 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) * Paint a menu bar. Returns the height of the menu bar. * called from [windows/nonclient.c] */ -UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd, - BOOL suppress_draw) +UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) { LPPOPUPMENU lppop; - HFONT hfontOld = 0; HMENU hMenu = GetMenu(hwnd); lppop = MENU_GetMenu( hMenu ); @@ -1814,20 +1812,7 @@ UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd, return GetSystemMetrics(SM_CYMENU); } - if (suppress_draw) - { - hfontOld = SelectObject( hDC, get_menu_font(FALSE)); - - if (lppop->Height == 0) - MENU_MenuBarCalcSize(hDC, lprect, lppop, hwnd); - - lprect->bottom = lprect->top + lppop->Height; - - if (hfontOld) SelectObject( hDC, hfontOld); - return lppop->Height; - } - else - return DrawMenuBarTemp(hwnd, hDC, lprect, hMenu, NULL); + return DrawMenuBarTemp(hwnd, hDC, lprect, hMenu, NULL); } diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 050af90..da9c6bd 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -980,7 +980,7 @@ static void NC_DrawCaption( HDC hdc, RECT *rect, HWND hwnd, DWORD style, * * Paint the non-client area for windows. */ -static void NC_DoNCPaint( HWND hwnd, HRGN clip, BOOL suppress_menupaint ) +static void NC_DoNCPaint( HWND hwnd, HRGN clip ) { HDC hdc; RECT rfuzz, rect, rectClip; @@ -1062,7 +1062,7 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip, BOOL suppress_menupaint ) TRACE("Calling DrawMenuBar with rect (%s)\n", wine_dbgstr_rect(&r)); - rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1; + rect.top += MENU_DrawMenuBar( hdc, &r, hwnd ) + 1; } TRACE("After MenuBar, rect is (%s).\n", wine_dbgstr_rect(&rect)); @@ -1109,7 +1109,7 @@ LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) if( dwStyle & WS_MINIMIZE ) WINPOS_RedrawIconTitle( hwnd ); else - NC_DoNCPaint( hwnd, clip, FALSE ); + NC_DoNCPaint( hwnd, clip ); } return 0; } @@ -1143,7 +1143,7 @@ LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) if (IsIconic(hwnd)) WINPOS_RedrawIconTitle( hwnd ); else - NC_DoNCPaint( hwnd, (HRGN)1, FALSE ); + NC_DoNCPaint( hwnd, (HRGN)1 ); } return TRUE;

1 0

Lucas Zawacki : Portuguese translation for release 1.6-rc5
by Jeremy Newman July 25, 2013

July 25, 2013

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-rc4
by Jeremy Newman July 25, 2013

July 25, 2013

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
by Jeremy Newman July 25, 2013

July 25, 2013

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 : msvcrt: Add _mktemp_s implementation.
by Alexandre Julliard July 24, 2013

July 24, 2013

Module: wine Branch: master Commit: 7d41f9b3e90943f2112bd986ec5f70781af3125c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d41f9b3e90943f2112bd986e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 24 12:20:42 2013 +0200 msvcrt: Add _mktemp_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- include/msvcrt/io.h | 1 + 7 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9479d5e..9012225 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1204,7 +1204,7 @@ @ cdecl _mkgmtime32(ptr) msvcrt._mkgmtime32 @ cdecl _mkgmtime64(ptr) msvcrt._mkgmtime64 @ cdecl _mktemp(str) msvcrt._mktemp -@ stub _mktemp_s +@ cdecl _mktemp_s(str long) msvcrt._mktemp_s @ cdecl _mktime32(ptr) msvcrt._mktime32 @ cdecl _mktime64(ptr) msvcrt._mktime64 @ cdecl _msize(ptr) msvcrt._msize diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b83bfe0..ad6d159 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1566,7 +1566,7 @@ @ cdecl _mkgmtime32(ptr) msvcrt._mkgmtime32 @ cdecl _mkgmtime64(ptr) msvcrt._mkgmtime64 @ cdecl _mktemp(str) msvcrt._mktemp -@ stub _mktemp_s +@ cdecl _mktemp_s(str long) msvcrt._mktemp_s @ cdecl _mktime32(ptr) msvcrt._mktime32 @ cdecl _mktime64(ptr) msvcrt._mktime64 @ cdecl _msize(ptr) msvcrt._msize diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b8118a9..59ee88d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -875,7 +875,7 @@ @ cdecl _mkgmtime32(ptr) msvcrt._mkgmtime32 @ cdecl _mkgmtime64(ptr) msvcrt._mkgmtime64 @ cdecl _mktemp(str) msvcrt._mktemp -@ stub _mktemp_s +@ cdecl _mktemp_s(str long) msvcrt._mktemp_s @ cdecl _mktime32(ptr) msvcrt._mktime32 @ cdecl _mktime64(ptr) msvcrt._mktime64 @ cdecl _msize(ptr) msvcrt._msize diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8467b91..5d2ebf6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -853,7 +853,7 @@ @ cdecl _mkgmtime32(ptr) msvcrt._mkgmtime32 @ cdecl _mkgmtime64(ptr) msvcrt._mkgmtime64 @ cdecl _mktemp(str) msvcrt._mktemp -@ stub _mktemp_s +@ cdecl _mktemp_s(str long) msvcrt._mktemp_s @ cdecl _mktime32(ptr) msvcrt._mktime32 @ cdecl _mktime64(ptr) msvcrt._mktime64 @ cdecl _msize(ptr) msvcrt._msize diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index a07e940..35e2c00 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1682,6 +1682,45 @@ MSVCRT_intptr_t CDECL MSVCRT__get_osfhandle(int fd) } /********************************************************************* + * _mktemp_s (MSVCRT.@) + */ +int CDECL MSVCRT__mktemp_s(char *pattern, MSVCRT_size_t size) +{ + DWORD len, xno, id; + + if(!MSVCRT_CHECK_PMT(pattern!=NULL)) + return MSVCRT_EINVAL; + + for(len=0; len<size; len++) + if(!pattern[len]) + break; + if(!MSVCRT_CHECK_PMT(len!=size && len>=6)) { + if(size) + pattern[0] = 0; + return MSVCRT_EINVAL; + } + + for(xno=1; xno<=6; xno++) + if(!MSVCRT_CHECK_PMT(pattern[len-xno] == 'X')) + return MSVCRT_EINVAL; + + id = GetCurrentProcessId(); + for(xno=1; xno<6; xno++) { + pattern[len-xno] = id%10 + '0'; + id /= 10; + } + + for(pattern[len-6]='a'; pattern[len-6]<='z'; pattern[len-6]++) { + if(GetFileAttributesA(pattern) == INVALID_FILE_ATTRIBUTES) + return 0; + } + + pattern[0] = 0; + *MSVCRT__errno() = MSVCRT_EEXIST; + return MSVCRT_EEXIST; +} + +/********************************************************************* * _mktemp (MSVCRT.@) */ char * CDECL MSVCRT__mktemp(char *pattern) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e12d87f..e566440 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -830,7 +830,7 @@ @ cdecl _mkgmtime32(ptr) MSVCRT__mkgmtime32 @ cdecl _mkgmtime64(ptr) MSVCRT__mkgmtime64 @ cdecl _mktemp(str) MSVCRT__mktemp -# stub _mktemp_s(str long) +@ cdecl _mktemp_s(str long) MSVCRT__mktemp_s @ cdecl _mktime32(ptr) MSVCRT__mktime32 @ cdecl _mktime64(ptr) MSVCRT__mktime64 @ cdecl _msize(ptr) diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h index ad5c507..09b615c 100644 --- a/include/msvcrt/io.h +++ b/include/msvcrt/io.h @@ -108,6 +108,7 @@ int __cdecl _locking(int,int,__msvcrt_long); __msvcrt_long __cdecl _lseek(int,__msvcrt_long,int); __int64 __cdecl _lseeki64(int,__int64,int); char* __cdecl _mktemp(char*); +int __cdecl _mktemp_s(char*,size_t); int __cdecl _open(const char*,int,...); int __cdecl _open_osfhandle(intptr_t,int); int __cdecl _pipe(int*,unsigned int,int);

1 0

Piotr Caban : scrrun: Add IFileSystem3::GetFileName implementation.
by Alexandre Julliard July 24, 2013

July 24, 2013

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::GetParentFolderName implementation.
by Alexandre Julliard July 24, 2013

July 24, 2013

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