February 2010 - Wine-commits

Luca Bennati : cmdlgtst: Fix Italian translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: e8fb8fb1a11a77300803694dcfa1ee24c43f904c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8fb8fb1a11a77300803694dc… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Feb 1 11:19:44 2010 +0100 cmdlgtst: Fix Italian translation. --- programs/cmdlgtst/It.rc | 86 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 73 insertions(+), 13 deletions(-) diff --git a/programs/cmdlgtst/It.rc b/programs/cmdlgtst/It.rc index c77acbe..1eac25c 100644 --- a/programs/cmdlgtst/It.rc +++ b/programs/cmdlgtst/It.rc @@ -4,6 +4,7 @@ * * Copyright (c) 1999 Eric Williams. * Copyright 2003 Ivan Leo Puoti + * Copyright 2010 Luca Bennati * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,24 +47,24 @@ CmdlgtstMenu MENU MENUITEM "&Colori", CM_U_COLOR MENUITEM "&Carattere", CM_U_FONT MENUITEM SEPARATOR - MENUITEM "Trova &Testo", CM_U_FIND - MENUITEM "&Sostituisci Testo", CM_U_REPLACE + MENUITEM "&Trova", CM_U_FIND + MENUITEM "S&ostituisci", CM_U_REPLACE MENUITEM SEPARATOR - MENUITEM "&Stampa", CM_U_PRINT - MENUITEM "Installazione Pa&gina", CM_U_PAGESETUP + MENUITEM "Sta&mpa", CM_U_PRINT + MENUITEM "&Impostazione Pagina", CM_U_PAGESETUP } - POPUP "B&andiere" + POPUP "&Bandiere" { - MENUITEM "Fil&e", CM_F_FILE + MENUITEM "&File", CM_F_FILE MENUITEM SEPARATOR MENUITEM "&Colori", CM_F_COLOR - MENUITEM "&Carattere", CM_F_FONT + MENUITEM "C&arattere", CM_F_FONT MENUITEM SEPARATOR - MENUITEM "Trova/&Sostituisci", CM_F_FINDREPLACE + MENUITEM "&Trova/Sostituisci", CM_F_FINDREPLACE MENUITEM SEPARATOR MENUITEM "&Stampa", CM_F_PRINT - MENUITEM "Installazione Pa&gina", CM_F_PAGESETUP + MENUITEM "&Impostazione Pagina", CM_F_PAGESETUP } POPUP "&Aiuto" @@ -164,7 +165,7 @@ CAPTION "Stampa / Configurazione di stampa dei Flags" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14 - PUSHBUTTON "Cancella", IDCANCEL, 180, 24, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 180, 24, 50, 14 PUSHBUTTON "Aiuto", CM_R_HELP, 180, 42, 50, 14 CHECKBOX "PD_ALLPAGES", I_PD_ALLPAGES, 12, 12, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "PD_COLLATE", I_PD_COLLATE, 12, 24, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -190,13 +191,41 @@ FONT 8, "MS Shell Dlg" CHECKBOX "PD_USEDEVMODECOPIES", I_PD_USEDEVMODECOPIES, 12, 264, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP } +PageSetup_Flags_Dialog DIALOG 4, 17, 239, 245 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION " " +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK", IDOK, 180, 6, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 180, 24, 50, 14 + CHECKBOX "PSD_DEFAULTMINMARGINS", I_PSD_DEFAULTMINMARGINS, 12, 12, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEMARGINS", I_PSD_DISABLEMARGINS, 12, 24, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEORIENTATION", I_PSD_DISABLEORIENTATION, 12, 36, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPAGEPAINTING", I_PSD_DISABLEPAGEPAINTING, 12, 48, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPAPER", I_PSD_DISABLEPAPER, 12, 60, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_DISABLEPRINTER", I_PSD_DISABLEPRINTER, 12, 72, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGEPAINTHOOK", I_PSD_ENABLEPAGEPAINTHOOK, 12, 84, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPHOOK", I_PSD_ENABLEPAGESETUPHOOK, 12, 96, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATE", I_PSD_ENABLEPAGESETUPTEMPLATE, 12, 108, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATEHANDLE", I_PSD_ENABLEPAGESETUPTEMPLATEHANDLE, 12, 120, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INHUNDREDTHSOFMILLIMETERS", I_PSD_INHUNDREDTHSOFMILLIMETERS, 12, 132, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INTHOUSANDTHSOFINCHES", I_PSD_INTHOUSANDTHSOFINCHES, 12, 144, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_INWININIINTLMEASURE", I_PSD_INWININIINTLMEASURE, 12, 156, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_MARGINS", I_PSD_MARGINS, 12, 168, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_MINMARGINS", I_PSD_MINMARGINS, 12, 180, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_NONETWORKBUTTON", I_PSD_NONETWORKBUTTON, 12, 192, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_NOWARNING", I_PSD_NOWARNING, 12, 204, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_RETURNDEFAULT", I_PSD_RETURNDEFAULT, 12, 216, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "PSD_SHOWHELP", I_PSD_SHOWHELP, 12, 228, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +} + File_Flags_Dialog DIALOG 6, 15, 207, 227 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Apri File/Salva File Flags" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 148, 6, 50, 14 - PUSHBUTTON "Cancella", IDCANCEL, 148, 24, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 148, 24, 50, 14 PUSHBUTTON "Aiuto", CM_R_HELP, 148, 42, 50, 14 CHECKBOX "OFN_ALLOWMULTISELECT", I_OFN_ALLOWMULTISELECT, 12, 12, 132, 12, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "OFN_CREATEPROMPT", I_OFN_CREATEPROMPT, 12, 24, 132, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -236,11 +265,42 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "OK", IDOK, 70, 276, 50, 14 LTEXT "Common Dialog Test Jig Exerciser, versione 1.20", -1, 13, 48, 168, 12 LTEXT "Questo programma testa COMMDLG per Wine.", -1, 12, 72, 168, 12 - LTEXT "Le Bandiere sono specificate nel menÃ¹ bandiere.", -1, 12, 96, 168, 12 + LTEXT "Le Bandiere sono specificate nel menù bandiere.", -1, 12, 96, 168, 12 LTEXT "La finestra di dialogo dei colori modifica il colore dello sfondo.", -1, 12, 120, 168, 12 - LTEXT "La finestra di dialogo dei Caratteri modifica tutti i Caratteri, e il loro colore se CF_EFFECTS e selezionato.", -1, 12, 144, 168, 24 + LTEXT "La finestra di dialogo dei caratteri modifica tutti i caratteri e il loro colore se CF_EFFECTS è selezionato.", -1, 12, 144, 168, 24 LTEXT "L'angolo in alto a sinistra indica il percorso completo e il titolo dell'ultima operazione di apertura o salvataggio conclusa con successo.", -1, 12, 180, 168, 24 LTEXT "(c) 1999-2000, Eric Williams. I diritti sono concessi sotto la licenza di WINE. Non nascondere i sorgenti... condividili!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2 } + +PAGESETUPDLGORD_CSTM DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "TFT test dialog" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "Carta", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&Dimensione:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 80, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + COMBOBOX cmb1, 150, 110, 80, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "&Barra:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Orientazione", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Ritratto", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Paesaggio", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Bordi", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&Sinistra:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "D&estra:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Testa:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Fondo:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Annulla", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "Sta&mpante...", psh3, 184, 220, 48, 14 +END

1 0

Maarten Lankhorst : userenv: Implement DestroyEnvironmentBlock.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 83486aaf668a7319c1a0c740c1c6ea67b737dc96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83486aaf668a7319c1a0c740c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Feb 1 10:35:37 2010 +0100 userenv: Implement DestroyEnvironmentBlock. --- dlls/userenv/userenv.spec | 2 +- dlls/userenv/userenv_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index 26475e5..8b0b749 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -1,5 +1,5 @@ @ stdcall CreateEnvironmentBlock(ptr ptr long) -@ stub DestroyEnvironmentBlock +@ stdcall DestroyEnvironmentBlock(ptr) @ stdcall ExpandEnvironmentStringsForUserA(ptr str ptr long) @ stdcall ExpandEnvironmentStringsForUserW(ptr wstr ptr long) @ stdcall GetAllUsersProfileDirectoryA(ptr ptr) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 8782c94..38fb64c 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -65,6 +65,17 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, return FALSE; } +BOOL WINAPI DestroyEnvironmentBlock(LPVOID lpEnvironment) +{ + NTSTATUS r; + + TRACE("%p\n", lpEnvironment); + r = RtlDestroyEnvironment(lpEnvironment); + if (r == STATUS_SUCCESS) + return TRUE; + return FALSE; +} + BOOL WINAPI ExpandEnvironmentStringsForUserA( HANDLE hToken, LPCSTR lpSrc, LPSTR lpDest, DWORD dwSize ) {

1 0

Dan Kegel : ntdll: Fix large block realloc annotation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 20430f6edefe0f299fe27303ec9e153873023ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20430f6edefe0f299fe27303e… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Feb 1 11:25:35 2010 -0800 ntdll: Fix large block realloc annotation. --- dlls/ntdll/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4c73184..b440b61 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -767,6 +767,7 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz } memcpy( new_ptr, ptr, arena->data_size ); free_large_block( heap, flags, ptr ); + notify_free( ptr ); return new_ptr; } @@ -1811,7 +1812,6 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size if (!subheap) { if (!(ret = realloc_large_block( heapPtr, flags, ptr, size ))) goto oom; - notify_free( ptr ); goto done; }

1 0

Detlef Riekenberg : mapi32/tests: Fix a typo in a comment.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: e9776726618a5363c6395401e1388c30c5e449e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9776726618a5363c6395401e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 1 20:47:31 2010 +0100 mapi32/tests: Fix a typo in a comment. --- dlls/mapi32/tests/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c index 0d1022a..0edac07 100644 --- a/dlls/mapi32/tests/util.c +++ b/dlls/mapi32/tests/util.c @@ -242,7 +242,7 @@ START_TEST(util) /* We call MAPIInitialize here for the benefit of native extended MAPI * providers which crash in the HexFromBin tests when MAPIInitialize has - * not been called. Since MAPIInitialize is irrelevant for HexFfromBin on + * not been called. Since MAPIInitialize is irrelevant for HexFromBin on * Wine, we do not care whether MAPIInitialize succeeds. */ if (pMAPIInitialize) ret = pMAPIInitialize(NULL);

1 0

Michael Stefaniuc : dinput: Don' t use HIWORD to check if a REFGUID is a DIPROP.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 2004db1bb1b7aca9259a756449c3ddf3872426a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2004db1bb1b7aca9259a75644… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 2 00:11:49 2010 +0100 dinput: Don't use HIWORD to check if a REFGUID is a DIPROP. --- dlls/dinput/device.c | 4 ++-- dlls/dinput/dinput_private.h | 2 ++ dlls/dinput/joystick.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c0f15ff..a5c61ab 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -872,7 +872,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty( TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { @@ -906,7 +906,7 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SetProperty( TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index ddb9aa0..16b4559 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -65,4 +65,6 @@ typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _dump_diactionformatA(LPDIACTIONFORMATA); +#define IS_DIPROP(x) (((ULONG_PTR)(x) >> 16) == 0) + #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */ diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 84e45c9..0f39a6d 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -53,7 +53,7 @@ HRESULT WINAPI JoystickAGenericImpl_SetProperty( if (TRACE_ON(dinput)) _dump_DIPROPHEADER(ph); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR)DIPROP_RANGE: { LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; @@ -230,7 +230,7 @@ HRESULT WINAPI JoystickAGenericImpl_GetProperty( if (TRACE_ON(dinput)) _dump_DIPROPHEADER(pdiph); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR) DIPROP_RANGE: { LPDIPROPRANGE pr = (LPDIPROPRANGE)pdiph; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 6c3c8cc..6da6066 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -847,7 +847,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("ph.dwSize = %d, ph.dwHeaderSize =%d, ph.dwObj = %d, ph.dwHow= %d\n", ph->dwSize, ph->dwHeaderSize, ph->dwObj, ph->dwHow); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR)DIPROP_CALIBRATIONMODE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; @@ -898,7 +898,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { case (DWORD_PTR) DIPROP_AUTOCENTER: diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 3692878..4f6aac5 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -447,7 +447,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (HIWORD(rguid)) return DI_OK; + if (!IS_DIPROP(rguid)) return DI_OK; switch (LOWORD(rguid)) { diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 4809c56..e05d9e2 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -587,7 +587,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, TRACE("(%p) %s,%p\n", This, debugstr_guid(rguid), pdiph); _dump_DIPROPHEADER(pdiph); - if (!HIWORD(rguid)) { + if (IS_DIPROP(rguid)) { switch (LOWORD(rguid)) { case (DWORD_PTR) DIPROP_GRANULARITY: { LPDIPROPDWORD pr = (LPDIPROPDWORD) pdiph;

1 0

Frédéric Delanoy : wordpad: Fix typo in keyboard shortcut.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 51a6153672576ddd7b6d889172f7088bec088644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a6153672576ddd7b6d88917… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Feb 1 23:34:47 2010 +0100 wordpad: Fix typo in keyboard shortcut. --- programs/wordpad/Da.rc | 2 +- programs/wordpad/En.rc | 2 +- programs/wordpad/Fr.rc | 2 +- programs/wordpad/Hu.rc | 2 +- programs/wordpad/It.rc | 2 +- programs/wordpad/Ja.rc | 2 +- programs/wordpad/Ko.rc | 2 +- programs/wordpad/Lt.rc | 2 +- programs/wordpad/Nl.rc | 2 +- programs/wordpad/No.rc | 2 +- programs/wordpad/Pl.rc | 2 +- programs/wordpad/Pt.rc | 2 +- programs/wordpad/Ru.rc | 2 +- programs/wordpad/Si.rc | 2 +- programs/wordpad/Sv.rc | 2 +- programs/wordpad/Tr.rc | 2 +- programs/wordpad/Uk.rc | 2 +- programs/wordpad/Zh.rc | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51a6153672576ddd7b6d8…

1 0

Alexandre Julliard : shell: Explicitly convert icons to 16-bit instead of casting handles.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 03f7bbdbf7798d2f5154f4a98ca17adecdc1b8e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f7bbdbf7798d2f5154f4a98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 1 17:03:23 2010 +0100 shell: Explicitly convert icons to 16-bit instead of casting handles. --- dlls/shell.dll16/Makefile.in | 2 +- dlls/shell.dll16/shell.c | 67 +++++++++++++++++++++++++++++++++-------- 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in index 8dff0a9..36b23fc 100644 --- a/dlls/shell.dll16/Makefile.in +++ b/dlls/shell.dll16/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = shell.dll16 -IMPORTS = shell32 user32 advapi32 kernel32 kernel +IMPORTS = shell32 user32 gdi32 advapi32 kernel32 kernel EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,shell32.dll EXTRARCFLAGS = -O res16 diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index b8d99fd..be8ffeb 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -52,7 +52,6 @@ extern HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpF LPCSTR lpParameters,LPCSTR lpDirectory, INT iShowCmd, void *callback); -#define HICON_16(h32) (LOWORD(h32)) #define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) #define HINSTANCE_16(h32) (LOWORD(h32)) @@ -84,6 +83,50 @@ static HICON convert_icon_to_32( HICON16 icon16 ) return ret; } +static HICON16 convert_icon_to_16( HINSTANCE16 inst, HICON icon ) +{ + static HICON16 (WINAPI *pCreateIcon16)(HINSTANCE16,INT16,INT16,BYTE,BYTE,LPCVOID,LPCVOID); + ICONINFO info; + BITMAP bm; + UINT and_size, xor_size; + void *xor_bits = NULL, *and_bits; + HICON16 handle = 0; + + if (!pCreateIcon16 && + !(pCreateIcon16 = (void *)GetProcAddress( GetModuleHandleA("user.exe16"), "CreateIcon16" ))) + return 0; + + if (!(GetIconInfo( icon, &info ))) return 0; + GetObjectW( info.hbmMask, sizeof(bm), &bm ); + and_size = bm.bmHeight * bm.bmWidthBytes; + if (!(and_bits = HeapAlloc( GetProcessHeap(), 0, and_size ))) goto done; + GetBitmapBits( info.hbmMask, and_size, and_bits ); + if (info.hbmColor) + { + GetObjectW( info.hbmColor, sizeof(bm), &bm ); + xor_size = bm.bmHeight * bm.bmWidthBytes; + if (!(xor_bits = HeapAlloc( GetProcessHeap(), 0, xor_size ))) goto done; + GetBitmapBits( info.hbmColor, xor_size, xor_bits ); + } + else + { + bm.bmHeight /= 2; + xor_bits = (char *)and_bits + and_size / 2; + } + handle = pCreateIcon16( inst, bm.bmWidth, bm.bmHeight, bm.bmPlanes, bm.bmBitsPixel, + and_bits, xor_bits ); +done: + HeapFree( GetProcessHeap(), 0, and_bits ); + if (info.hbmColor) + { + HeapFree( GetProcessHeap(), 0, xor_bits ); + DeleteObject( info.hbmColor ); + } + DeleteObject( info.hbmMask ); + DestroyIcon( icon ); + return handle; +} + /*********************************************************************** * DllEntryPoint [SHELL.101] * @@ -239,7 +282,7 @@ HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16 hInstance, if ((ret != 0xffffffff) && ret) { int i; - for (i = 0; i < n; i++) RetPtr[i] = HICON_16(icons[i]); + for (i = 0; i < n; i++) RetPtr[i] = convert_icon_to_16(hInstance, icons[i]); } else { @@ -257,19 +300,18 @@ HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16 hInstance, HICON16 WINAPI ExtractIcon16( HINSTANCE16 hInstance, LPCSTR lpszExeFileName, UINT16 nIconIndex ) { TRACE("\n"); - return HICON_16(ExtractIconA(HINSTANCE_32(hInstance), lpszExeFileName, nIconIndex)); + return convert_icon_to_16( hInstance, ExtractIconA(NULL, lpszExeFileName, nIconIndex) ); } /************************************************************************* * ExtractIconEx (SHELL.40) */ -HICON16 WINAPI ExtractIconEx16( +UINT16 WINAPI ExtractIconEx16( LPCSTR lpszFile, INT16 nIconIndex, HICON16 *phiconLarge, HICON16 *phiconSmall, UINT16 nIcons ) { HICON *ilarge,*ismall; - UINT16 ret; - int i; + int i, ret; if (phiconLarge) ilarge = HeapAlloc(GetProcessHeap(),0,nIcons*sizeof(HICON)); @@ -279,15 +321,15 @@ HICON16 WINAPI ExtractIconEx16( ismall = HeapAlloc(GetProcessHeap(),0,nIcons*sizeof(HICON)); else ismall = NULL; - ret = HICON_16(ExtractIconExA(lpszFile,nIconIndex,ilarge,ismall,nIcons)); + ret = ExtractIconExA(lpszFile,nIconIndex,ilarge,ismall,nIcons); if (ilarge) { - for (i=0;i<nIcons;i++) - phiconLarge[i]=HICON_16(ilarge[i]); + for (i=0;i<ret;i++) + phiconLarge[i] = convert_icon_to_16(0, ilarge[i]); HeapFree(GetProcessHeap(),0,ilarge); } if (ismall) { - for (i=0;i<nIcons;i++) - phiconSmall[i]=HICON_16(ismall[i]); + for (i=0;i<ret;i++) + phiconSmall[i] = convert_icon_to_16(0, ismall[i]); HeapFree(GetProcessHeap(),0,ismall); } return ret; @@ -301,8 +343,7 @@ HICON16 WINAPI ExtractIconEx16( */ HICON16 WINAPI ExtractAssociatedIcon16(HINSTANCE16 hInst, LPSTR lpIconPath, LPWORD lpiIcon) { - return HICON_16(ExtractAssociatedIconA(HINSTANCE_32(hInst), lpIconPath, - lpiIcon)); + return convert_icon_to_16( hInst, ExtractAssociatedIconA(NULL, lpIconPath, lpiIcon) ); } /*************************************************************************

1 0

Jaime Rave : appwiz.cpl: Added Spanish translation.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 88f81550b48c732e8967c8e8ba0cef3394fca563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f81550b48c732e8967c8e8b… Author: Jaime Rave <jaimerave(a)ubuntu-co.com> Date: Sat Jan 30 09:07:46 2010 -0500 appwiz.cpl: Added Spanish translation. --- dlls/appwiz.cpl/Es.rc | 86 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Makefile.in | 1 + 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Es.rc b/dlls/appwiz.cpl/Es.rc new file mode 100644 index 0000000..7826e06 --- /dev/null +++ b/dlls/appwiz.cpl/Es.rc @@ -0,0 +1,86 @@ +/* +* Add/Remove Programs Spanish resources +* +* Copyright 2010 Jaime Rave +* +* 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 "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CPL_TITLE, "Agregar/Quitar Programas" + IDS_CPL_DESC, "Te permite instalar nuevo software, o desinstalar el software existente de tu computador." + IDS_TAB1_TITLE, "Aplicaciones" + + IDS_UNINSTALL_FAILED, "Imposible ejecutar el desinstalador, '%s'. ¿Desea quitar la entrada de desinstalación de este programa del registro?" + IDS_NOT_SPECIFIED, "No especificado" + + IDS_COLUMN_NAME, "Nombre" + IDS_COLUMN_PUBLISHER, "Editor" + IDS_COLUMN_VERSION, "Versión" + IDS_INSTALL_FILTER, "Programas de instalación\0*instal*.exe;*setup*.exe;*.msi\0Programas (*.exe)\0*.exe\0Todos los archivos (*.*)\0*.*\0\0" + + IDS_REMOVE, "&Quitar..." + IDS_MODIFY_REMOVE, "&Modificar/Quitar..." +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalar/Desinstalar" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Para instalar un nuevo programa desde un disquete, unidad de CD-ROM, o tu disco duro, haz clic en instalar.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Instalar...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "El siguiete software puede ser eliminado automaticamente. Para quitar un programa o modificar sus componentes instalados, seleccionanlo en la lista y haz clic en Modificar/Quitar.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Información de soporte...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Modificar...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "Quita&r...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Información de Soporte" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Aceptar", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "La siguiente información puede ser usada para obtener soporte técnico para %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Editor:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versión:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contacto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Información de Soporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Teléfono de Soporte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Leeme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Actualizaciones del Producto:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Comentarios:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 50c9099..dff8035 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ RC_SRCS = \ De.rc \ En.rc \ + Es.rc \ Fr.rc \ It.rc \ Ja.rc \

1 0

Paul Vriens : msi/tests: Fix some test failures on Win9x up to W2K.
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 086711818b547be8b5fde5ed7885a92c81d30d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=086711818b547be8b5fde5ed7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Feb 1 17:41:38 2010 +0100 msi/tests: Fix some test failures on Win9x up to W2K. --- dlls/msi/tests/install.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5da3ed6..9ac9420 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -352,7 +352,7 @@ static const CHAR service_control_dat[] = "ServiceControl\tName\tEvent\tArgument static const CHAR sss_service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" "s72\tl255\ti2\tL255\tI2\ts72\n" "ServiceControl\tServiceControl\n" - "ServiceControl\tTermService\t1\t\t0\tservice_comp"; + "ServiceControl\tSpooler\t1\t\t0\tservice_comp"; static const CHAR sss_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" @@ -7453,11 +7453,22 @@ static void test_start_services(void) BOOL ret; DWORD error = ERROR_SUCCESS; + if (on_win9x) + { + win_skip("Services are not implemented on Win9x and WinMe\n"); + return; + } scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); ok(scm != NULL, "Failed to open the SC Manager\n"); - service = OpenService(scm, "TermService", SC_MANAGER_ALL_ACCESS); - ok(service != NULL, "Failed to open TermService\n"); + service = OpenService(scm, "Spooler", SC_MANAGER_ALL_ACCESS); + if (!service && GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) + { + win_skip("The 'Spooler' service does not exist\n"); + CloseServiceHandle(scm); + return; + } + ok(service != NULL, "Failed to open Spooler\n"); ret = StartService(service, 0, NULL); if (!ret && (error = GetLastError()) != ERROR_SERVICE_ALREADY_RUNNING) @@ -7499,7 +7510,7 @@ static void test_start_services(void) SERVICE_STATUS status; scm = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - service = OpenService(scm, "TermService", SC_MANAGER_ALL_ACCESS); + service = OpenService(scm, "Spooler", SC_MANAGER_ALL_ACCESS); ret = ControlService(service, SERVICE_CONTROL_STOP, &status); ok(ret, "ControlService failed %u\n", GetLastError());

1 0

Juan Lang : wintrust: Fix uninitialized return value (Coverity).
by Alexandre Julliard 02 Feb '10

02 Feb '10

Module: wine Branch: master Commit: 0f632c0caf124914b2a233909f2f08946ee80a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f632c0caf124914b2a233909… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 1 09:11:51 2010 -0800 wintrust: Fix uninitialized return value (Coverity). --- dlls/wintrust/softpub.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 3e79172..852976a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -284,7 +284,7 @@ error: static DWORD SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) { - DWORD err; + DWORD err = ERROR_SUCCESS; if (data->pWintrustData->u.pCert && WVT_IS_CBSTRUCT_GT_MEMBEROFFSET(WINTRUST_CERT_INFO, @@ -325,11 +325,6 @@ static DWORD SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) if (!ret) err = GetLastError(); } - else - { - /* Do nothing!? See the tests */ - err = ERROR_SUCCESS; - } } else err = ERROR_INVALID_PARAMETER;

1 0