wine-commits February 2012

wine-commits@winehq.org

2 participants
442 discussions

Gustavo Henrique Milaré : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 6b78950079dc95ed96e2f874c5ecdb04b07fae3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b78950079dc95ed96e2f874c… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Feb 9 23:38:56 2012 -0200 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index e4bf0c1..4aaae37 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-31 22:20-0200\n" +"PO-Revision-Date: 2012-02-09 23:08-0200\n" "Last-Translator: Gustavo Henrique Milaré <gugamilare(a)gmail.com>\n" "Language-Team: none\n" "Language: Portuguese (Brazil)\n" @@ -1256,7 +1256,7 @@ msgstr "Confiança Sim ou Não" #: crypt32.rc:43 msgid "Email Address" -msgstr "Endereço de Email" +msgstr "Endereço de E-mail" #: crypt32.rc:44 msgid "Unstructured Name" @@ -2348,7 +2348,7 @@ msgstr "Ba&se64-codificado X.509 (.cer):" #: cryptui.rc:409 msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" -msgstr "Padrão de Sintaxe de Mensagem &Criptográfica/PKCS #7 Message (.p7b)" +msgstr "Padrão de Sintaxe de Mensagem &Criptográfica/PKCS #7 Mensagem (.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" @@ -4333,7 +4333,7 @@ msgstr "Overlapped E/S incompleto\n" #: winerror.mc:1006 msgid "Overlapped I/O pending\n" -msgstr "Overlapped E/S pendente\n" +msgstr "E/S sobreposta pendente\n" #: winerror.mc:1011 msgid "No access to memory location\n" @@ -6696,7 +6696,7 @@ msgstr "" "\t/uninstall {pacote|códigodoproduto} [propriedade]\n" "\t/x {pacote|códigodoproduto} [propriedade]\n" "Anunciar um produto:\n" -"\t/j[u|m] pacote [/t transform] [/g languageid]\n" +"\t/j[u|m] pacote [/t transformação] [/g idlinguagem]\n" "Aplicar um patch:\n" "\t/p pacotedepatch [propriedade]\n" "\t/p pacotedepatch /a pacote [propriedade]\n" @@ -10067,7 +10067,7 @@ msgstr "Broadcast" #: ipconfig.rc:37 msgid "Peer-to-peer" -msgstr "Ponto-a-ponto" +msgstr "Ponto a ponto" #: ipconfig.rc:38 msgid "Mixed" @@ -10350,7 +10350,7 @@ msgstr "F" #: notepad.rc:132 wordpad.rc:277 msgctxt "accelerator Replace" msgid "H" -msgstr "" +msgstr "H" #: notepad.rc:133 wordpad.rc:286 msgctxt "accelerator New" @@ -10673,7 +10673,7 @@ msgstr "Libertar a instância de objeto selecionada" #: oleview.rc:111 msgid "Copy the GUID of the currently selected item to the clipboard" -msgstr "Copiar a GUID do objecto selecionado para a àrea de transferência" +msgstr "Copiar a GUID do objeto selecionado para a área de transferência" #: oleview.rc:112 msgid "Display the viewer for the selected item"

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 70c005705a76140338166acee1f0bc353b3ecea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c005705a76140338166acee… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 9 16:32:44 2012 -0700 po: Update Catalan translation. --- po/ca.po | 202 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 100 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70c005705a76140338166…

1 0

Alexandre Julliard : dbgeng: Add missing WINAPI.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 416344b938e4597ccfb1832ceb388f1662455109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=416344b938e4597ccfb1832ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 11 15:26:38 2012 +0100 dbgeng: Add missing WINAPI. --- dlls/dbgeng/dbgeng.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index cab118f..b08be75 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -94,7 +94,7 @@ HRESULT WINAPI DebugCreate(REFIID InterfaceId, PVOID * pInterface) * BUGS * Unimplemented */ -HRESULT DebugConnect(PCSTR RemoteOptions, REFIID InterfaceId, PVOID * pInterface) +HRESULT WINAPI DebugConnect(PCSTR RemoteOptions, REFIID InterfaceId, PVOID * pInterface) { FIXME("(%p,%p,%p): stub\n", RemoteOptions, InterfaceId, pInterface);

1 0

André Hentschel : mshtml: Only release the interface if it exists.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 3950721c2d2ee70366d67370dd5930c1031867c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3950721c2d2ee70366d67370d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 10 19:40:59 2012 +0100 mshtml: Only release the interface if it exists. --- dlls/mshtml/persist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index f131062..2e69902 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -268,7 +268,7 @@ static void set_downloading_proc(task_t *_task) IDropTarget *drop_target = NULL; hres = IDocHostUIHandler_GetDropTarget(doc->hostui, NULL /* FIXME */, &drop_target); - if(SUCCEEDED(hres)) { + if(SUCCEEDED(hres) && drop_target) { FIXME("Use IDropTarget\n"); IDropTarget_Release(drop_target); }

1 0

Jörg Höhle : mmdevapi/tests: Perform renderer padding & position tests.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: fde979b8b5f5aa36e65d2ebda3987a03fdbe3596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde979b8b5f5aa36e65d2ebda… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 8 16:38:47 2012 +0100 mmdevapi/tests: Perform renderer padding & position tests. --- dlls/mmdevapi/tests/render.c | 464 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 435 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fde979b8b5f5aa36e65d2…

1 0

Eric Pouech : winedbg: Let the lexer accept char definitions as integral values.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 45aa67b30aafc533536d2734c3a946f078ff2e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=45aa67b30aafc533536d2734c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Feb 11 11:36:21 2012 +0100 winedbg: Let the lexer accept char definitions as integral values. --- programs/winedbg/debug.l | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index a12b637..30c8aea 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -113,6 +113,7 @@ static int read_input(const char* pfx, char* buf, int size) static int syntax_error; %} +OCTDIGIT [0-7] DIGIT [0-9] HEXDIGIT [0-9a-fA-F] FORMAT [ubcdgiswxa] @@ -157,6 +158,11 @@ STRING \"[^\n"]+\" "0x"{HEXDIGIT}+ { sscanf(yytext, "%lx", &dbg_lval.integer); return tNUM; } {DIGIT}+ { sscanf(yytext, "%ld", &dbg_lval.integer); return tNUM; } +"'\\''" { dbg_lval.integer = '\''; return tNUM;} +"'\\0"{OCTDIGIT}*"'" { sscanf(yytext + 3, "%lo", &dbg_lval.integer); return tNUM;} +"'\\x"{HEXDIGIT}+"'" { sscanf(yytext + 3, "%lx", &dbg_lval.integer); return tNUM;} +"'\\"[a-z]"'" { dbg_lval.integer = yytext[2] - 'a'; return tNUM;} +"'"."'" { dbg_lval.integer = yytext[1]; return tNUM;} <FORMAT_EXPECTED>"/"{DIGIT}+{FORMAT} { char* last; dbg_lval.integer = strtol(yytext+1, &last, 0) << 8;

1 0

Eric Pouech : winhlp32: Added support for some keyword support in external DLL support ( RegisterRoutine parameters).
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: efc35078eae22f46578360b4235b443a13ec4a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc35078eae22f46578360b42… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Feb 10 21:38:03 2012 +0100 winhlp32: Added support for some keyword support in external DLL support (RegisterRoutine parameters). --- programs/winhlp32/macro.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index ea6ecbd..615b687 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -1029,6 +1029,32 @@ int MACRO_Lookup(const char* name, struct lexret* lr) return ret; if (MACRO_Loaded && (ret = MACRO_DoLookUp(MACRO_Loaded, name, lr, MACRO_NumLoaded)) != EMPTY) return ret; + if (!strcmp(name, "hwndApp")) + { + WINHELP_WINDOW* win; + lr->integer = 0; + for (win = Globals.win_list; win; win = win->next) + { + if (!strcmp(win->info->name, "main")) + { + lr->integer = (LONG_PTR)win->hMainWnd; + break; + } + } + return INTEGER; + } + if (!strcmp(name, "hwndContext")) + { + lr->integer = Globals.active_win ? + (LONG_PTR)Globals.active_win->hMainWnd : 0; + return INTEGER; + } + if (!strcmp(name, "qchPath") || !strcmp(name, "qError") || !strcmp(name, "lTopicNo") || + !strcmp(name, "hfs") || !strcmp(name, "coForeground") || !strcmp(name, "coBackground")) + { + WINE_FIXME("keyword %s not substituted in macro parsing\n", name); + return EMPTY; + } lr->string = name; return IDENTIFIER;

1 0

Christian Costa : d3dx9_36: Detect and display message for all not yet supported file formats.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: 39598b9c1e5b2bea4f248c3de6984cce4ee7ea07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39598b9c1e5b2bea4f248c3de… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Feb 10 14:18:39 2012 +0100 d3dx9_36: Detect and display message for all not yet supported file formats. --- dlls/d3dx9_36/surface.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 8049efc..ca1699b 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -62,8 +62,6 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D TRACE("(%p, %d, %p)\n", data, datasize, info); - /* TODO: Add support for (or at least detect) DDS, PPM and DIB */ - if (!data || !datasize) return D3DERR_INVALIDCALL; @@ -82,6 +80,19 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D IWICImagingFactory_Release(factory); } + if (FAILED(hr)) { + if ((datasize >= 4) && !strncmp(data, "DDS ", 4)) + FIXME("File type DDS is not supported yet\n"); + else if ((datasize >= 2) && (!strncmp(data, "P3", 2) || !strncmp(data, "P6", 2))) + FIXME("File type PPM is not supported yet\n"); + else if ((datasize >= 2) && !strncmp(data, "BM", 2)) + FIXME("File type DIB is not supported yet\n"); + else if ((datasize >= 10) && !strncmp(data, "#?RADIANCE", 10)) + FIXME("File type HDR is not supported yet\n"); + else if ((datasize >= 2) && (!strncmp(data, "PF", 2) || !strncmp(data, "Pf", 2))) + FIXME("File type PFM is not supported yet\n"); + } + if (SUCCEEDED(hr)) { GUID container_format; UINT frame_count; @@ -161,8 +172,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D CoUninitialize(); if (FAILED(hr)) { - /* Missing formats are not detected yet and will fail silently without the FIXME */ - FIXME("Invalid or unsupported image file\n"); + TRACE("Invalid or unsupported image file\n"); return D3DXERR_INVALIDDATA; }

1 0

Jacek Caban : ieframe: Added IProvideClassInfo::GetClassInfo tests.
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: a6e3984c1a3847bc500a8b427ac2ca9b783eaebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e3984c1a3847bc500a8b427… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 12:37:04 2012 +0100 ieframe: Added IProvideClassInfo::GetClassInfo tests. --- dlls/ieframe/tests/webbrowser.c | 45 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index e97cf3f..945be60 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -153,6 +153,7 @@ static BOOL is_downloading, is_first_load, use_container_olecmd, test_close, is_ static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; static const char *current_url; +static int wb_version; #define DWL_EXPECT_BEFORE_NAVIGATE 0x01 #define DWL_FROM_PUT_HREF 0x02 @@ -236,6 +237,8 @@ static HRESULT _create_WebBrowser(unsigned line, IUnknown **unk) { HRESULT hres; + wb_version = 2; + hres = CoCreateInstance(&CLSID_WebBrowser, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)unk); ok_(__FILE__,line)(hres == S_OK, "Creating WebBrowser object failed: %08x\n", hres); @@ -1898,6 +1901,8 @@ static void test_ClientSite(IUnknown *unk, IOleClientSite *client, BOOL stop_dow static void test_ClassInfo(IUnknown *unk) { IProvideClassInfo2 *class_info; + TYPEATTR *type_attr; + ITypeInfo *typeinfo; GUID guid; HRESULT hres; @@ -1908,7 +1913,7 @@ static void test_ClassInfo(IUnknown *unk) hres = IProvideClassInfo2_GetGUID(class_info, GUIDKIND_DEFAULT_SOURCE_DISP_IID, &guid); ok(hres == S_OK, "GetGUID failed: %08x\n", hres); - ok(IsEqualGUID(&DIID_DWebBrowserEvents2, &guid), "wrong guid\n"); + ok(IsEqualGUID(wb_version > 1 ? &DIID_DWebBrowserEvents2 : &DIID_DWebBrowserEvents, &guid), "wrong guid\n"); hres = IProvideClassInfo2_GetGUID(class_info, 0, &guid); ok(hres == E_FAIL, "GetGUID failed: %08x, expected E_FAIL\n", hres); @@ -1924,6 +1929,20 @@ static void test_ClassInfo(IUnknown *unk) hres = IProvideClassInfo2_GetGUID(class_info, 0, NULL); ok(hres == E_POINTER, "GetGUID failed: %08x, expected E_POINTER\n", hres); + typeinfo = NULL; + hres = IProvideClassInfo2_GetClassInfo(class_info, &typeinfo); + ok(hres == S_OK, "GetClassInfo failed: %08x\n", hres); + ok(typeinfo != NULL, "typeinfo == NULL\n"); + + hres = ITypeInfo_GetTypeAttr(typeinfo, &type_attr); + ok(hres == S_OK, "GetTypeAtr failed: %08x\n", hres); + + ok(IsEqualGUID(&type_attr->guid, wb_version > 1 ? &CLSID_WebBrowser : &CLSID_WebBrowser_V1), + "guid = %s\n", debugstr_guid(&type_attr->guid)); + + ITypeInfo_ReleaseTypeAttr(typeinfo, type_attr); + ITypeInfo_Release(typeinfo); + IProvideClassInfo2_Release(class_info); } @@ -3249,6 +3268,28 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) ok(ref == 0, "ref=%d, expected 0\n", ref); } +static void test_WebBrowserV1(void) +{ + IWebBrowser2 *wb; + ULONG ref; + HRESULT hres; + + wb_version = 1; + + hres = CoCreateInstance(&CLSID_WebBrowser_V1, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IWebBrowser2, (void**)&wb); + ok(hres == S_OK, "Could not get WebBrowserV1 instance: %08x\n", hres); + + test_QueryStatusWB(wb, FALSE, FALSE); + test_ExecWB(wb, FALSE, FALSE); + test_QueryInterface((IUnknown*)wb); + test_ready_state(READYSTATE_UNINITIALIZED); + test_ClassInfo((IUnknown*)wb); + + ref = IWebBrowser2_Release(wb); + ok(ref == 0, "ref=%d, expected 0\n", ref); +} + static void test_WebBrowser_NoContainerOlecmd(void) { IUnknown *unk = NULL; @@ -3325,6 +3366,8 @@ START_TEST(webbrowser) test_WebBrowser(TRUE, TRUE); trace("Testing WebBrowser w/o container-based olecmd...\n"); test_WebBrowser_NoContainerOlecmd(); + trace("Testing WebBrowserV1...\n"); + test_WebBrowserV1(); OleUninitialize(); }

1 0

Jacek Caban : ieframe: Added IProvideClassInfo::GetClassInfo implementation .
by Alexandre Julliard 11 Feb '12

11 Feb '12

Module: wine Branch: master Commit: c6a8e9a5b8e4bf5327034025a430853cf46d1988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a8e9a5b8e4bf5327034025a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 12:36:53 2012 +0100 ieframe: Added IProvideClassInfo::GetClassInfo implementation. --- dlls/ieframe/classinfo.c | 14 +++++++++++--- dlls/ieframe/ieframe.h | 4 ++++ dlls/ieframe/ieframe_main.c | 2 ++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/classinfo.c b/dlls/ieframe/classinfo.c index 30b8871..72798d6 100644 --- a/dlls/ieframe/classinfo.c +++ b/dlls/ieframe/classinfo.c @@ -52,11 +52,19 @@ static ULONG WINAPI ProvideClassInfo_Release(IProvideClassInfo2 *iface) return IWebBrowser_Release(&This->IWebBrowser2_iface); } -static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo2 *iface, LPTYPEINFO *ppTI) +static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) { WebBrowser *This = impl_from_IProvideClassInfo2(iface); - FIXME("(%p)->(%p)\n", This, ppTI); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, ppTI); + + hres = get_typeinfo(This->version > 1 ? WebBrowser_tid : WebBrowser_V1_tid, ppTI); + if(FAILED(hres)) + return hres; + + ITypeInfo_AddRef(*ppTI); + return S_OK; } static HRESULT WINAPI ProvideClassInfo_GetGUID(IProvideClassInfo2 *iface, diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index ac3e34d..ae787a9 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -284,12 +284,16 @@ void register_iewindow_class(void) DECLSPEC_HIDDEN; void unregister_iewindow_class(void) DECLSPEC_HIDDEN; #define TID_LIST \ + XCLSID(WebBrowser) \ + XCLSID(WebBrowser_V1) \ XIID(IWebBrowser2) typedef enum { #define XIID(iface) iface ## _tid, +#define XCLSID(class) class ## _tid, TID_LIST #undef XIID +#undef XCLSID LAST_tid } tid_t; diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index cbdff92..56cd663 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -59,8 +59,10 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { #define XIID(iface) &IID_ ## iface, +#define XCLSID(class) &CLSID_ ## class, TID_LIST #undef XIID +#undef XCLSID }; static HRESULT load_typelib(void)

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2012