wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Alexandre Julliard : krnl386.exe: Propagate DOS startup errors up to winevdm.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 173957d294253112c55fd3202225859e0f6c65aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=173957d294253112c55fd3202… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 11 18:01:05 2010 +0100 krnl386.exe: Propagate DOS startup errors up to winevdm. --- dlls/krnl386.exe16/dosexe.c | 37 +++++++++++++------------------------ programs/winevdm/winevdm.c | 36 ++++++++++++++++++++++++++---------- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index 55735f3..ff55326 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -114,7 +114,7 @@ static WORD init_cs,init_ip,init_ss,init_sp; static HANDLE dosvm_thread, loop_thread; static DWORD dosvm_tid, loop_tid; -static void MZ_Launch( LPCSTR cmdtail, int length ); +static DWORD MZ_Launch( LPCSTR cmdtail, int length ); static BOOL MZ_InitTask(void); static void MZ_CreatePSP( LPVOID lpPSP, WORD env, WORD par ) @@ -433,8 +433,12 @@ void __wine_load_dos_exe( LPCSTR filename, LPCSTR cmdline ) } } - if (MZ_DoLoadImage( hFile, filename, NULL, 0 )) - MZ_Launch( dos_cmdtail, dos_length ); + if (MZ_DoLoadImage( hFile, filename, NULL, 0 )) + { + DWORD err = MZ_Launch( dos_cmdtail, dos_length ); + /* if we get back here it failed */ + SetLastError( err ); + } } /*********************************************************************** @@ -633,24 +637,9 @@ static DWORD WINAPI MZ_DOSVM( LPVOID lpExtra ) context.EFlags = V86_FLAG | VIF_MASK; DOSVM_SetTimer(0x10000); ret = DOSVM_Enter( &context ); - if (ret == -1) - { - /* fetch the app name from the environment */ - PDB16 *psp = PTR_REAL_TO_LIN( DOSVM_psp, 0 ); - char *env = PTR_REAL_TO_LIN( psp->environment, 0 ); - while (*env) env += strlen(env) + 1; - env += 1 + sizeof(WORD); - - if (GetLastError() == ERROR_NOT_SUPPORTED) - MESSAGE( "wine: Cannot start DOS application %s\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() ); - } + if (ret == -1) ret = GetLastError(); dosvm_pid = 0; - return ret != 0; + return ret; } static BOOL MZ_InitTask(void) @@ -669,7 +658,7 @@ static BOOL MZ_InitTask(void) return TRUE; } -static void MZ_Launch( LPCSTR cmdtail, int length ) +static DWORD MZ_Launch( LPCSTR cmdtail, int length ) { TDB *pTask = GlobalLock16( GetCurrentTask() ); BYTE *psp_start = PTR_REAL_TO_LIN( DOSVM_psp, 0 ); @@ -696,9 +685,10 @@ static void MZ_Launch( LPCSTR cmdtail, int length ) dosvm_thread = 0; dosvm_tid = 0; CloseHandle(loop_thread); loop_thread = 0; loop_tid = 0; + if (rv) return rv; VGA_Clean(); - ExitProcess(rv); + ExitProcess(0); } /*********************************************************************** @@ -756,8 +746,7 @@ BOOL MZ_Current( void ) */ void __wine_load_dos_exe( LPCSTR filename, LPCSTR cmdline ) { - FIXME("DOS executables not supported on this platform\n"); - SetLastError(ERROR_BAD_FORMAT); + SetLastError( ERROR_NOT_SUPPORTED ); } /*********************************************************************** diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 92ca508..65f4bf2 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -102,6 +102,30 @@ typedef struct { #include "poppack.h" /*********************************************************************** + * start_dos_exe + */ +static void start_dos_exe( LPCSTR filename, LPCSTR cmdline ) +{ + MEMORY_BASIC_INFORMATION mem_info; + const char *reason; + + if (VirtualQuery( NULL, &mem_info, sizeof(mem_info) ) && mem_info.State != MEM_FREE) + { + __wine_load_dos_exe( filename, cmdline ); + if (GetLastError() == ERROR_NOT_SUPPORTED) + reason = "because vm86 mode is not supported on this platform"; + else + reason = wine_dbg_sprintf( "It failed with error code %u", GetLastError() ); + } + else reason = "because the DOS memory range is unavailable"; + + WINE_MESSAGE( "winevdm: Cannot start DOS application %s\n", filename ); + WINE_MESSAGE( " %s.\n", reason ); + WINE_MESSAGE( " Try running this application with DOSBox.\n" ); + ExitProcess(1); +} + +/*********************************************************************** * read_pif_file *pif386rec_tu * Read a pif file and return the header and possibly the 286 (real mode) @@ -244,8 +268,7 @@ static VOID pif_cmd( char *filename, char *cmdline) * - hot key's * - etc. */ - __wine_load_dos_exe( progpath, cmdline ); - return; + start_dos_exe( progpath, cmdline ); } /*********************************************************************** @@ -382,7 +405,6 @@ int main( int argc, char *argv[] ) STARTUPINFOA info; char *cmdline, *appname, **first_arg; char *p; - MEMORY_BASIC_INFORMATION mem_info; if (!argv[1]) usage(); @@ -439,15 +461,9 @@ int main( int argc, char *argv[] ) pif_cmd( appname, cmdline + 1); else { - if (!VirtualQuery( NULL, &mem_info, sizeof(mem_info) ) || mem_info.State == MEM_FREE) - { - WINE_MESSAGE( "winevdm: unable to exec '%s': DOS memory range unavailable\n", appname ); - ExitProcess(1); - } - /* try DOS format */ /* loader expects arguments to be regular C strings */ - __wine_load_dos_exe( appname, cmdline + 1 ); + start_dos_exe( appname, cmdline + 1 ); } /* if we get back here it failed */ instance = GetLastError();

1 0

Maarten Lankhorst : quartz: Handle state changes in direct sound renderer correctly.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 44a17d27bbc99b1a2a4e0f7d14dad4acc74316b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a17d27bbc99b1a2a4e0f7d1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 16:01:36 2010 +0100 quartz: Handle state changes in direct sound renderer correctly. Based on a patch from Vladimir Panteleev --- dlls/quartz/dsoundrender.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index ca58b98..759ba07 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -620,6 +620,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) if (This->filter.state == State_Stopped) { This->pInputPin->end_of_stream = 0; + ResetEvent(This->state_change); } hr = IDirectSoundBuffer_Stop(This->dsbuffer); @@ -627,7 +628,6 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) This->filter.state = State_Paused; ResetEvent(This->blocked); - ResetEvent(This->state_change); } LeaveCriticalSection(&This->filter.csFilter); @@ -856,6 +856,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) } } MediaSeekingPassThru_EOS(me->seekthru_unk); + SetEvent(me->state_change); LeaveCriticalSection(This->pin.pCritSec); return hr;

1 0

Maarten Lankhorst : quartz: Make window behavior of video renderer act more like windows.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 5c3cddf351dd48d175aa5866526579a83574bd11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3cddf351dd48d175aa58665… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 14:03:29 2010 +0100 quartz: Make window behavior of video renderer act more like windows. --- dlls/quartz/videorenderer.c | 78 ++++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 37 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index e1cef40..112289a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -259,6 +259,42 @@ static BOOL CreateRenderingSubsystem(VideoRendererImpl* This) return TRUE; } +static void VideoRenderer_AutoShowWindow(VideoRendererImpl *This) { + if (!This->init && (!This->WindowPos.right || !This->WindowPos.top)) + { + DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE); + DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE); + + if (!This->WindowPos.right) + { + This->WindowPos.left = This->SourceRect.left; + This->WindowPos.right = This->SourceRect.right; + } + if (!This->WindowPos.bottom) + { + This->WindowPos.top = This->SourceRect.top; + This->WindowPos.bottom = This->SourceRect.bottom; + } + + AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); + + TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); + SetWindowPos(This->hWnd, NULL, + This->WindowPos.left, + This->WindowPos.top, + This->WindowPos.right - This->WindowPos.left, + This->WindowPos.bottom - This->WindowPos.top, + SWP_NOZORDER|SWP_NOMOVE|SWP_DEFERERASE); + + GetClientRect(This->hWnd, &This->DestRect); + } + else if (!This->init) + This->DestRect = This->WindowPos; + This->init = TRUE; + if (This->AutoShow) + ShowWindow(This->hWnd, SW_SHOW); +} + static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { AM_MEDIA_TYPE amt; @@ -298,41 +334,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); - if (!This->init) - { - if (!This->WindowPos.right || !This->WindowPos.top) - { - DWORD style = GetWindowLongW(This->hWnd, GWL_STYLE); - DWORD style_ex = GetWindowLongW(This->hWnd, GWL_EXSTYLE); - - if (!This->WindowPos.right) - { - This->WindowPos.left = This->SourceRect.left; - This->WindowPos.right = This->SourceRect.right; - } - if (!This->WindowPos.bottom) - { - This->WindowPos.top = This->SourceRect.top; - This->WindowPos.bottom = This->SourceRect.bottom; - } - - AdjustWindowRectEx(&This->WindowPos, style, TRUE, style_ex); - - TRACE("WindowPos: %d %d %d %d\n", This->WindowPos.left, This->WindowPos.top, This->WindowPos.right, This->WindowPos.bottom); - SetWindowPos(This->hWnd, NULL, - This->WindowPos.left, - This->WindowPos.top, - This->WindowPos.right - This->WindowPos.left, - This->WindowPos.bottom - This->WindowPos.top, - SWP_NOZORDER|SWP_NOMOVE|SWP_DEFERERASE); - - GetClientRect(This->hWnd, &This->DestRect); - } - else - This->DestRect = This->WindowPos; - This->init = TRUE; - } - hDC = GetDC(This->hWnd); if (!hDC) { @@ -349,8 +350,6 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(This->hWnd, hDC); - if (This->AutoShow) - ShowWindow(This->hWnd, SW_SHOW); return S_OK; } @@ -768,6 +767,9 @@ static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface) SetEvent(This->hEvent); SetEvent(This->blocked); MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); + if (This->AutoShow) + /* Black it out */ + RedrawWindow(This->hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); } LeaveCriticalSection(&This->filter.csFilter); @@ -787,6 +789,7 @@ static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) { This->pInputPin->end_of_stream = 0; ResetEvent(This->hEvent); + VideoRenderer_AutoShowWindow(This); } This->filter.state = State_Paused; @@ -824,6 +827,7 @@ static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tSta { This->pInputPin->end_of_stream = 0; ResetEvent(This->hEvent); + VideoRenderer_AutoShowWindow(This); } SetEvent(This->blocked);

1 0

Maarten Lankhorst : quartz: Start DirectSound renderer as soon as possible.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 64b14c0ecdd13530a92ff636c451523a99253a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b14c0ecdd13530a92ff636c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 14:03:28 2010 +0100 quartz: Start DirectSound renderer as soon as possible. Makes directsound switch to silent playback even when no buffers are playing, fixes glitching on starting playback from a stopped buffer. --- dlls/quartz/dsoundrender.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index d8dd45b..ca58b98 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -457,6 +457,19 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) ERR("Cannot create Direct Sound object (%x)\n", hr); else hr = IDirectSound_SetCooperativeLevel(pDSoundRender->dsound, GetDesktopWindow(), DSSCL_PRIORITY); + if (SUCCEEDED(hr)) { + IDirectSoundBuffer *buf; + DSBUFFERDESC buf_desc; + memset(&buf_desc,0,sizeof(DSBUFFERDESC)); + buf_desc.dwSize = sizeof(DSBUFFERDESC); + buf_desc.dwFlags = DSBCAPS_PRIMARYBUFFER; + hr = IDirectSound_CreateSoundBuffer(pDSoundRender->dsound, &buf_desc, &buf, NULL); + if (SUCCEEDED(hr)) { + IDirectSoundBuffer_Play(buf, 0, 0, DSBPLAY_LOOPING); + IUnknown_Release(buf); + } + hr = S_OK; + } } if (SUCCEEDED(hr))

1 0

Maarten Lankhorst : winegstreamer: Move up gst_segment_init to prevent a theoretical race condition.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: cf085af1268e85f499d071d3963e83b84beec64a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf085af1268e85f499d071d39… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 11 14:03:27 2010 +0100 winegstreamer: Move up gst_segment_init to prevent a theoretical race condition. --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1f98a7d..4c9fd74 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -396,9 +396,9 @@ static gboolean event_sink(GstPad *pad, GstEvent *event) { IPin_BeginFlush(pin->pin.pin.pConnectedTo); return 1; case GST_EVENT_FLUSH_STOP: + gst_segment_init(pin->segment, GST_FORMAT_TIME); if (pin->pin.pin.pConnectedTo) IPin_EndFlush(pin->pin.pin.pConnectedTo); - gst_segment_init(pin->segment, GST_FORMAT_TIME); return 1; default: FIXME("%p stub %s\n", event, gst_event_type_get_name(event->type)); @@ -746,12 +746,12 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS pin->isaud = isaud; pin->isvid = isvid; + gst_segment_init(pin->segment, GST_FORMAT_TIME); ret = gst_pad_link(pad, mypad); gst_pad_activate_push(mypad, 1); FIXME("Linking: %i\n", ret); if (ret >= 0) { pin->their_src = pad; - gst_segment_init(pin->segment, GST_FORMAT_TIME); gst_object_ref(pin->their_src); } } @@ -772,9 +772,9 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gboolean last, GSTImp for (x = 0; x < This->cStreams; ++x) { GSTOutPin *pin = This->ppPins[x]; if (!pin->their_src) { + gst_segment_init(pin->segment, GST_FORMAT_TIME); if (gst_pad_link(pad, pin->my_sink) >= 0) { pin->their_src = pad; - gst_segment_init(pin->segment, GST_FORMAT_TIME); gst_object_ref(pin->their_src); TRACE("Relinked\n"); LeaveCriticalSection(&This->filter.csFilter);

1 0

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

11 Nov '10

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

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

11 Nov '10

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

Vincent Povirk : mscoree: Add stub implementation of IMetaDataDispenserEx.
by Alexandre Julliard 11 Nov '10

11 Nov '10

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

Vincent Povirk : include: Add definitions for IMetaDataDispenserEx.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 6ad97b7c08bece95fd134bc9ccd12873b8ef5c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad97b7c08bece95fd134bc9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 5 12:34:28 2010 -0500 include: Add definitions for IMetaDataDispenserEx. --- include/cor.idl | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/include/cor.idl b/include/cor.idl index 4c5e639..8d8154b 100644 --- a/include/cor.idl +++ b/include/cor.idl @@ -16,11 +16,89 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "propidl.idl"; + cpp_quote("#include <ole2.h>") /* FIXME: #include "specstrings.h" */ /* FIXME: #include "corerror.h" */ /* FIXME: #include "corhdr.h" */ +cpp_quote("DEFINE_GUID(CLSID_CorMetaDataDispenser, 0xe5cb7a31,0x7512,0x11d2,0x89,0xce,0x00,0x80,0xc7,0x92,0xe5,0xd8);") +cpp_quote("DEFINE_GUID(CLSID_CorMetaDataDispenserRuntime, 0x1ec2de53,0x75cc,0x11d2,0x97,0x75,0x00,0xa0,0xc9,0xb4,0xd5,0x0c);") + +[ + object, + local, + uuid(809c652e-7396-11d2-9771-00a0c9b4d50c) +] +interface IMetaDataDispenser : IUnknown +{ + HRESULT DefineScope( + [in] REFCLSID rclsid, + [in] DWORD dwCreateFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); + + HRESULT OpenScope( + [in] LPCWSTR szScope, + [in] DWORD dwOpenFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); + + HRESULT OpenScopeOnMemory( + [in] const void *pData, + [in] ULONG cbData, + [in] DWORD dwOpenFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); +} + +[ + object, + local, + uuid(31bcfce2-dafb-11d2-9f81-00c04f79a0a3) +] +interface IMetaDataDispenserEx : IMetaDataDispenser +{ + HRESULT SetOption( + [in] REFGUID optionid, + [in] const VARIANT *value); + + HRESULT GetOption( + [in] REFGUID optionid, + [out] VARIANT *pvalue); + + HRESULT OpenScopeOnITypeInfo( + [in] ITypeInfo *pITI, + [in] DWORD dwOpenFlags, + [in] REFIID riid, + [out] IUnknown **ppIUnk); + + HRESULT GetCORSystemDirectory( + [out, size_is(cchBuffer)] LPWSTR szBuffer, + [in] DWORD cchBuffer, + [out] DWORD *pchBuffer); + + HRESULT FindAssembly( + [in] LPCWSTR szAppBase, + [in] LPCWSTR szPrivateBin, + [in] LPCWSTR szGlobalBin, + [in] LPCWSTR szAssemblyName, + [out, size_is(cchName)] LPWSTR szName, + [in] ULONG cchName, + [out] ULONG *pcName); + + HRESULT FindAssemblyModule( + [in] LPCWSTR szAppBase, + [in] LPCWSTR szPrivateBin, + [in] LPCWSTR szGlobalBin, + [in] LPCWSTR szAssemblyName, + [in] LPCWSTR szModuleName, + [out, size_is(cchName)] LPWSTR szName, + [in] ULONG cchName, + [out] ULONG *pcName); +} + cpp_quote("BOOL WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID);") cpp_quote("__int32 WINAPI _CorExeMain(void);") cpp_quote("__int32 WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR);")

1 0

Vincent Povirk : include: Rename cor.h to cor.idl.
by Alexandre Julliard 11 Nov '10

11 Nov '10

Module: wine Branch: master Commit: 498752dd109340004dfa83945e889bd0a900707e URL: http://source.winehq.org/git/wine.git/?a=commit;h=498752dd109340004dfa83945… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 5 11:54:13 2010 -0500 include: Rename cor.h to cor.idl. --- .gitignore | 1 + include/Makefile.in | 2 +- include/{cor.h => cor.idl} | 29 ++++++++--------------------- 3 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index b57ea54..a340baf 100644 --- a/.gitignore +++ b/.gitignore @@ -159,6 +159,7 @@ include/comcat.h include/commoncontrols.h include/config.h include/control.h +include/cor.h include/ctfutb.h include/ctxtcall.h include/d3d10.h diff --git a/include/Makefile.in b/include/Makefile.in index 1f434c7..3f4f9de 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -17,6 +17,7 @@ PUBLIC_IDL_H_SRCS = \ comcat.idl \ commoncontrols.idl \ control.idl \ + cor.idl \ ctfutb.idl \ ctxtcall.idl \ d3d10.idl \ @@ -142,7 +143,6 @@ SRCDIR_INCLUDES = \ commctrl.rh \ commdlg.h \ compobj.h \ - cor.h \ corerror.h \ corhdr.h \ cpl.h \ diff --git a/include/cor.h b/include/cor.idl similarity index 63% rename from include/cor.h rename to include/cor.idl index cdf89dd..4c5e639 100644 --- a/include/cor.h +++ b/include/cor.idl @@ -16,28 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_COR_H -#define __WINE_COR_H - -#include "ole2.h" +cpp_quote("#include <ole2.h>") /* FIXME: #include "specstrings.h" */ /* FIXME: #include "corerror.h" */ /* FIXME: #include "corhdr.h" */ -#ifdef __cplusplus -extern "C" { -#endif - -BOOL WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID); -__int32 WINAPI _CorExeMain(void); -__int32 WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR); -VOID WINAPI _CorImageUnloading(PVOID); -HRESULT WINAPI _CorValidateImage(PVOID*,LPCWSTR); -HRESULT WINAPI CoInitializeCor(DWORD); -void WINAPI CoUninitializeCor(void); - -#ifdef __cplusplus -} -#endif - -#endif /* __WINE_COR_H */ +cpp_quote("BOOL WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID);") +cpp_quote("__int32 WINAPI _CorExeMain(void);") +cpp_quote("__int32 WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR);") +cpp_quote("VOID WINAPI _CorImageUnloading(PVOID);") +cpp_quote("HRESULT WINAPI _CorValidateImage(PVOID*,LPCWSTR);") +cpp_quote("HRESULT WINAPI CoInitializeCor(DWORD);") +cpp_quote("void WINAPI CoUninitializeCor(void);")

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
87
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 November 2010