November 2010 - Wine-Commits

Vincent Povirk : mscoree: Search for mono installs with the 2.0 abi.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 4b3f30219323e4ff558dea528443092465d8568f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b3f30219323e4ff558dea528… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Oct 3 14:36:02 2010 -0500 mscoree: Search for mono installs with the 2.0 abi. --- dlls/mscoree/metahost.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 018c1ee..35e0e32 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -66,7 +66,7 @@ static CRITICAL_SECTION_DEBUG runtime_list_cs_debug = }; static CRITICAL_SECTION runtime_list_cs = { &runtime_list_cs_debug, -1, 0, 0, 0, 0 }; -#define NUM_ABI_VERSIONS 1 +#define NUM_ABI_VERSIONS 2 static loaded_mono loaded_monos[NUM_ABI_VERSIONS]; @@ -122,8 +122,6 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) if (!find_mono_dll(This->mono_path, mono_dll_path, This->mono_abi_version)) goto fail; - if (This->mono_abi_version != 1) goto fail; - (*result)->mono_handle = LoadLibraryW(mono_dll_path); if (!(*result)->mono_handle) goto fail; @@ -451,6 +449,8 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) { static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; static const WCHAR libmono_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','.','d','l','l',0}; + static const WCHAR mono2_dll[] = {'\\','b','i','n','\\','m','o','n','o','-','2','.','0','.','d','l','l',0}; + static const WCHAR libmono2_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','.','d','l','l',0}; DWORD attributes=INVALID_FILE_ATTRIBUTES; if (abi_version == 1) @@ -466,6 +466,19 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) attributes = GetFileAttributesW(dll_path); } } + else if (abi_version == 2) + { + strcpyW(dll_path, path); + strcatW(dll_path, mono2_dll); + attributes = GetFileAttributesW(dll_path); + + if (attributes == INVALID_FILE_ATTRIBUTES) + { + strcpyW(dll_path, path); + strcatW(dll_path, libmono2_dll); + attributes = GetFileAttributesW(dll_path); + } + } return (attributes != INVALID_FILE_ATTRIBUTES); } @@ -514,6 +527,7 @@ static BOOL get_mono_path_from_registry(LPWSTR path, int abi_version) static BOOL get_mono_path_from_folder(LPCWSTR folder, LPWSTR mono_path, int abi_version) { static const WCHAR mono_one_dot_zero[] = {'\\','m','o','n','o','-','1','.','0', 0}; + static const WCHAR mono_two_dot_zero[] = {'\\','m','o','n','o','-','2','.','0', 0}; WCHAR mono_dll_path[MAX_PATH]; BOOL found = FALSE; @@ -521,6 +535,8 @@ static BOOL get_mono_path_from_folder(LPCWSTR folder, LPWSTR mono_path, int abi_ if (abi_version == 1) strcatW(mono_path, mono_one_dot_zero); + else if (abi_version == 2) + strcatW(mono_path, mono_two_dot_zero); found = find_mono_dll(mono_path, mono_dll_path, abi_version); @@ -593,7 +609,7 @@ static void find_runtimes(void) if (runtimes_initialized) goto end; - for (abi_version=1; abi_version>0; abi_version--) + for (abi_version=NUM_ABI_VERSIONS; abi_version>0; abi_version--) { if (!get_mono_path(mono_path, abi_version)) continue;

1 0

André Hentschel : krnl386: Mention DOSBox.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: ac816c2a82e44dff205e850743973bf97059bebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac816c2a82e44dff205e85074… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 10 20:02:21 2010 +0100 krnl386: Mention DOSBox. --- dlls/krnl386.exe16/dosexe.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index a3b84ea..55735f3 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -643,7 +643,8 @@ static DWORD WINAPI MZ_DOSVM( LPVOID lpExtra ) if (GetLastError() == ERROR_NOT_SUPPORTED) MESSAGE( "wine: Cannot start DOS application %s\n" - " because vm86 mode is not supported on this platform.\n", + " because vm86 mode is not supported on this platform.\n" + " Try running the application with DOSBox.\n", debugstr_a(env) ); else FIXME( "vm86 mode failed error %u\n", GetLastError() );

1 0

Vincent Povirk : mscoree: Add stub implementation of IMetaDataDispenserEx.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 9e20c21dbdf442138afb45884fcf7f5998352302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e20c21dbdf442138afb45884… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 5 13:21:25 2010 -0500 mscoree: Add stub implementation of IMetaDataDispenserEx. --- dlls/mscoree/Makefile.in | 1 + dlls/mscoree/corruntimehost.c | 22 ++++- dlls/mscoree/metadata.c | 202 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_private.h | 2 + 4 files changed, 226 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 284b18f..914aff4 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -5,6 +5,7 @@ C_SRCS = \ assembly.c \ config.c \ corruntimehost.c \ + metadata.c \ metahost.c \ mscoree_main.c diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 58d5e3b..8145948 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -618,16 +618,36 @@ HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, void **ppv) { IUnknown *unk; + HRESULT hr; if (IsEqualGUID(clsid, &CLSID_CorRuntimeHost)) + { unk = (IUnknown*)&This->lpVtbl; + IUnknown_AddRef(unk); + } else if (IsEqualGUID(clsid, &CLSID_CLRRuntimeHost)) + { unk = (IUnknown*)&This->lpCLRHostVtbl; + IUnknown_AddRef(unk); + } + else if (IsEqualGUID(clsid, &CLSID_CorMetaDataDispenser) || + IsEqualGUID(clsid, &CLSID_CorMetaDataDispenserRuntime)) + { + hr = MetaDataDispenser_CreateInstance(&unk); + if (FAILED(hr)) + return hr; + } else unk = NULL; if (unk) - return IUnknown_QueryInterface(unk, riid, ppv); + { + hr = IUnknown_QueryInterface(unk, riid, ppv); + + IUnknown_Release(unk); + + return hr; + } else FIXME("not implemented for class %s\n", debugstr_guid(clsid)); diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c new file mode 100644 index 0000000..c9b8c72 --- /dev/null +++ b/dlls/mscoree/metadata.c @@ -0,0 +1,202 @@ +/* + * IMetaDataDispenserEx - dynamic creation/editing of assemblies + * + * Copyright 2010 Vincent Povirk 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 <stdio.h> +#include <stdarg.h> +#include <assert.h> + +#define COBJMACROS + +#include "wine/library.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "ole2.h" + +#include "cor.h" +#include "metahost.h" +#include "wine/list.h" +#include "mscoree_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); + +typedef struct MetaDataDispenser +{ + const struct IMetaDataDispenserExVtbl *lpVtbl; + LONG ref; +} MetaDataDispenser; + +static HRESULT WINAPI MetaDataDispenser_QueryInterface(IMetaDataDispenserEx* iface, + REFIID riid, void **ppvObject) +{ + TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_IMetaDataDispenserEx) || + IsEqualGUID(riid, &IID_IMetaDataDispenser) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *ppvObject = iface; + } + else + { + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IMetaDataDispenserEx_AddRef( iface ); + + return S_OK; +} + +static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface) +{ + MetaDataDispenser *This = (MetaDataDispenser*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + MSCOREE_LockModule(); + + return ref; +} + +static ULONG WINAPI MetaDataDispenser_Release(IMetaDataDispenserEx* iface) +{ + MetaDataDispenser *This = (MetaDataDispenser*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("%p ref=%u\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + MSCOREE_UnlockModule(); + + return ref; +} + +static HRESULT WINAPI MetaDataDispenser_DefineScope(IMetaDataDispenserEx* iface, + REFCLSID rclsid, DWORD dwCreateFlags, REFIID riid, IUnknown **ppIUnk) +{ + FIXME("%p %s %x %s %p\n", iface, debugstr_guid(rclsid), dwCreateFlags, + debugstr_guid(riid), ppIUnk); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_OpenScope(IMetaDataDispenserEx* iface, + LPCWSTR szScope, DWORD dwOpenFlags, REFIID riid, IUnknown **ppIUnk) +{ + FIXME("%p %s %x %s %p\n", iface, debugstr_w(szScope), dwOpenFlags, + debugstr_guid(riid), ppIUnk); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_OpenScopeOnMemory(IMetaDataDispenserEx* iface, + const void *pData, ULONG cbData, DWORD dwOpenFlags, REFIID riid, IUnknown **ppIUnk) +{ + FIXME("%p %p %u %x %s %p\n", iface, pData, cbData, dwOpenFlags, + debugstr_guid(riid), ppIUnk); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_SetOption(IMetaDataDispenserEx* iface, + REFGUID optionid, const VARIANT *value) +{ + FIXME("%p %s\n", iface, debugstr_guid(optionid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_GetOption(IMetaDataDispenserEx* iface, + REFGUID optionid, VARIANT *pvalue) +{ + FIXME("%p %s\n", iface, debugstr_guid(optionid)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_OpenScopeOnITypeInfo(IMetaDataDispenserEx* iface, + ITypeInfo *pITI, DWORD dwOpenFlags, REFIID riid, IUnknown **ppIUnk) +{ + FIXME("%p %p %u %s %p\n", iface, pITI, dwOpenFlags, debugstr_guid(riid), ppIUnk); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_GetCORSystemDirectory(IMetaDataDispenserEx* iface, + LPWSTR szBuffer, DWORD cchBuffer, DWORD *pchBuffer) +{ + FIXME("%p %p %u %p\n", iface, szBuffer, cchBuffer, pchBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_FindAssembly(IMetaDataDispenserEx* iface, + LPCWSTR szAppBase, LPCWSTR szPrivateBin, LPCWSTR szGlobalBin, LPCWSTR szAssemblyName, + LPWSTR szName, ULONG cchName, ULONG *pcName) +{ + FIXME("%p %s %s %s %s %p %u %p\n", iface, debugstr_w(szAppBase), + debugstr_w(szPrivateBin), debugstr_w(szGlobalBin), + debugstr_w(szAssemblyName), szName, cchName, pcName); + return E_NOTIMPL; +} + +static HRESULT WINAPI MetaDataDispenser_FindAssemblyModule(IMetaDataDispenserEx* iface, + LPCWSTR szAppBase, LPCWSTR szPrivateBin, LPCWSTR szGlobalBin, LPCWSTR szAssemblyName, + LPCWSTR szModuleName, LPWSTR szName, ULONG cchName, ULONG *pcName) +{ + FIXME("%p %s %s %s %s %s %p %u %p\n", iface, debugstr_w(szAppBase), + debugstr_w(szPrivateBin), debugstr_w(szGlobalBin), debugstr_w(szAssemblyName), + debugstr_w(szModuleName), szName, cchName, pcName); + return E_NOTIMPL; +} + +const struct IMetaDataDispenserExVtbl MetaDataDispenserVtbl = +{ + MetaDataDispenser_QueryInterface, + MetaDataDispenser_AddRef, + MetaDataDispenser_Release, + MetaDataDispenser_DefineScope, + MetaDataDispenser_OpenScope, + MetaDataDispenser_OpenScopeOnMemory, + MetaDataDispenser_SetOption, + MetaDataDispenser_GetOption, + MetaDataDispenser_OpenScopeOnITypeInfo, + MetaDataDispenser_GetCORSystemDirectory, + MetaDataDispenser_FindAssembly, + MetaDataDispenser_FindAssemblyModule +}; + +HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) +{ + MetaDataDispenser *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(MetaDataDispenser)); + + if (!This) + return E_OUTOFMEMORY; + + This->lpVtbl = &MetaDataDispenserVtbl; + This->ref = 1; + + *ppUnk = (IUnknown*)This; + + return S_OK; +} diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 49cd6a2..46c49c6 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -54,6 +54,8 @@ extern HRESULT force_get_runtime_info(ICLRRuntimeInfo **result); extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result); +extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk); + typedef struct parsed_config_file { struct list supported_runtimes;

1 0

Gustavo Henrique Milaré : inetcpl.cpl: Added Portuguese (Brazilian) translation.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 63ab5eea071b1acb3f17a64ef131ed7f114edb16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ab5eea071b1acb3f17a64ef… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Wed Nov 10 19:36:32 2010 -0200 inetcpl.cpl: Added Portuguese (Brazilian) translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Pt.rc | 68 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 9095d7e..8c6b080 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -18,6 +18,7 @@ RC_SRCS = \ cpl_Lt.rc \ cpl_Nl.rc \ cpl_Pl.rc \ + cpl_Pt.rc \ cpl_Si.rc \ cpl_Sr.rc \ cpl_Sv.rc \ diff --git a/dlls/inetcpl.cpl/cpl_Pt.rc b/dlls/inetcpl.cpl/cpl_Pt.rc new file mode 100644 index 0000000..929cfec --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Pt.rc @@ -0,0 +1,68 @@ +/* + * English resources for the Internet control panel applet + * + * Copyright 2010 Gustavo Henrique Milaré + * + * 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 "inetcpl.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Configurações da Internet" + IDS_CPL_INFO "Configurar o Wine Internet Browser e opções relacionadas" +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Geral" +BEGIN + + GROUPBOX " Página inicial ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Escolha o endereço que será usado como página inicial.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "Página &atual", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "Página &padrão", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "Página em &branco", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Conteúdo" +BEGIN + + GROUPBOX " Certificados ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Certificados são usados para sua identificação pessoal e para identificar certificados de autoridades e editores.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Certificados...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Editores...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0

Gustavo Henrique Milaré : shdocvw: Added Portuguese (Brazilian) translation.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 58ff7a48e06589f90f6fa50503362dd76c294214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ff7a48e06589f90f6fa5050… Author: Gustavo Henrique Milaré <gugamilare(a)gmail.com> Date: Thu Nov 11 12:09:58 2010 -0200 shdocvw: Added Portuguese (Brazilian) translation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Pt.rc | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index e8d2a29..ab26009 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -35,6 +35,7 @@ RC_SRCS = \ Lt.rc \ Nl.rc \ Pl.rc \ + Pt.rc \ Ro.rc \ Si.rc \ Sr.rc \ diff --git a/dlls/shdocvw/Pt.rc b/dlls/shdocvw/Pt.rc new file mode 100644 index 0000000..9dff39c --- /dev/null +++ b/dlls/shdocvw/Pt.rc @@ -0,0 +1,94 @@ +/* + * Copyright 2010 Gustavo Henrique Milaré + * + * 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 "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Abrir URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Especifique a URL que você deseja abrir no Internet Explorer",-1,25, 5, 150,15 + LTEXT "Abrir:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&Cancelar", IDCANCEL, 85, 50, 50, 15 +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Arquivo" + { + POPUP "&Novo" + { + MENUITEM "&Janela" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Abrir...", ID_BROWSE_OPEN + MENUITEM "&Salvar", ID_BROWSE_SAVE + MENUITEM "Salvar &como...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Imprimir &formato...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Imprimir...", ID_BROWSE_PRINT + MENUITEM "&Vizualizar impressão...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Propriedades...", ID_BROWSE_PROPERTIES + MENUITEM "&Fechar", ID_BROWSE_QUIT + } + POPUP "&Ver" + { + POPUP "&Ferramentas" + { + MENUITEM "Barra &padrão" ID_BROWSE_BAR_STD + MENUITEM "Barra de &endereço" ID_BROWSE_BAR_ADDR + } + } + POPUP "&Favoritos" + { + MENUITEM "&Adicionar aos Favoritos..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "A&juda" + { + MENUITEM "&Sobre o Internet Explorer...", ID_BROWSE_ABOUT + } +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + IDS_TB_BACK "Voltar" + IDS_TB_FORWARD "Avançar" + IDS_TB_STOP "Parar" + IDS_TB_REFRESH "Atualizar" + IDS_TB_HOME "Início" + IDS_TB_PRINT "Imprimir" +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE +{ + IDS_ADDRESS "Endereço" +}

1 0

Eryk Wieliczko : msvcrt: Fixed (_w)fopen_s with test.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: c9bd269db11dcc7e3b0fe49135ba9d0d0a4f8eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bd269db11dcc7e3b0fe4913… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Wed Nov 10 12:34:42 2010 +0100 msvcrt: Fixed (_w)fopen_s with test. --- dlls/msvcrt/file.c | 4 +- dlls/msvcrt/tests/file.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 329cdeb..91cd448 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2742,7 +2742,7 @@ int CDECL MSVCRT_fopen_s(MSVCRT_FILE** pFile, const char *filename, const char *mode) { if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(filename != NULL) || - MSVCRT_CHECK_PMT(mode != NULL)) { + !MSVCRT_CHECK_PMT(mode != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } @@ -2769,7 +2769,7 @@ int CDECL MSVCRT__wfopen_s(MSVCRT_FILE** pFile, const MSVCRT_wchar_t *filename, const MSVCRT_wchar_t *mode) { if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(filename != NULL) || - MSVCRT_CHECK_PMT(mode != NULL)) { + !MSVCRT_CHECK_PMT(mode != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index ef7b28d..488c219 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -36,6 +36,17 @@ static HANDLE proc_handles[2]; +static int (__cdecl *p_fopen_s)(FILE**, const char*, const char*); +static int (__cdecl *p__wfopen_s)(FILE**, const wchar_t*, const wchar_t*); + +static void init(void) +{ + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + + p_fopen_s = (void*)GetProcAddress(hmod, "fopen_s"); + p__wfopen_s = (void*)GetProcAddress(hmod, "_wfopen_s"); +} + static void test_filbuf( void ) { FILE *fp; @@ -1201,6 +1212,82 @@ static void test_fopen_fclose_fcloseall( void ) ok(_unlink(fname3) == 0, "Couldn't unlink file named '%s'\n", fname3); } +static void test_fopen_s( void ) +{ + const char name[] = "empty1"; + char buff[16]; + FILE *file; + int ret; + int len; + + if (!p_fopen_s) + { + win_skip("Skipping fopen_s test\n"); + return; + } + /* testing fopen_s */ + ret = p_fopen_s(&file, name, "w"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + ok(file != 0, "fopen_s failed to return value\n"); + fwrite(name, sizeof(name), 1, file); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + file = fopen(name, "r"); + ok(file != 0, "fopen failed\n"); + len = fread(buff, 1, sizeof(name), file); + ok(len == sizeof(name), "File length supposed to be %d, not %d\n", sizeof(name), len); + buff[sizeof(name)] = '\0'; + ok(strcmp(name, buff) == 0, "File content mismatch! Got %s, expected %s\n", buff, name); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); +} + +static void test__wfopen_s( void ) +{ + const char name[] = "empty1"; + const WCHAR wname[] = { + 'e','m','p','t','y','1',0 + }; + const WCHAR wmode[] = { + 'w',0 + }; + char buff[16]; + FILE *file; + int ret; + int len; + + if (!p__wfopen_s) + { + win_skip("Skipping _wfopen_s test\n"); + return; + } + /* testing _wfopen_s */ + ret = p__wfopen_s(&file, wname, wmode); + ok(ret == 0, "_wfopen_s failed with %d\n", ret); + ok(file != 0, "_wfopen_s failed to return value\n"); + fwrite(name, sizeof(name), 1, file); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + file = fopen(name, "r"); + ok(file != 0, "fopen failed\n"); + len = fread(buff, 1, sizeof(name), file); + ok(len == sizeof(name), "File length supposed to be %d, not %d\n", sizeof(name), len); + buff[sizeof(name)] = '\0'; + ok(strcmp(name, buff) == 0, "File content mismatch! Got %s, expected %s\n", buff, name); + + ret = fclose(file); + ok(ret != EOF, "File failed to close\n"); + + ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); +} + static void test_get_osfhandle(void) { int fd; @@ -1424,6 +1511,8 @@ START_TEST(file) int arg_c; char** arg_v; + init(); + arg_c = winetest_get_mainargs( &arg_v ); /* testing low-level I/O */ @@ -1450,6 +1539,8 @@ START_TEST(file) test_filbuf(); test_fdopen(); test_fopen_fclose_fcloseall(); + test_fopen_s(); + test__wfopen_s(); test_fileops(); test_asciimode(); test_asciimode2();

1 0

Maarten Lankhorst : quartz: Reset state change after flushing.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 5dd27f759701bd5b2ebf196f6dc126b6125d2f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd27f759701bd5b2ebf196f6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 00:14:19 2010 +0100 quartz: Reset state change after flushing. This fixes IBasicVideo:GetCurrentImage. --- dlls/quartz/videorenderer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 5fbedaf..e1cef40 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -944,8 +944,10 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface) TRACE("(%p/%p)->()\n", This, iface); EnterCriticalSection(This->pin.pCritSec); - if (pVideoRenderer->filter.state == State_Paused) + if (pVideoRenderer->filter.state == State_Paused) { ResetEvent(pVideoRenderer->blocked); + ResetEvent(pVideoRenderer->hEvent); + } QualityControlRender_Start(&pVideoRenderer->qcimpl, pVideoRenderer->filter.rtStreamStart); hr = BaseInputPinImpl_EndFlush(iface);

1 0

Jaime Rave : wined3d: Added Intel GM45 video card detection.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 6bf3f67c018259e1c87189dcef31816023bd2e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf3f67c018259e1c87189dce… Author: Jaime Rave <jaimerave(a)ubuntu-co.com> Date: Wed Nov 10 00:32:33 2010 -0500 wined3d: Added Intel GM45 video card detection. --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4485491..d1ef660 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1114,7 +1114,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_I915G, "Intel(R) 82915G/GV/910GL Express Chipset Family", DRIVER_INTEL_GMA900, 64 }, {HW_VENDOR_INTEL, CARD_INTEL_I915GM, "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family", DRIVER_INTEL_GMA900, 64 }, {HW_VENDOR_INTEL, CARD_INTEL_I945GM, "Mobile Intel(R) 945GM Express Chipset Family", DRIVER_INTEL_GMA950, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_X3100, "Mobile Intel(R) 965 Express Chipset Family", DRIVER_INTEL_GMA3000, 128} + {HW_VENDOR_INTEL, CARD_INTEL_X3100, "Mobile Intel(R) 965 Express Chipset Family", DRIVER_INTEL_GMA3000, 128}, + {HW_VENDOR_INTEL, CARD_INTEL_GM45, "Mobile Intel(R) GM45 Express Chipset Family", DRIVER_INTEL_GMA3000, 512} }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, @@ -1692,6 +1693,7 @@ static enum wined3d_pci_device select_card_ati_binary(const struct wined3d_gl_in static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + if (strstr(gl_renderer, "GM45")) return CARD_INTEL_GM45; if (strstr(gl_renderer, "X3100") || strstr(gl_renderer, "965GM")) { /* MacOS calls the card GMA X3100, otherwise known as GM965/GL960 */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8f6c96e..badd3bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1410,6 +1410,7 @@ enum wined3d_pci_device CARD_INTEL_I915GM = 0x2592, CARD_INTEL_I945GM = 0x27a2, /* Same as GMA 950? */ CARD_INTEL_X3100 = 0x2a02, /* Found in Macs. Same as GM965/GL960 */ + CARD_INTEL_GM45 = 0x2a42, }; struct wined3d_fbo_ops

1 0

Henri Verbeet : wined3d: Handle rendertargetlock_mode in surface_load_location().
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: d3fd7b247b35d7c8c453afa2fc07e121ea75214b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3fd7b247b35d7c8c453afa2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 11 12:39:18 2010 +0100 wined3d: Handle rendertargetlock_mode in surface_load_location(). --- dlls/wined3d/surface.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 428be78..a18f067 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1882,15 +1882,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Unmap(IWineD3DSurface *iface) This->Flags |= SFLAG_INSYSMEM; } - switch(wined3d_settings.rendertargetlock_mode) { - case RTL_READTEX: - surface_load_location(This, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */); - /* drop through */ - - case RTL_READDRAW: - surface_load_location(This, SFLAG_INDRAWABLE, fullsurface ? NULL : &This->dirtyRect); - break; - } + surface_load_location(This, SFLAG_INDRAWABLE, fullsurface ? NULL : &This->dirtyRect); if (!fullsurface) { @@ -4415,6 +4407,9 @@ HRESULT surface_load_location(IWineD3DSurfaceImpl *surface, DWORD flag, const RE } else if (flag == SFLAG_INDRAWABLE) { + if (wined3d_settings.rendertargetlock_mode == RTL_READTEX) + surface_load_location(surface, SFLAG_INTEXTURE, NULL); + if (surface->Flags & SFLAG_INTEXTURE) { RECT r;

1 0

Maarten Lankhorst : quartz: Fix stub for GetVideoPaletteEntries.
by Alexandre Julliard Nov. 11, 2010

Nov. 11, 2010

Module: wine Branch: master Commit: 06ca6fb184dd26a95726f9749c851b85beb4cf96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ca6fb184dd26a95726f9749… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 00:14:18 2010 +0100 quartz: Fix stub for GetVideoPaletteEntries. --- dlls/quartz/videorenderer.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index bf0fa7b..5fbedaf 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -1413,9 +1413,11 @@ static HRESULT WINAPI Basicvideo_GetVideoPaletteEntries(IBasicVideo *iface, LONG *pPalette) { ICOM_THIS_MULTI(VideoRendererImpl, IBasicVideo_vtbl, iface); - FIXME("(%p/%p)->(%d, %d, %p, %p): stub !!!\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); + TRACE("(%p/%p)->(%d, %d, %p, %p)\n", This, iface, StartIndex, Entries, pRetrieved, pPalette); - return S_OK; + if (pRetrieved) + *pRetrieved = 0; + return VFW_E_NO_PALETTE_AVAILABLE; } static HRESULT WINAPI Basicvideo_GetCurrentImage(IBasicVideo *iface,

1 0