wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Jacek Caban : mshtmdid.h: Fixed IHTMLWindow2 dispids.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 9a0a0453100e8912b74fb05059b12d292bccc9d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0a0453100e8912b74fb0505… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 15 02:09:00 2008 +0200 mshtmdid.h: Fixed IHTMLWindow2 dispids. --- include/mshtmdid.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 64ae3cc..c77619e 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1322,7 +1322,7 @@ #define DISPID_IHTMLWINDOW2_FRAMES 1100 #define DISPID_IHTMLWINDOW2_DEFAULTSTATUS 1101 #define DISPID_IHTMLWINDOW2_STATUS 1102 -#define DISPID_IHTMLWINDOW2_SETTIMEOUT 1103 +#define DISPID_IHTMLWINDOW2_SETTIMEOUT 1172 #define DISPID_IHTMLWINDOW2_CLEARTIMEOUT 1104 #define DISPID_IHTMLWINDOW2_ALERT 1105 #define DISPID_IHTMLWINDOW2_CONFIRM 1110 @@ -1339,7 +1339,7 @@ #define DISPID_IHTMLWINDOW2_BLUR 1159 #define DISPID_IHTMLWINDOW2_SCROLL 1160 #define DISPID_IHTMLWINDOW2_CLIENTINFORMATION 1161 -#define DISPID_IHTMLWINDOW2_SETINTERVAL 1162 +#define DISPID_IHTMLWINDOW2_SETINTERVAL 1173 #define DISPID_IHTMLWINDOW2_CLEARINTERVAL 1163 #define DISPID_IHTMLWINDOW2_OFFSCREENBUFFERING 1164 #define DISPID_IHTMLWINDOW2_EXECSCRIPT 1165

1 0

Maarten Lankhorst : include: Update aviriff header.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 0b326924510faf14acb1fbfd024eedb5ac959803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b326924510faf14acb1fbfd0… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 10 15:45:32 2008 -0700 include: Update aviriff header. --- dlls/quartz/avisplit.c | 39 ++++++----- dlls/quartz/fourcc.h | 61 ----------------- dlls/quartz/waveparser.c | 4 +- include/aviriff.h | 161 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 181 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b326924510faf14acb1f…

1 0

Maarten Lankhorst : quartz: Update start_time if the current position is changed.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 1281b74956d28c2814cb5c592121410ddd1b750c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1281b74956d28c2814cb5c592… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 14 13:30:49 2008 -0700 quartz: Update start_time if the current position is changed. --- dlls/quartz/filtergraph.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 94e4003..ee31068 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2126,7 +2126,9 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, TRACE("State: %s\n", state == State_Running ? "Running" : (state == State_Paused ? "Paused" : (state == State_Stopped ? "Stopped" : "UNKNOWN"))); if ((dwCurrentFlags & 0x7) == AM_SEEKING_AbsolutePositioning) + { This->position = *pCurrent; + } else if ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning) FIXME("Adjust method %x not handled yet!\n", dwCurrentFlags & 0x7); @@ -2140,6 +2142,12 @@ static HRESULT WINAPI MediaSeeking_SetPositions(IMediaSeeking *iface, args.curflags = dwCurrentFlags; args.stopflags = dwStopFlags; hr = all_renderers_seek(This, found_setposition, (DWORD_PTR)&args); + + if (This->refClock && ((dwCurrentFlags & 0x7) != AM_SEEKING_NoPositioning)) + { + /* Update start time, prevents weird jumps */ + IReferenceClock_GetTime(This->refClock, &This->start_time); + } LeaveCriticalSection(&This->cs); return hr;

1 0

Maarten Lankhorst : quartz: Add VIDEOINFOHEADER2 support to VideoRenderer.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 3e9cee050f801ab3cd69378d168f5efd51862f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9cee050f801ab3cd69378d1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 11 15:10:19 2008 -0700 quartz: Add VIDEOINFOHEADER2 support to VideoRenderer. --- dlls/quartz/videorenderer.c | 78 +++++++++++++++++++++++++++++------------- 1 files changed, 54 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f363b82..f0a73d7 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -35,7 +35,9 @@ #include "evcode.h" #include "strmif.h" #include "ddraw.h" +#include "dvdmedia.h" +#include "assert.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -263,7 +265,6 @@ static const IMemInputPinVtbl MemInputPin_Vtbl = static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, DWORD size) { - VIDEOINFOHEADER* format; AM_MEDIA_TYPE amt; HRESULT hr = S_OK; DDSURFACEDESC sdesc; @@ -271,6 +272,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, int height; LPBYTE palette = NULL; HDC hDC; + BITMAPINFOHEADER *bmiHeader; TRACE("%p %p %d\n", This, data, size); @@ -280,23 +282,39 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, ERR("Unable to retrieve media type\n"); return hr; } - format = (VIDEOINFOHEADER*)amt.pbFormat; - - TRACE("biSize = %d\n", format->bmiHeader.biSize); - TRACE("biWidth = %d\n", format->bmiHeader.biWidth); - TRACE("biHeight = %d\n", format->bmiHeader.biHeight); - TRACE("biPlanes = %d\n", format->bmiHeader.biPlanes); - TRACE("biBitCount = %d\n", format->bmiHeader.biBitCount); - TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(format->bmiHeader.biCompression), 4)); - TRACE("biSizeImage = %d\n", format->bmiHeader.biSizeImage); - - width = format->bmiHeader.biWidth; - height = format->bmiHeader.biHeight; - palette = ((LPBYTE)&format->bmiHeader) + format->bmiHeader.biSize; + + if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo)) + { + bmiHeader = &((VIDEOINFOHEADER *)amt.pbFormat)->bmiHeader; + } + else if (IsEqualIID(&amt.formattype, &FORMAT_VideoInfo2)) + { + bmiHeader = &((VIDEOINFOHEADER2 *)amt.pbFormat)->bmiHeader; + } + else + { + FIXME("Unknown type %s\n", debugstr_guid(&amt.subtype)); + return VFW_E_RUNTIME_ERROR; + } + + + TRACE("biSize = %d\n", bmiHeader->biSize); + TRACE("biWidth = %d\n", bmiHeader->biWidth); + TRACE("biHeight = %d\n", bmiHeader->biHeight); + TRACE("biPlanes = %d\n", bmiHeader->biPlanes); + TRACE("biBitCount = %d\n", bmiHeader->biBitCount); + TRACE("biCompression = %s\n", debugstr_an((LPSTR)&(bmiHeader->biCompression), 4)); + TRACE("biSizeImage = %d\n", bmiHeader->biSizeImage); + + width = bmiHeader->biWidth; + height = bmiHeader->biHeight; + palette = ((LPBYTE)bmiHeader) + bmiHeader->biSize; if (!This->init) { - /* Honor previously set WindowPos */ + if (!This->WindowPos.right || !This->WindowPos.bottom) + This->WindowPos = This->SourceRect; + 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, @@ -304,8 +322,9 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, This->WindowPos.right - This->WindowPos.left, This->WindowPos.bottom - This->WindowPos.top, SWP_NOZORDER|SWP_NOMOVE); + GetClientRect(This->hWnd, &This->DestRect); - This->init = TRUE; + This->init = TRUE; } hDC = GetDC(This->hWnd); @@ -321,10 +340,9 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, StretchDIBits(hDC, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top, This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, - data, (BITMAPINFO*)&format->bmiHeader, DIB_RGB_COLORS, SRCCOPY); + data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); ReleaseDC(This->hWnd, hDC); - if (This->AutoShow) ShowWindow(This->hWnd, SW_SHOW); @@ -385,17 +403,29 @@ static HRESULT VideoRenderer_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_RGB8)) { VideoRendererImpl* This = (VideoRendererImpl*) iface; - VIDEOINFOHEADER* format = (VIDEOINFOHEADER*)pmt->pbFormat; - if (!IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) + if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) + { + VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pmt->pbFormat; + This->SourceRect.left = 0; + This->SourceRect.top = 0; + This->SourceRect.right = This->VideoWidth = format->bmiHeader.biWidth; + This->SourceRect.bottom = This->VideoHeight = format->bmiHeader.biHeight; + } + else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) + { + VIDEOINFOHEADER2 *format2 = (VIDEOINFOHEADER2 *)pmt->pbFormat; + + This->SourceRect.left = 0; + This->SourceRect.top = 0; + This->SourceRect.right = This->VideoWidth = format2->bmiHeader.biWidth; + This->SourceRect.bottom = This->VideoHeight = format2->bmiHeader.biHeight; + } + else { WARN("Format type %s not supported\n", debugstr_guid(&pmt->formattype)); return S_FALSE; } - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth = format->bmiHeader.biWidth; - This->SourceRect.bottom = This->VideoHeight = format->bmiHeader.biHeight; return S_OK; } return S_FALSE;

1 0

Jonathan Ernst : winhelp: Updated French translation.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 62010249c551a3ec59fe9cd5fab6c5ae5e129273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62010249c551a3ec59fe9cd5f… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Apr 14 23:28:16 2008 +0200 winhelp: Updated French translation. --- programs/winhelp/Fr.rc | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/programs/winhelp/Fr.rc b/programs/winhelp/Fr.rc index 7318507..200b1de 100644 --- a/programs/winhelp/Fr.rc +++ b/programs/winhelp/Fr.rc @@ -3,6 +3,7 @@ * * Copyright 1996 Ulrich Schmid * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2008 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,7 +29,7 @@ MAIN_MENU MENU POPUP "&Fichier" { MENUITEM "&Ouvrir", MNID_FILE_OPEN MENUITEM SEPARATOR - MENUITEM "Im&primer", MNID_FILE_PRINT + MENUITEM "&Imprimer", MNID_FILE_PRINT MENUITEM "&Configuration de l'imprimante...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "&Quitter", MNID_FILE_EXIT @@ -52,8 +53,18 @@ MAIN_MENU MENU } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Annuler", IDCANCEL, 120, 170, 50, 12 +} + /* Strings */ -STRINGTABLE DISCARDABLE +STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT { STID_WINE_HELP, "Aide de WINE" STID_WHERROR, "ERREUR" @@ -68,5 +79,5 @@ STID_HISTORY, "&Historique" STID_TOPICS, "&Sujets" STID_ALL_FILES, "Tous fichiers (*.*)" STID_HELP_FILES_HLP, "Fichiers d'aide (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_FILE_NOT_FOUND_s "Impossible de trouver ��%s��. Souhaitez-vous rechercher ce fichier vous-m�me�?" }

1 0

Jonathan Ernst : winefile: Updated French translation.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 2d870e27fbb69e0acee2c68ec33f2de7ac745b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d870e27fbb69e0acee2c68ec… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Apr 14 23:28:02 2008 +0200 winefile: Updated French translation. --- programs/winefile/Fr.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winefile/Fr.rc b/programs/winefile/Fr.rc index 2a8207f..c6294b5 100644 --- a/programs/winefile/Fr.rc +++ b/programs/winefile/Fr.rc @@ -6,7 +6,7 @@ * Copyright 2002 Steven Edwards * Copyright 2002 Alexandre Julliard * Copyright 2003 Sylvain Petreolle - * Copyright 2005-2006 Jonathan Ernst + * Copyright 2005-2008 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,8 +33,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Ouvrir\tEntr�e", ID_ACTIVATE MENUITEM "&D�placer...\tF7", ID_FILE_MOVE MENUITEM "&Copier...\tF8", ID_FILE_COPY - MENUITEM "P&resse-Papiers...\tF9", 118 - MENUITEM "&Effacer\tDel", ID_FILE_DELETE + MENUITEM "P&resse-papiers...\tF9", 118 + MENUITEM "&Effacer\tSuppr", ID_FILE_DELETE MENUITEM "Re&nommer...", 109 MENUITEM "&Propri�t�s...\tAlt+Entree", ID_EDIT_PROPERTIES MENUITEM SEPARATOR @@ -62,7 +62,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM SEPARATOR MENUITEM "&Formater Disque...", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "Cr�er un disque *syst�me...", -1 /*TODO*/ + MENUITEM "Cr�er un disque &syst�me...", -1 /*TODO*/ #endif MENUITEM SEPARATOR MENUITEM "Connecter un lecteur &r�seau",ID_CONNECT_NETWORK_DRIVE @@ -167,7 +167,7 @@ CAPTION "S FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Dossier�:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "&Chemin�:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Annuler", 2, 158, 23, 47, 14 @@ -179,7 +179,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Par type de fichier" FONT 8, "MS Sans Serif" BEGIN - LTEXT "&Name:",-1,7,8,22,10 + LTEXT "&Nom�:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL GROUPBOX "Type de fichier",-1,7,23,87,56 CONTROL "&R�pertoires",IDC_VIEW_TYPE_DIRECTORIES,"Button", @@ -211,7 +211,7 @@ BEGIN EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Version�:",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Cop&yright:",-1,7,51,59,9 + LTEXT "Cop&yright�:",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Taille�:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP

1 0

Jonathan Ernst : winecfg: Updated French translation.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: 964d2d1629e5820972a806eb59b9a86469799b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=964d2d1629e5820972a806eb5… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Apr 14 23:27:46 2008 +0200 winecfg: Updated French translation. --- programs/winecfg/Fr.rc | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 3514a42..d77d848 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -37,7 +37,7 @@ BEGIN LTEXT PACKAGE_STRING,IDC_STATIC,119,17,120,8 CONTROL IDB_WINE,IDC_STATIC,"Static",SS_BITMAP ,15,17,157,111 LTEXT "http://www.winehq.org/",IDC_STATIC,119,31,106,8 - LTEXT "Cette biblioth�que est un logiciel libre�; vous pouvez la redistribuer et/ou la modifier conform�ment aux dispositions de la Licence Publique G�n�rale GNU, telle que publi�e par la Free Software Foundation�; version 2.1 de la licence, ou encore (� votre choix) toute version ult�rieure." + LTEXT "Cette biblioth�que est un logiciel libre�; vous pouvez la redistribuer et/ou la modifier suivant les termes de la Licence G�n�rale Publique Limit�e, telle que publi�e par la Free Software Foundation�; soit la version 2.1 de la License, soit (� votre gr�) toute version ult�rieure." IDC_STATIC,119,44,124,72 END @@ -64,6 +64,8 @@ BEGIN CONTROL "Permettre aux applications DirectX d'emp�cher la souris de quitter leur fen�tre",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | BS_MULTILINE,15,14,230,16 + CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 + CONTROL "Permettre au gestionnaire de &fen�tres de contr�ler les fen�tres",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Si les fen�tres sont g�r�es par votre gestionnaire de fen�tres, elles auront des bordures standard, elles respecteront votre bureau virtuel et appara�tront dans la liste des fen�tres.\n\nSi les fen�tres ne sont pas g�r�es, elles seront d�connect�es de votre gestionnaire de fen�tres. Ceci signifie qu'elle ne seront pas parfaitement int�gr�es � votre bureau, mais que l'�mulation sera plus pr�cise ce qui permet � certains programmes de mieux fonctionner.", IDC_STATIC,15,45,228,80 @@ -305,5 +307,20 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Texte de la barre de titre active" IDC_SYSPARAMS_INACTIVE_TITLE "Barre de titre inactive" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Texte de la barre de titre inactive" - IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" + IDC_SYSPARAMS_MSGBOX_TEXT "Texte des bo�tes de messages" + IDC_SYSPARAMS_APPWORKSPACE "Espace de travail de l'application" + IDC_SYSPARAMS_WINDOW_FRAME "Cadre de la fen�tre" + IDC_SYSPARAMS_ACTIVE_BORDER "Bordure active" + IDC_SYSPARAMS_INACTIVE_BORDER "Bordure inactive" + IDC_SYSPARAMS_BUTTON_SHADOW "Ombre des contr�les" + IDC_SYSPARAMS_GRAY_TEXT "Texte gris" + IDC_SYSPARAMS_BUTTON_HILIGHT "Surbrillance des contr�les" + IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Ombre sombre des contr�les" + IDC_SYSPARAMS_BUTTON_LIGHT "Lumi�re des contr�les" + IDC_SYSPARAMS_BUTTON_ALTERNATE "Fond alternatif des contr�les" + IDC_SYSPARAMS_HOT_TRACKING "�l�ment actif" + IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "D�grad� de la barre de titre active" + IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "D�grad� de la barre de titre inactive" + IDC_SYSPARAMS_MENU_HILIGHT "Surbrillance du menu" + IDC_SYSPARAMS_MENUBAR "Barre de menu" END

1 0

Jonathan Ernst : comdlg32: Updated French translation.
by Alexandre Julliard 15 Apr '08

15 Apr '08

Module: wine Branch: master Commit: eb2dadaea19528e490df009d80a7d150ac660766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2dadaea19528e490df009d8… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Apr 14 22:22:33 2008 +0200 comdlg32: Updated French translation. --- dlls/comdlg32/cdlg_Fr.rc | 145 ++++++++++++++++++++++++--------------------- 1 files changed, 77 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb2dadaea19528e490df0…

1 0

Jörg Höhle : wined3d: Fix missing break inside switch in SetAutoGenFilterType.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: b36d4a1d517a17d848bedee13152ad8101c6e93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36d4a1d517a17d848bedee13… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Apr 14 17:16:25 2008 +0200 wined3d: Fix missing break inside switch in SetAutoGenFilterType. --- dlls/wined3d/basetexture.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index bc004c0..000c2f2 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -198,10 +198,12 @@ HRESULT WINAPI IWineD3DBaseTextureImpl_SetAutoGenFilterType(IWineD3DBaseTexture glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST); checkGLcall("glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_FASTEST)"); + break; case WINED3DTEXF_LINEAR: glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST); checkGLcall("glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST)"); + break; default: WARN("Unexpected filter type %d, setting to GL_NICEST\n", FilterType); glTexParameteri(textureDimensions, GL_GENERATE_MIPMAP_HINT_SGIS, GL_NICEST);

1 0

Aric Stewart : user32: Call ImmProcessKey in TranslateMessage to allow IMEs to handle key processing if they choose to .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f51542d9b5c3601dfc3266706a98f996cf909e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51542d9b5c3601dfc3266706… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 14 12:39:28 2008 -0500 user32: Call ImmProcessKey in TranslateMessage to allow IMEs to handle key processing if they choose to. --- dlls/user32/message.c | 4 ++++ include/imm.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 33c12c1..7f3407e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -35,6 +35,7 @@ #include "winnls.h" #include "dbt.h" #include "dde.h" +#include "imm.h" #include "wine/unicode.h" #include "wine/server.h" #include "user_private.h" @@ -2994,6 +2995,9 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) TRACE_(key)("Translating key %s (%04lx), scancode %02x\n", SPY_GetVKeyName(msg->wParam), msg->wParam, LOBYTE(HIWORD(msg->lParam))); + if (ImmProcessKey(msg->hwnd, GetKeyboardLayout(0), msg->wParam, msg->lParam,0)) + return TRUE; + GetKeyboardState( state ); /* FIXME : should handle ToUnicode yielding 2 */ switch (ToUnicode(msg->wParam, HIWORD(msg->lParam), state, wp, 2, 0)) diff --git a/include/imm.h b/include/imm.h index 85848e6..1b4cc71 100644 --- a/include/imm.h +++ b/include/imm.h @@ -538,6 +538,7 @@ BOOL WINAPI ImmIsUIMessageA(HWND, UINT, WPARAM, LPARAM); BOOL WINAPI ImmIsUIMessageW(HWND, UINT, WPARAM, LPARAM); #define ImmIsUIMessage WINELIB_NAME_AW(ImmIsUIMessage) BOOL WINAPI ImmNotifyIME(HIMC, DWORD, DWORD, DWORD); +BOOL WINAPI ImmProcessKey(HWND, HKL, UINT, LPARAM, DWORD); BOOL WINAPI ImmRegisterWordA(HKL, LPCSTR, DWORD, LPCSTR); BOOL WINAPI ImmRegisterWordW(HKL, LPCWSTR, DWORD, LPCWSTR); #define ImmRegisterWord WINELIB_NAME_AW(ImmRegisterWord)

1 0

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 April 2008