June 2010 - Wine-commits - list.winehq.org

Mariusz Pluciński : gameux: Add declaration of IGameExplorer2 interface.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: d77c7d1047e61a765338c1d260a7d8bd359a2ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77c7d1047e61a765338c1d26… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Mon May 31 20:10:58 2010 +0200 gameux: Add declaration of IGameExplorer2 interface. --- include/gameux.idl | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/gameux.idl b/include/gameux.idl index 07b9870..f9ec1e5 100644 --- a/include/gameux.idl +++ b/include/gameux.idl @@ -138,6 +138,26 @@ library gameuxLib }; [ + object, + uuid(86874AA7-A1ED-450d-A7EB-B89E20B2FFF3) + ] + interface IGameExplorer2 : IUnknown + { + HRESULT InstallGame( + [string, in] LPCWSTR binaryGDFPath, + [unique, in] LPCWSTR installDirectory, + [in] GAME_INSTALL_SCOPE installScope); + + HRESULT UninstallGame( + [string, in] LPCWSTR binaryGDFPath); + + HRESULT CheckAccess( + [string, in] LPCWSTR binaryGDFPath, + [retval, out] BOOL* pHasAccess); + + } + + [ uuid(9A5EA990-3034-4D6F-9128-01F3C61022BC) ] coclass GameExplorer

1 0

Alexandre Julliard : oleaut32: Fix handling of 'c' format for non-date variants in VarTokenizeFormatString.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: a2791a0919d27bf49f783595f78eff06e8223468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2791a0919d27bf49f783595f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 8 15:34:59 2010 +0200 oleaut32: Fix handling of 'c' format for non-date variants in VarTokenizeFormatString. --- dlls/oleaut32/tests/varformat.c | 1 + dlls/oleaut32/varformat.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index fd598cb..2d4ef62 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -328,6 +328,7 @@ static void test_VarFormat(void) VARFMT(VT_I4,V_I4,1,"000###",S_OK,"000001"); VARFMT(VT_I4,V_I4,1,"#00##00#0",S_OK,"00000001"); VARFMT(VT_I4,V_I4,1,"1#####0000",S_OK,"10001"); + VARFMT(VT_I4,V_I4,1,"##abcdefghijklmnopqrstuvwxyz",S_OK,"1abcdefghijklmnopqrstuvwxyz"); VARFMT(VT_I4,V_I4,100000,"#,###,###,###",S_OK,"100,000"); VARFMT(VT_I4,V_I4,1,"0,000,000,000",S_OK,"0,000,000,001"); VARFMT(VT_I4,V_I4,123456789,"#,#.#",S_OK,"123,456,789."); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 10f5038..f297641 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -852,7 +852,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, *pOut++ = FMT_DATE_AMPM_UPPER; TRACE("AM/PM\n"); } - else if (*pFormat == 'c' || *pFormat == 'C') + else if ((*pFormat == 'c' || *pFormat == 'C') && COULD_BE(FMT_TYPE_DATE)) { /* Date formats: General date format * Other formats: Literal

1 0

Luca Bennati : shdoclc: Fix Italian translation.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: ca1bdfe511178e7429c0ff09bed601f0154943a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1bdfe511178e7429c0ff09b… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Jun 7 19:34:51 2010 +0200 shdoclc: Fix Italian translation. --- dlls/shdoclc/It.rc | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shdoclc/It.rc b/dlls/shdoclc/It.rc index 5d4e28e..bcd08bf 100644 --- a/dlls/shdoclc/It.rc +++ b/dlls/shdoclc/It.rc @@ -37,9 +37,9 @@ STRINGTABLE DISCARDABLE IDR_BROWSE_CONTEXT_MENU MENU { - POPUP "Default" + POPUP "Predefinito" { - MENUITEM "&Indietra", IDM_GOBACKWARD + MENUITEM "&Indietro", IDM_GOBACKWARD MENUITEM "&Avanti", IDM_GOFORWARD MENUITEM SEPARATOR MENUITEM "&Salva sfondo come...", IDM_SAVEBACKGROUND @@ -194,7 +194,6 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Aggiungi ai &Preferiti...", IDM_ADDFAVORITES MENUITEM SEPARATOR - MENUITEM SEPARATOR MENUITEM "Riproduci", IDM_DYNSRCPLAY MENUITEM "Ferma", IDM_DYNSRCSTOP MENUITEM "Indietro", IDM_IMGARTREWIND

1 0

Jose Rostagno : msvidc32: Add Spanish translation.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: b20b58250f8a48b7ab7528a512dbfb905939de1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20b58250f8a48b7ab7528a51… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Mon Jun 7 17:44:45 2010 -0300 msvidc32: Add Spanish translation. --- dlls/msvidc32/Makefile.in | 1 + dlls/msvidc32/msvidc32_Es.rc | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index 7cb9142..dcf323b 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in @@ -12,6 +12,7 @@ RC_SRCS = \ msvidc32_Da.rc \ msvidc32_De.rc \ msvidc32_En.rc \ + msvidc32_Es.rc \ msvidc32_Fr.rc \ msvidc32_Hu.rc \ msvidc32_It.rc \ diff --git a/dlls/msvidc32/msvidc32_Es.rc b/dlls/msvidc32/msvidc32_Es.rc new file mode 100644 index 0000000..889e898 --- /dev/null +++ b/dlls/msvidc32/msvidc32_Es.rc @@ -0,0 +1,31 @@ +/* + * + * Copyright 2010 José Rostagno + * + * 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 "msvidc32_private.h" + +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +/*UTF-8*/ +#pragma code_page(65001) + +STRINGTABLE DISCARDABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "códec de video Wine Video 1" +}

1 0

Jose Rostagno : winecfg: Update Spanish translation.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: f5edb4aea311fe8e83f4c300b2cc8b4ff16abaec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5edb4aea311fe8e83f4c300b… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Mon Jun 7 17:56:32 2010 -0300 winecfg: Update Spanish translation. --- programs/winecfg/Es.rc | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 423c783..6985979 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -3,6 +3,7 @@ * Spanish Language Support * * Copyright 2003-2009 Jos� Manuel Ferrer Ortiz + * Copyright 2010 Jos� Rostagno * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -122,6 +123,16 @@ BEGIN PUSHBUTTON "Cancelar",IDCANCEL,62,74,50,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 170, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Seleccionar letra de la unidad" +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Aceptar",IDOK,105,10,45,14,WS_GROUP + PUSHBUTTON "Cancelar",IDCANCEL,105,30,45,14,WS_GROUP +END + IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" @@ -164,8 +175,8 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Selecci�n de manejador ",IDC_STATIC,8,4,244,210 - LTEXT "Seleccione un manejador de sonido marcando la casilla del deseado. Para deshabilitar el sonido no seleccione ninguno. No se recomienda la selecci�n de m�s de un manejador. Para configurar un manejador haga doble click sobre �l.",IDC_STATIC,15,15,227,35 + GROUPBOX "Selecci�n de controlador ",IDC_STATIC,8,4,244,210 + LTEXT " Seleccione un controlador de sonido marcando la casilla del deseado. Para deshabilitar el sonido no seleccione ninguno. No se recomienda la selecci�n de m�s de un controlador. Para configurar un controlador haga doble click sobre �l.",IDC_STATIC,15,15,227,35 CONTROL "Dispositivos",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,155 PUSHBUTTON "Probar sonido",IDC_AUDIO_TEST,170,50,59,14 PUSHBUTTON "Panel de control",IDC_AUDIO_CONTROL_PANEL,170,70,59,14 @@ -223,7 +234,7 @@ BEGIN IDS_WINECFG_TITLE_APP "Configuraci�n de Wine para %s" IDS_THEMEFILE "Ficheros de tema (*.msstyles; *.theme)" IDS_THEMEFILE_SELECT "Seleccione un fichero de tema" - IDS_AUDIO_MISSING "Actualmente no hay ning�n manejador de audio especificado en el registro.\n\nSe ha seleccionado para usted un manejador recomendado. Puede usar �ste o seleccionar otro manejador disponible.\n\nDebe pulsar Aplicar para que la selecci�n surja efecto." + IDS_AUDIO_MISSING "Actualmente no hay ning�n controlador de audio especificado en el registro.\n\nSe ha seleccionado para usted un controlador recomendado. Puede usar �ste o seleccionar otro controlador disponible.\n\nDebe pulsar Aplicar para que la selecci�n surja efecto." IDS_SHELL_FOLDER "Carpeta del sistema" IDS_LINKS_TO "Enlaza a" END @@ -270,22 +281,22 @@ BEGIN IDS_ACCEL_STANDARD "Est�ndar" IDS_ACCEL_BASIC "B�sica" IDS_ACCEL_EMULATION "Emulaci�n" - IDS_DRIVER_ALSA "Manejador ALSA" - IDS_DRIVER_ESOUND "Manejador EsounD" - IDS_DRIVER_OSS "Manejador OSS" - IDS_DRIVER_JACK "Manejador JACK" - IDS_DRIVER_NAS "Manejador NAS" - IDS_DRIVER_AUDIOIO "Manejador Audio IO (Solaris)" - IDS_DRIVER_COREAUDIO "Manejador CoreAudio" + IDS_DRIVER_ALSA "Controlador ALSA" + IDS_DRIVER_ESOUND "Controlador EsounD" + IDS_DRIVER_OSS "Controlador OSS" + IDS_DRIVER_JACK "Controlador JACK" + IDS_DRIVER_NAS "Controlador NAS" + IDS_DRIVER_AUDIOIO "Controlador Audio IO (Solaris)" + IDS_DRIVER_COREAUDIO "Controlador CoreAudio" IDS_OPEN_DRIVER_ERROR "�No se ha podido abrir %s!" - IDS_SOUNDDRIVERS "Manejadores de sonido" + IDS_SOUNDDRIVERS "Controladores de sonido" IDS_DEVICES_WAVEOUT "Dispositivos de salida de onda" IDS_DEVICES_WAVEIN "Dispositivos de entrada de onda" IDS_DEVICES_MIDIOUT "Dispositivos de salida MIDI" IDS_DEVICES_MIDIIN "Dispositivos de entrada MIDI" IDS_DEVICES_AUX "Dispositivos auxiliares" IDS_DEVICES_MIXER "Dispositivos mezcladores" - IDS_UNAVAILABLE_DRIVER "�Se ha encontrado en el registro un manejador que no est� disponible!\n\n�Eliminar \"%s\" del registro?" + IDS_UNAVAILABLE_DRIVER "�Se ha encontrado en el registro un Controlador que no est� disponible!\n\n�Eliminar \"%s\" del registro?" IDS_WARNING "Advertencia" END

1 0

Maarten Lankhorst : dsound: Unofficially support 5.1 sound.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 2d5c4944c13900b5d16b306de94a2f49371bd0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5c4944c13900b5d16b306de… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 8 00:28:56 2010 +0200 dsound: Unofficially support 5.1 sound. --- dlls/dsound/mixer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 698e586..185df6e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -277,7 +277,8 @@ static inline void cp_fields(const IDirectSoundBufferImpl *dsb, const BYTE *ibuf DirectSoundDevice *device = dsb->device; INT istep = dsb->pwfx->wBitsPerSample / 8, ostep = device->pwfx->wBitsPerSample / 8; - if (device->pwfx->nChannels == dsb->pwfx->nChannels) { + if (device->pwfx->nChannels == dsb->pwfx->nChannels || + (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 6)) { dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); if (device->pwfx->nChannels == 2) dsb->convert(ibuf + istep, obuf + ostep, istride, ostride, count, freqAcc, adj);

1 0

Nikolay Sivov : comctl32/treeview: Activate tree verification only when TRACE() is on.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 767754031dc37a41d62718cdede5bdcf062d4972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=767754031dc37a41d62718cde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 8 01:07:06 2010 +0400 comctl32/treeview: Activate tree verification only when TRACE() is on. --- dlls/comctl32/treeview.c | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index f1ff9c5..b3c283d 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -213,21 +213,11 @@ static VOID TREEVIEW_UpdateScrollBars(TREEVIEW_INFO *infoPtr); static LRESULT TREEVIEW_HScroll(TREEVIEW_INFO *, WPARAM); /* Random Utilities *****************************************************/ - -#ifndef NDEBUG -static inline void -TREEVIEW_VerifyTree(TREEVIEW_INFO *infoPtr) -{ - (void)infoPtr; -} -#else -/* The definition is at the end of the file. */ static void TREEVIEW_VerifyTree(TREEVIEW_INFO *infoPtr); -#endif /* Returns the treeview private data if hwnd is a treeview. * Otherwise returns an undefined value. */ -static TREEVIEW_INFO * +static inline TREEVIEW_INFO * TREEVIEW_GetInfoPtr(HWND hwnd) { return (TREEVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); @@ -5818,7 +5808,6 @@ TREEVIEW_Unregister(void) /* Tree Verification ****************************************************/ -#ifdef NDEBUG static inline void TREEVIEW_VerifyChildren(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item); @@ -5905,8 +5894,8 @@ TREEVIEW_VerifyRoot(TREEVIEW_INFO *infoPtr) static void TREEVIEW_VerifyTree(TREEVIEW_INFO *infoPtr) { - assert(infoPtr != NULL); + if (!TRACE_ON(treeview)) return; + assert(infoPtr != NULL); TREEVIEW_VerifyRoot(infoPtr); } -#endif

1 0

Nikolay Sivov : comctl32/treeview: Remove commented out lines.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: b3549350924149d79ac7c2b71c36b52271b71650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3549350924149d79ac7c2b71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 8 04:51:47 2010 +0400 comctl32/treeview: Remove commented out lines. --- dlls/comctl32/treeview.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b3c283d..11b4520 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -852,15 +852,9 @@ static INT TREEVIEW_NotifyFormat (TREEVIEW_INFO *infoPtr, HWND hwndFrom, UINT nC static VOID TREEVIEW_ComputeItemInternalMetrics(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item) { - /* Same effect, different optimisation. */ -#if 0 - BOOL lar = ((infoPtr->dwStyle & TVS_LINESATROOT) - && (infoPtr->dwStyle & (TVS_HASLINES|TVS_HASBUTTONS))); -#else - BOOL lar = ((infoPtr->dwStyle - & (TVS_LINESATROOT|TVS_HASLINES|TVS_HASBUTTONS)) + /* has TVS_LINESATROOT and (TVS_HASLINES|TVS_HASBUTTONS) */ + BOOL lar = ((infoPtr->dwStyle & (TVS_LINESATROOT|TVS_HASLINES|TVS_HASBUTTONS)) > TVS_LINESATROOT); -#endif item->linesOffset = infoPtr->uIndent * (lar ? item->iLevel : item->iLevel - 1) - infoPtr->scrollX; @@ -3451,10 +3445,6 @@ TREEVIEW_ExpandMsg(TREEVIEW_INFO *infoPtr, UINT flag, HTREEITEM wineItem) default: return 0; } - -#if 0 - TRACE("Exiting, Item %p state is now %d...\n", wineItem, wineItem->state); -#endif } /* Hit-Testing **********************************************************/ @@ -5028,10 +5018,6 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->root->visibleOrder = -1; infoPtr->hwndNotify = lpcs->hwndParent; -#if 0 - infoPtr->bTransparent = ( GetWindowLongW( hwnd, GWL_STYLE) & TBSTYLE_FLAT); -#endif - infoPtr->hwndToolTip = 0; infoPtr->bNtfUnicode = IsWindowUnicode (hwnd);

1 0

Nikolay Sivov : comctl32/treeview: Remove some casts.
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: 16973508e7f4989513f79a568bc695bd7b840967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16973508e7f4989513f79a568… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 8 05:16:15 2010 +0400 comctl32/treeview: Remove some casts. --- dlls/comctl32/treeview.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 11b4520..8022556 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -482,7 +482,7 @@ static INT get_notifycode(const TREEVIEW_INFO *infoPtr, INT code) return code; } -static LRESULT +static inline BOOL TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { TRACE("wParam=%ld, lParam=%ld\n", wParam, lParam); @@ -500,7 +500,7 @@ TREEVIEW_SendSimpleNotify(const TREEVIEW_INFO *infoPtr, UINT code) nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); nmhdr.code = get_notifycode(infoPtr, code); - return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, (LPARAM)&nmhdr); + return TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, (LPARAM)&nmhdr); } static VOID @@ -563,7 +563,7 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action nmhdr.ptDrag.x = 0; nmhdr.ptDrag.y = 0; - ret = (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); + ret = TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); if (!infoPtr->bNtfUnicode) { Free(nmhdr.itemOld.pszText); @@ -593,7 +593,7 @@ TREEVIEW_SendTreeviewDnDNotify(const TREEVIEW_INFO *infoPtr, UINT code, nmhdr.ptDrag.x = pt.x; nmhdr.ptDrag.y = pt.y; - return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); + return TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, (LPARAM)&nmhdr); } @@ -621,7 +621,7 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, nmcdhdr.clrTextBk = infoPtr->clrBk; nmcdhdr.iLevel = 0; - return (BOOL)TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)&nmcdhdr); + return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)&nmcdhdr); } @@ -638,7 +638,6 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc, DWORD dwDrawStage; DWORD_PTR dwItemSpec; UINT uItemState; - INT retval; dwDrawStage = CDDS_ITEM | uItemDrawState; dwItemSpec = (DWORD_PTR)wineItem; @@ -666,9 +665,7 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc, nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam); - retval = TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)nmcdhdr); - - return retval; + return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, (LPARAM)nmcdhdr); } static BOOL @@ -685,7 +682,7 @@ TREEVIEW_BeginLabelEditNotify(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editI TREEVIEW_TVItemFromItem(infoPtr, TVIF_HANDLE | TVIF_STATE | TVIF_PARAM | TVIF_TEXT, &tvdi.item, editItem); - ret = (BOOL)TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi); + ret = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi); if (!infoPtr->bNtfUnicode) Free(tvdi.item.pszText); @@ -3836,7 +3833,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) tvdi.item.cchTextMax = 0; } - bCommit = (BOOL)TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi); + bCommit = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, (LPARAM)&tvdi); if (!bCancel && bCommit) /* Apply the changes */ {

1 0

Damjan Jovanovic : winemenubuilder: Also extract .lnk icons from file types .
by Alexandre Julliard 08 Jun '10

08 Jun '10

Module: wine Branch: master Commit: f26b663172d80c300df993465b6a01369795a76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26b663172d80c300df993465… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jun 7 21:40:26 2010 +0200 winemenubuilder: Also extract .lnk icons from file types. --- programs/winemenubuilder/winemenubuilder.c | 38 ++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index a40a657..276c4e4 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -172,6 +172,9 @@ static char *xdg_config_dir; static char *xdg_data_dir; static char *xdg_desktop_dir; +static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra); +static char *extract_icon(LPCWSTR path, int index, const char *destFilename, BOOL bWait); + /* Icon extraction routines * * FIXME: should use PrivateExtractIcons and friends @@ -814,6 +817,39 @@ static int ExtractFromICO(LPCWSTR szFileName, char *szXPMFileName) return 0; } +static int ExtractFromFileType(LPCWSTR szFileName, char *szXPMFileName) +{ + int ret = 1; + WCHAR *extension; + WCHAR *icon = NULL; + WCHAR *comma; + int index = 0; + char *output_path = NULL; + + extension = strrchrW(szFileName, '.'); + if (extension == NULL) + goto end; + + icon = assoc_query(ASSOCSTR_DEFAULTICON, extension, NULL); + if (icon == NULL) + goto end; + + comma = strrchrW(icon, ','); + if (comma) + { + *comma = 0; + index = atoiW(comma + 1); + } + output_path = extract_icon(icon, index, NULL, FALSE); + if (output_path) + ret = rename(output_path, szXPMFileName); + +end: + HeapFree(GetProcessHeap(), 0, icon); + HeapFree(GetProcessHeap(), 0, output_path); + return ret; +} + static BOOL create_default_icon( const char *filename, const char* comment ) { FILE *fXPM; @@ -1031,6 +1067,8 @@ static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BO sprintf(xpm_path,"%s/%04x_%s.png",iconsdir,crc,ico_name); if (ExtractFromICO( path, xpm_path)) goto end; + if (ExtractFromFileType( path, xpm_path )) + goto end; if (!bWait) { if (destFilename)

1 0