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

Piotr Caban : jscript: Fix create_exec_ctx implementation.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: ea5c94f84d099b32701a5827bf8f1d6a3f252532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5c94f84d099b32701a5827b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 16 01:17:00 2009 +0200 jscript: Fix create_exec_ctx implementation. --- dlls/jscript/engine.c | 2 ++ dlls/jscript/function.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b744904..f3ea33f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -179,6 +179,8 @@ HRESULT create_exec_ctx(IDispatch *this_obj, DispatchEx *var_disp, scope_chain_t if(!ctx) return E_OUTOFMEMORY; + ctx->ref = 1; + IDispatch_AddRef(this_obj); ctx->this_obj = this_obj; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 3863f7d..dac8d3e 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -197,9 +197,10 @@ static HRESULT invoke_constructor(FunctionInstance *function, LCID lcid, DISPPAR return hres; hres = invoke_source(function, (IDispatch*)_IDispatchEx_(this_obj), lcid, dp, retv, ei, caller); - jsdisp_release(this_obj); - if(FAILED(hres)) + if(FAILED(hres)) { + jsdisp_release(this_obj); return hres; + } V_VT(retv) = VT_DISPATCH; V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(this_obj);

1 0

Piotr Caban : jscript: Remove broken tests.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 8e1233ec4817d6bcced1a4e0b1aa22d463a25b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1233ec4817d6bcced1a4e0b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 16 01:16:45 2009 +0200 jscript: Remove broken tests. --- dlls/jscript/tests/api.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 6af9bb8..a80bd9f 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -619,9 +619,9 @@ for(i=2; i<10; i++) { equals(1.123, i); equals(2305843009200000000, i); equals(5.123, i); - equals(1/(1024*1024*1024*1024*1024*1024*1.9), i); + equals(21711, i); equals(1024*1024*1024*1024*1024*1024*1.9999, i); - equals(0.0000000000000000001, i); + equals(748382, i); equals(0.6, i); equals(4.65661287308e-10, i); ok((0).toString(i) === "0", "(0).toString("+i+") = " + (0).toString(i));

1 0

Piotr Caban : jscript: Improve Object_toString implementation.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: f5e678e8ddd22004ca40cf42f53a9882cb98e4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e678e8ddd22004ca40cf42f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 16 01:16:15 2009 +0200 jscript: Improve Object_toString implementation. --- dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 26 +++++++++++++++++++++++++- dlls/jscript/tests/api.js | 16 ++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index a6c34ba..370b3bd 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -68,6 +68,7 @@ typedef enum { JSCLASS_ARRAY, JSCLASS_BOOLEAN, JSCLASS_DATE, + JSCLASS_ERROR, JSCLASS_FUNCTION, JSCLASS_GLOBAL, JSCLASS_MATH, diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 0dca008..8e0aad6 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -35,13 +35,37 @@ static const WCHAR default_valueW[] = {'[','o','b','j','e','c','t',' ','O','b',' static HRESULT Object_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { + static const WCHAR formatW[] = {'[','o','b','j','e','c','t',' ','%','s',']',0}; + + static const WCHAR arrayW[] = {'A','r','r','a','y',0}; + static const WCHAR booleanW[] = {'B','o','o','l','e','a','n',0}; + static const WCHAR dateW[] = {'D','a','t','e',0}; + static const WCHAR errorW[] = {'E','r','r','o','r',0}; + static const WCHAR functionW[] = {'F','u','n','c','t','i','o','n',0}; + static const WCHAR mathW[] = {'M','a','t','h',0}; + static const WCHAR numberW[] = {'N','u','m','b','e','r',0}; + static const WCHAR objectW[] = {'O','b','j','e','c','t',0}; + static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; + static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; + /* Keep in sync with jsclass_t enum */ + static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, + functionW, NULL, mathW, numberW, objectW, regexpW, stringW}; + TRACE("\n"); + if(names[dispex->builtin_info->class] == NULL) { + ERR("dispex->builtin_info->class = %d\n", + dispex->builtin_info->class); + return E_FAIL; + } + if(retv) { V_VT(retv) = VT_BSTR; - V_BSTR(retv) = SysAllocString(default_valueW); + V_BSTR(retv) = SysAllocStringLen(NULL, 9+strlenW(names[dispex->builtin_info->class])); if(!V_BSTR(retv)) return E_OUTOFMEMORY; + + sprintfW(V_BSTR(retv), formatW, names[dispex->builtin_info->class]); } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b347846..6af9bb8 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -60,6 +60,22 @@ ok(tmp === "abc", "encodeURI('abc') = " + tmp); tmp = "" + new Object(); ok(tmp === "[object Object]", "'' + new Object() = " + tmp); +(tmp = new Array).f = Object.prototype.toString; +ok(tmp.f() === "[object Array]", "tmp.f() = " + tmp.f()); +(tmp = new Boolean).f = Object.prototype.toString; +ok(tmp.f() === "[object Boolean]", "tmp.f() = " + tmp.f()); +(tmp = new Date).f = Object.prototype.toString; +ok(tmp.f() === "[object Date]", "tmp.f() = " + tmp.f()); +(tmp = function() {}).f = Object.prototype.toString; +ok(tmp.f() === "[object Function]", "tmp.f() = " + tmp.f()); +Math.f = Object.prototype.toString; +ok(Math.f() === "[object Math]", "tmp.f() = " + tmp.f()); +(tmp = new Number).f = Object.prototype.toString; +ok(tmp.f() === "[object Number]", "tmp.f() = " + tmp.f()); +(tmp = new RegExp("")).f = Object.prototype.toString; +ok(tmp.f() === "[object RegExp]", "tmp.f() = " + tmp.f()); +(tmp = new String).f = Object.prototype.toString; +ok(tmp.f() === "[object String]", "tmp.f() = " + tmp.f()); ok("".length === 0, "\"\".length = " + "".length); ok(getVT("".length) == "VT_I4", "\"\".length = " + "".length);

1 0

Detlef Riekenberg : winemine: Add ellipses for IDM_CUSTOM.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 889d20f881257e38db3e5fceb6eee027f9b338ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=889d20f881257e38db3e5fceb… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jul 15 16:58:28 2009 +0200 winemine: Add ellipses for IDM_CUSTOM. --- programs/winemine/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemine/De.rc b/programs/winemine/De.rc index 63d1914..0b8fcc5 100644 --- a/programs/winemine/De.rc +++ b/programs/winemine/De.rc @@ -41,7 +41,7 @@ MENU_WINEMINE MENU DISCARDABLE MENUITEM "&Anfänger", IDM_BEGINNER MENUITEM "&Fortgeschrittene", IDM_ADVANCED MENUITEM "&Experten", IDM_EXPERT - MENUITEM "Benutzer&definiert", IDM_CUSTOM + MENUITEM "Benutzer&definiert...", IDM_CUSTOM MENUITEM SEPARATOR MENUITEM "&Beenden\tAlt+X", IDM_EXIT }

1 0

Ricardo Filipe : shdoclc: Fix Portuguese translation and convert to UTF8.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 4842b5c201b0bc0806347876390c1c2dc6dd7856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4842b5c201b0bc08063478763… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 07:16:33 2009 -0700 shdoclc: Fix Portuguese translation and convert to UTF8. --- dlls/shdoclc/Pt.rc | 57 ++++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/shdoclc/Pt.rc b/dlls/shdoclc/Pt.rc index 64379f4..d0bd1b7 100644 --- a/dlls/shdoclc/Pt.rc +++ b/dlls/shdoclc/Pt.rc @@ -18,11 +18,13 @@ #include "shdoclc.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { - IDS_MESSAGE_BOX_TITLE, "Wine Internet Explorer" + IDS_MESSAGE_BOX_TITLE, "Explorador de Internet Wine" } STRINGTABLE DISCARDABLE @@ -36,7 +38,7 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "Default" { MENUITEM "&Retroceder", IDM_GOBACKWARD - MENUITEM "&Avan�ar", IDM_GOFORWARD + MENUITEM "&Avançar", IDM_GOFORWARD MENUITEM SEPARATOR MENUITEM "&Guardar fundo como...", IDM_SAVEBACKGROUND MENUITEM "&Definir como fundo", IDM_SETWALLPAPER @@ -48,9 +50,9 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Criar &Atalho", IDM_CREATESHORTCUT MENUITEM "Adicionar aos &Favoritos", IDM_ADDFAVORITES - MENUITEM "&Ver C�digo Fonte", IDM_VIEWSOURCE + MENUITEM "&Ver Código Fonte", IDM_VIEWSOURCE MENUITEM SEPARATOR - MENUITEM "C&odifica��o", IDM_LANGUAGE + MENUITEM "C&odificação", IDM_LANGUAGE MENUITEM SEPARATOR MENUITEM "&Imprimir", IDM_PRINT MENUITEM "&Actualizar", _IDM_REFRESH @@ -61,10 +63,10 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "Imagem" { - MENUITEM "&Abrir liga��o", IDM_FOLLOWLINKC - MENUITEM "Abrir &liga��o numa nova janela", IDM_FOLLOWLINKN - MENUITEM "&Guardar liga��o como...", IDM_SAVETARGET - MENUITEM "&Imprimir liga��o", IDM_PRINTTARGET + MENUITEM "&Abrir ligação", IDM_FOLLOWLINKC + MENUITEM "Abrir &ligação numa nova janela", IDM_FOLLOWLINKN + MENUITEM "&Guardar ligação como...", IDM_SAVETARGET + MENUITEM "&Imprimir ligação", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "&Mostrar imagem", IDM_SHOWPICTURE MENUITEM "G&uardar imagem como...", IDM_SAVEPICTURE @@ -102,14 +104,14 @@ IDR_BROWSE_CONTEXT_MENU MENU { POPUP "&Seleccionar" { - MENUITEM "&C�lula", IDM_CELLSELECT + MENUITEM "&Célula", IDM_CELLSELECT MENUITEM "&Linha", IDM_ROWSELECT MENUITEM "C&oluna", IDM_COLUMNSELECT MENUITEM "&Tabela", IDM_TABLESELECT } MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "&Propriedades da C�lula", IDM_CELLPROPERTIES + MENUITEM "&Propriedades da Célula", IDM_CELLPROPERTIES MENUITEM "&Propriedades da Tabela", IDM_TABLEPROPERTIES } @@ -123,12 +125,12 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR } - POPUP "�ncora" + POPUP "Âncora" { MENUITEM "&Abrir", IDM_FOLLOWLINKC MENUITEM "A&brir numa nova janela", IDM_FOLLOWLINKN - MENUITEM "&Guardar liga��o como...", IDM_SAVETARGET - MENUITEM "&Imprimir liga��o", IDM_PRINTTARGET + MENUITEM "&Guardar ligação como...", IDM_SAVETARGET + MENUITEM "&Imprimir ligação", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "&Cortar", IDM_CUT MENUITEM "C&opiar", IDM_COPY @@ -148,10 +150,10 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "Imagem DYNSRC" { - MENUITEM "&Abrir liga��o", IDM_FOLLOWLINKC - MENUITEM "A&brir liga��o numa nova janela", IDM_FOLLOWLINKN - MENUITEM "&Guardar liga��o como...", IDM_SAVETARGET - MENUITEM "&Imprimir liga��o", IDM_PRINTTARGET + MENUITEM "&Abrir ligação", IDM_FOLLOWLINKC + MENUITEM "A&brir ligação numa nova janela", IDM_FOLLOWLINKN + MENUITEM "&Guardar ligação como...", IDM_SAVETARGET + MENUITEM "&Imprimir ligação", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "&Mostrar imagem", IDM_SHOWPICTURE MENUITEM "G&uardar video como...", IDM_SAVEPICTURE @@ -173,10 +175,10 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "Imagem ART" { - MENUITEM "&Abrir liga��o", IDM_FOLLOWLINKC - MENUITEM "A&brir liga��o numa nova janela", IDM_FOLLOWLINKN - MENUITEM "&Guardar liga��o como...", IDM_SAVETARGET - MENUITEM "&Imprimir liga��o", IDM_PRINTTARGET + MENUITEM "&Abrir ligação", IDM_FOLLOWLINKC + MENUITEM "A&brir ligação numa nova janela", IDM_FOLLOWLINKN + MENUITEM "&Guardar ligação como...", IDM_SAVETARGET + MENUITEM "&Imprimir ligação", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "&Mostrar imagem", IDM_SHOWPICTURE MENUITEM "G&uardar video como...", IDM_SAVEPICTURE @@ -190,10 +192,9 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Adicionar aos &Favoritos...", IDM_ADDFAVORITES MENUITEM SEPARATOR - MENUITEM SEPARATOR MENUITEM "I&niciar", IDM_DYNSRCPLAY MENUITEM "&Parar", IDM_DYNSRCSTOP - MENUITEM "&Recome�ar", IDM_IMGARTREWIND + MENUITEM "&Recomeçar", IDM_IMGARTREWIND MENUITEM SEPARATOR MENUITEM SEPARATOR MENUITEM "Propriedade&s", IDM_PROPERTIES @@ -226,8 +227,8 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Topo", IDM_SCROLL_TOP MENUITEM "Fundo", IDM_SCROLL_BOTTOM MENUITEM SEPARATOR - MENUITEM "P�gina Acima", IDM_SCROLL_PAGEUP - MENUITEM "P�gina abaixo", IDM_SCROLL_PAGEDOWN + MENUITEM "Página Acima", IDM_SCROLL_PAGEUP + MENUITEM "Página abaixo", IDM_SCROLL_PAGEDOWN MENUITEM SEPARATOR MENUITEM "Scroll Cima", IDM_SCROLL_UP MENUITEM "Scroll Baixo", IDM_SCROLL_DOWN @@ -240,8 +241,8 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM "Canto Esquerdo", IDM_SCROLL_LEFTEDGE MENUITEM "Canto Direito", IDM_SCROLL_RIGHTEDGE MENUITEM SEPARATOR - MENUITEM "P�gina esquerda", IDM_SCROLL_PAGELEFT - MENUITEM "P�gina direita", IDM_SCROLL_PAGERIGHT + MENUITEM "Página esquerda", IDM_SCROLL_PAGELEFT + MENUITEM "Página direita", IDM_SCROLL_PAGERIGHT MENUITEM SEPARATOR MENUITEM "Scroll Esquerda", IDM_SCROLL_LEFT MENUITEM "Scroll Direita", IDM_SCROLL_RIGHT

1 0

Ricardo Filipe : mshtml: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: ac67331d6dc794437b3e261530eed262ebbfd86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac67331d6dc794437b3e26153… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 07:05:42 2009 -0700 mshtml: Update Portuguese translation and convert to UTF8. --- dlls/mshtml/Pt.rc | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/Pt.rc b/dlls/mshtml/Pt.rc index 6a471e4..d9ebbb3 100644 --- a/dlls/mshtml/Pt.rc +++ b/dlls/mshtml/Pt.rc @@ -18,14 +18,16 @@ #include "resource.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "A interpreta��o de HTML est� desactivada." + IDS_HTMLDISABLED "A interpretação de HTML está desactivada." IDS_HTMLDOCUMENT "Documento HTML" - IDS_DOWNLOADING "Descarregando..." - IDS_INSTALLING "Instalando..." + IDS_DOWNLOADING "A descarregar..." + IDS_INSTALLING "A instalar..." } ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 @@ -33,8 +35,8 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Instalador Wine Gecko" FONT 8, "MS Shell Dlg" { - LTEXT "Esta aplica��o est� a tentar mostrar uma p�gina HTML. O Wine precisa que o Gecko " \ - "(Motor HTML Mozilla) seja instalado para mostrar a p�gina. Clique em Instalar se deseja que o Wine " \ + LTEXT "Esta aplicação está a tentar mostrar uma página HTML. O Wine precisa que o Gecko " \ + "(Motor HTML Mozilla) seja instalado para mostrar a página. Clique em Instalar se deseja que o Wine " \ "descarregue e instale o Gecko automaticamente.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Progresso", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Instalar", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP @@ -43,10 +45,10 @@ FONT 8, "MS Shell Dlg" IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Hiperliga��o" +CAPTION "Hiperligação" FONT 8, "MS Shell Dlg" { - GROUPBOX "Informa��o da Hiperliga��o", -1, 5, 5, 190, 55 + GROUPBOX "Informação da Hiperligação", -1, 5, 5, 190, 55 LTEXT "&Tipo:", -1, 10, 22, 20, 10 COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS LTEXT "&URL:", -1, 10, 42, 20, 10 @@ -54,3 +56,14 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Ricardo Filipe : gphoto2.ds: Fix Portuguese translation and convert to UTF8 .
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 1656ddd06b5aeefe9e6209a9a69338b8635bdb8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1656ddd06b5aeefe9e6209a9a… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 06:49:34 2009 -0700 gphoto2.ds: Fix Portuguese translation and convert to UTF8. --- dlls/gphoto2.ds/gphoto2_Pt.rc | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Pt.rc b/dlls/gphoto2.ds/gphoto2_Pt.rc index c89d6ba..7e131f3 100644 --- a/dlls/gphoto2.ds/gphoto2_Pt.rc +++ b/dlls/gphoto2.ds/gphoto2_Pt.rc @@ -20,38 +20,40 @@ #include "resource.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ficheiros na C�mara" +CAPTION "Ficheiros na Câmara" MENU 20545 FONT 8, "MS Sans Serif" BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 DEFPUSHBUTTON "Importar Seleccionado",IDC_IMPORT,152,252,72,14 - PUSHBUTTON "Pr�-visualizar",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Pré-visualizar",IDC_FETCH,7,252,64,14 PUSHBUTTON "Importar tudo",IDC_IMPORTALL,80,252,64,14 - CONTROL "Passar � frente",IDC_SKIP,"Bot�o", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + CONTROL "Passar à frente",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 PUSHBUTTON "Sair",IDC_EXIT,315,252,50,14 END IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND -CAPTION "Transferindo" +CAPTION "A transferir" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Transferindo... Por favor espere",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "A transferir... Por favor espere",IDC_STATIC,5,19,176,8, SS_CENTER END IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER -CAPTION "A ligar � c�mara" +CAPTION "A ligar à câmara" FONT 8, "MS Sans Serif" BEGIN - CONTROL "",IDC_BITMAP,"Est�tico",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 - LTEXT "A ligar � c�mara... Por favor espere",IDC_STATIC,128,58, + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "A ligar à câmara... Por favor espere",IDC_STATIC,128,58, 116,8 END

1 0

Andrew Nguyen : kernel32: Implement WTSGetActiveConsoleSessionId as a stub.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: f63f4026cf7a3e8c761095069a0a94c8ccde1a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63f4026cf7a3e8c761095069… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jul 15 22:00:13 2009 -0500 kernel32: Implement WTSGetActiveConsoleSessionId as a stub. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 9 +++++++++ include/winbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index fc3b6ae..2fd1b10 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1133,7 +1133,7 @@ @ stdcall VirtualQuery(ptr ptr long) @ stdcall VirtualQueryEx(long ptr ptr long) @ stdcall VirtualUnlock(ptr long) -# @ stub WTSGetActiveConsoleSessionId +@ stdcall WTSGetActiveConsoleSessionId() @ stdcall WaitCommEvent(long ptr ptr) @ stdcall WaitForDebugEvent(ptr long) @ stdcall WaitForMultipleObjects(long ptr long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4e74782..f90b294 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3324,3 +3324,12 @@ HRESULT WINAPI RegisterApplicationRestart(PCWSTR pwzCommandLine, DWORD dwFlags) return S_OK; } + +/********************************************************************** + * WTSGetActiveConsoleSessionId (KERNEL32.@) + */ +DWORD WINAPI WTSGetActiveConsoleSessionId(void) +{ + FIXME("stub\n"); + return 0; +} diff --git a/include/winbase.h b/include/winbase.h index d7d8773..613114c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2136,6 +2136,7 @@ WINBASEAPI BOOL WINAPI VirtualProtectEx(HANDLE,LPVOID,SIZE_T,DWORD,LPDWOR WINBASEAPI SIZE_T WINAPI VirtualQuery(LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T); WINBASEAPI SIZE_T WINAPI VirtualQueryEx(HANDLE,LPCVOID,PMEMORY_BASIC_INFORMATION,SIZE_T); WINBASEAPI BOOL WINAPI VirtualUnlock(LPVOID,SIZE_T); +WINBASEAPI DWORD WINAPI WTSGetActiveConsoleSessionId(void); WINBASEAPI BOOL WINAPI WaitCommEvent(HANDLE,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI WaitForDebugEvent(LPDEBUG_EVENT,DWORD); WINBASEAPI DWORD WINAPI WaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DWORD);

1 0

Roderick Colenbrander : winex11: Add a function for retrieving the bitmap GC.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 618b410aa88d2614f767f2dbfc0751ae66f43c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=618b410aa88d2614f767f2dbf… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Jul 9 21:51:05 2009 +0200 winex11: Add a function for retrieving the bitmap GC. --- dlls/winex11.drv/bitmap.c | 20 ++++++++++++++++---- dlls/winex11.drv/brush.c | 11 ++++++----- dlls/winex11.drv/dib.c | 6 +++--- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/x11drv.h | 5 ++--- 5 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index facf405..4fb3ef0 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -36,6 +36,17 @@ X_PHYSBITMAP BITMAP_stock_phys_bitmap = { 0 }; /* phys bitmap for the default s static XContext bitmap_context; /* X context to associate a phys bitmap to a handle */ +GC get_bitmap_gc(int depth) +{ + switch(depth) + { + case 1: + return BITMAP_monoGC; + default: + return BITMAP_colorGC; + } +} + /*********************************************************************** * X11DRV_BITMAP_Init */ @@ -157,11 +168,12 @@ BOOL CDECL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID } else /* else clear the bitmap */ { + GC gc = get_bitmap_gc(physBitmap->pixmap_depth); wine_tsx11_lock(); - XSetFunction( gdi_display, BITMAP_GC(physBitmap), GXclear ); - XFillRectangle( gdi_display, physBitmap->pixmap, BITMAP_GC(physBitmap), 0, 0, + XSetFunction( gdi_display, gc, GXclear ); + XFillRectangle( gdi_display, physBitmap->pixmap, gc, 0, 0, bitmap.bmWidth, bitmap.bmHeight ); - XSetFunction( gdi_display, BITMAP_GC(physBitmap), GXcopy ); + XSetFunction( gdi_display, gc, GXcopy ); wine_tsx11_unlock(); } return TRUE; @@ -405,7 +417,7 @@ LONG CDECL X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ) FIXME("Unhandled bits:%d\n", bitmap.bmBitsPixel); } - XPutImage( gdi_display, physBitmap->pixmap, BITMAP_GC(physBitmap), + XPutImage( gdi_display, physBitmap->pixmap, get_bitmap_gc(physBitmap->pixmap_depth), image, 0, 0, 0, 0, bitmap.bmWidth, height ); HeapFree( GetProcessHeap(), 0, image->data ); image->data = NULL; diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 612968c..3368bbf 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -103,13 +103,14 @@ static const COLORREF WHITE = RGB(0xff, 0xff, 0xff); /*********************************************************************** * BRUSH_DitherColor */ -static Pixmap BRUSH_DitherColor( COLORREF color ) +static Pixmap BRUSH_DitherColor( COLORREF color, int depth) { /* X image for building dithered pixmap */ static XImage *ditherImage = NULL; static COLORREF prevColor = 0xffffffff; unsigned int x, y; Pixmap pixmap; + GC gc = get_bitmap_gc(depth); if (!ditherImage) { @@ -144,7 +145,7 @@ static Pixmap BRUSH_DitherColor( COLORREF color ) } pixmap = XCreatePixmap( gdi_display, root_window, MATRIX_SIZE, MATRIX_SIZE, screen_depth ); - XPutImage( gdi_display, pixmap, BITMAP_colorGC, ditherImage, 0, 0, + XPutImage( gdi_display, pixmap, gc, ditherImage, 0, 0, 0, 0, MATRIX_SIZE, MATRIX_SIZE ); wine_tsx11_unlock(); @@ -185,7 +186,7 @@ static void BRUSH_SelectSolidBrush( X11DRV_PDEVICE *physDev, COLORREF color ) if ((physDev->depth > 1) && (screen_depth <= 8) && !X11DRV_IsSolidColor( color )) { /* Dithered brush */ - physDev->brush.pixmap = BRUSH_DitherColor( color ); + physDev->brush.pixmap = BRUSH_DitherColor( color, physDev->depth ); physDev->brush.fillStyle = FillTiled; physDev->brush.pixel = 0; } @@ -222,7 +223,7 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) bitmap.bmWidth, bitmap.bmHeight, 1); /* FIXME: should probably convert to monochrome instead */ XCopyPlane( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - BITMAP_monoGC, 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0, 1 ); + get_bitmap_gc(1), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0, 1 ); } else { @@ -230,7 +231,7 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) bitmap.bmWidth, bitmap.bmHeight, physBitmap->pixmap_depth ); XCopyArea( gdi_display, physBitmap->pixmap, physDev->brush.pixmap, - BITMAP_GC(physBitmap), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0 ); + get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, bitmap.bmWidth, bitmap.bmHeight, 0, 0 ); } wine_tsx11_unlock(); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 6df4137..07ce9e1 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3984,7 +3984,7 @@ INT CDECL X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start descr.lines = tmpheight >= 0 ? lines : -lines; descr.depth = physBitmap->pixmap_depth; descr.drawable = physBitmap->pixmap; - descr.gc = BITMAP_GC(physBitmap); + descr.gc = get_bitmap_gc(physBitmap->pixmap_depth); descr.xSrc = 0; descr.ySrc = 0; descr.xDest = 0; @@ -4138,7 +4138,7 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start descr.lines = lines; descr.depth = physBitmap->pixmap_depth; descr.drawable = physBitmap->pixmap; - descr.gc = BITMAP_GC(physBitmap); + descr.gc = get_bitmap_gc(physBitmap->pixmap_depth); descr.width = dib.dsBm.bmWidth; descr.height = dib.dsBm.bmHeight; descr.xDest = 0; @@ -4353,7 +4353,7 @@ static void X11DRV_DIB_DoUpdateDIBSection(X_PHYSBITMAP *physBitmap, BOOL toDIB) GetObjectW( physBitmap->hbitmap, sizeof(bitmap), &bitmap ); X11DRV_DIB_DoCopyDIBSection(physBitmap, toDIB, physBitmap->colorMap, physBitmap->nColorMap, - physBitmap->pixmap, BITMAP_GC(physBitmap), + physBitmap->pixmap, get_bitmap_gc(physBitmap->pixmap_depth), 0, 0, 0, 0, bitmap.bmWidth, bitmap.bmHeight); } diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 8d74c77..abdd505 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1072,7 +1072,7 @@ X11DRV_GetPixel( X11DRV_PDEVICE *physDev, INT x, INT y ) /* to avoid a BadMatch error */ if (!pixmap) pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, physDev->depth ); - XCopyArea( gdi_display, physDev->drawable, pixmap, BITMAP_colorGC, + XCopyArea( gdi_display, physDev->drawable, pixmap, get_bitmap_gc(physDev->depth), physDev->dc_rect.left + pt.x, physDev->dc_rect.top + pt.y, 1, 1, 0, 0 ); image = XGetImage( gdi_display, pixmap, 0, 0, 1, 1, AllPlanes, ZPixmap ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 013a359..10af183 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -144,11 +144,10 @@ typedef struct } X11DRV_PDEVICE; - /* GCs used for B&W and color bitmap operations */ -extern GC BITMAP_monoGC, BITMAP_colorGC; extern X_PHYSBITMAP BITMAP_stock_phys_bitmap; /* phys bitmap for the default stock bitmap */ -#define BITMAP_GC(physBitmap) (((physBitmap)->pixmap_depth == 1) ? BITMAP_monoGC : BITMAP_colorGC) +/* Retrieve the GC used for bitmap operations */ +extern GC get_bitmap_gc(int depth); /* Wine driver X11 functions */

1 0

Stefan Dösinger : wined3d: Use the unmodified source in MOVA.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 9d14dcab6866f85e99bccb1b1848fd04ad38932e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d14dcab6866f85e99bccb1b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 15 20:57:58 2009 +0200 wined3d: Use the unmodified source in MOVA. The code removed by this patch was a leftover from the time when we tried to emulate MOVA with a plain ARL, which only supports one source in plain ARB. This breaks the more sophisticated MOVA and 4 component ADDR register we have now however. --- dlls/wined3d/arb_program_shader.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0c3ffa1..f0ea0b6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1603,15 +1603,13 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) char src0_param[256]; if(ins->handler_idx == WINED3DSIH_MOVA) { - struct wined3d_shader_src_param tmp_src = ins->src[0]; char write_mask[6]; if(ctx->target_version >= NV2) { shader_hw_map2gl(ins); return; } - tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; - shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); + shader_arb_get_src_param(ins, &ins->src[0], 0, src0_param); shader_arb_get_write_mask(ins, &ins->dst[0], write_mask); /* This implements the mova formula used in GLSL. The first two instructions

1 0