October 2006 - Wine-commits

Jeff Latimer : usp10: Add tests for ScriptStringAnalyse and ScriptStringFree.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 37e7de1208eb6003d56c32f8e55259f03f28d91d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e7de1208eb6003d56c32f8e… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Oct 24 19:02:17 2006 +1000 usp10: Add tests for ScriptStringAnalyse and ScriptStringFree. --- dlls/usp10/tests/usp10.c | 92 ++++++++++++++++++++++++++------------------- 1 files changed, 53 insertions(+), 39 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 31df9c7..4fde627 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -614,30 +614,38 @@ static void test_ScriptXtoX(void) static void test_ScriptString(void) { +/******************************************************************************************* + * + * This set of tests are for the string functions of uniscribe. The ScriptStringAnalyse + * function allocates memory pointed to by the SCRIPT_STRING_ANALYSIS ssa pointer. This + * memory if freed by ScriptStringFree. There needs to be a valid hdc for this this as + * ScriptStrinAnalyse calls ScriptSItemize, ScriptShape and ScriptPlace which require it. + * + */ + HRESULT hr; HWND hwnd; HDC hdc = 0; - WCHAR teststr[] = {'T', 'e', 's', 't', 'a', '\0'}; - void *pString = (WCHAR *) &teststr; - int cString = 5; - int cGlyphs = cString * 2 + 16; - int iCharset = -1; - DWORD dwFlags = SSA_GLYPHS; - int iReqWidth = 100; - SCRIPT_CONTROL psControl; - SCRIPT_STATE psState; - const int piDx[5] = {10, 10, 10, 10, 10}; - SCRIPT_TABDEF pTabdef; - const BYTE pbInClass = 0; - SCRIPT_STRING_ANALYSIS pssa = NULL; - - int iX = 10; - int iY = 100; - UINT uOptions = 0; - const RECT prc = {0, 50, 100, 100}; - int iMinSel = 0; - int iMaxSel = 0; - BOOL fDisabled = FALSE; + WCHAR teststr[] = {'T','e','s','t','1',' ','a','2','b','3', '\0'}; + int String = (sizeof(teststr)/sizeof(WCHAR))-1; + int Glyphs = String * 2 + 16; + int Charset; + DWORD Flags = SSA_GLYPHS; + int ReqWidth = 100; + SCRIPT_CONTROL Control; + SCRIPT_STATE State; + const int Dx[5] = {10, 10, 10, 10, 10}; + SCRIPT_TABDEF Tabdef; + const BYTE InClass = 0; + SCRIPT_STRING_ANALYSIS ssa = NULL; + + int X = 10; + int Y = 100; + UINT Options = 0; + const RECT rc = {0, 50, 100, 100}; + int MinSel = 0; + int MaxSel = 0; + BOOL Disabled = FALSE; LOGFONTA lf; HFONT zfont; @@ -658,31 +666,37 @@ static void test_ScriptString(void) lf.lfOrientation = 0; lf.lfUnderline = 0; lf.lfStrikeOut = 0; - lf.lfWeight = 3; + lf.lfWeight = 300; lf.lfWidth = 10; zfont = (HFONT) SelectObject(hdc, CreateFontIndirectA(&lf)); + Charset = -1; /* this flag indicates unicode input */ /* Test without hdc to get E_INVALIDARG */ - hr = ScriptStringAnalyse( NULL, pString, cString, cGlyphs, iCharset, dwFlags, - iReqWidth, &psControl, &psState, piDx, &pTabdef, - &pbInClass, &pssa); + hr = ScriptStringAnalyse( NULL, teststr, String, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, Dx, &Tabdef, + &InClass, &ssa); ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); /* test with hdc, this should be a valid test */ - hr = ScriptStringAnalyse( hdc, pString, cString, cGlyphs, iCharset, dwFlags, - iReqWidth, &psControl, &psState, piDx, &pTabdef, - &pbInClass, &pssa); - ok(hr == E_NOTIMPL, "ScriptStringAnalyse Stub should return E_NOTIMPL not %08x\n", hr); -/* Commented code it pending new code in ScriptStringAnalysis */ -/* ok(hr == S_OK, "ScriptStringAnalyse Stub should return S_OK not %08x\n", (unsigned int) hr);*/ -/* ok(pssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n");*/ + hr = ScriptStringAnalyse( hdc, teststr, String, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, Dx, &Tabdef, + &InClass, &ssa); + todo_wine ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + + /* test makes sure that a call with a valid pssa still works */ + hr = ScriptStringAnalyse( hdc, teststr, String, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, Dx, &Tabdef, + &InClass, &ssa); + todo_wine ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + todo_wine ok(ssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n"); + if (hr == 0) { - hr = ScriptStringOut(pssa, iX, iY, uOptions, &prc, iMinSel, iMaxSel,fDisabled); - ok(hr == E_NOTIMPL, "ScriptStringOut Stub should return E_NOTIMPL not %08x\n", hr); - hr = ScriptStringFree(&pssa); - ok(hr == S_OK, "ScriptStringFree Stub should return S_OK not %08x\n", hr); + hr = ScriptStringOut(ssa, X, Y, Options, &rc, MinSel, MaxSel, Disabled); + todo_wine ok(hr == S_OK, "ScriptStringOut should return S_OK not %08x\n", hr); + hr = ScriptStringFree(&ssa); + todo_wine ok(hr == S_OK, "ScriptStringFree should return S_OK not %08x\n", hr); } } @@ -1060,9 +1074,6 @@ START_TEST(usp10) test_ScriptCacheGetHeight(hdc); test_ScriptGetGlyphABCWidth(hdc); - ReleaseDC(hwnd, hdc); - DestroyWindow(hwnd); - test_ScriptGetFontProperties(); test_ScriptTextOut(); test_ScriptXtoX(); @@ -1070,4 +1081,7 @@ START_TEST(usp10) test_ScriptLayout(); test_digit_substitution(); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); }

1 0

Rob Shearman : oleaut32: Free the array subscript memory for type descriptions when freeing the typelib .
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: aa203f091943f982e4d20accf72ca3b42c2ec4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa203f091943f982e4d20accf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 24 13:01:12 2006 +0100 oleaut32: Free the array subscript memory for type descriptions when freeing the typelib. --- dlls/oleaut32/typelib.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f0e871a..8cf4357 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -900,6 +900,7 @@ typedef struct tagITypeLibImpl int ctCustData; /* number of items in cust data list */ TLBCustData * pCustData; /* linked list to cust data */ TLBImpLib * pImpLibs; /* linked list to all imported typelibs */ + int ctTypeDesc; /* number of items in type desc array */ TYPEDESC * pTypeDesc; /* array of TypeDescriptions found in the libary. Only used while read MSFT typelibs */ @@ -2451,6 +2452,7 @@ static ITypeLib2* ITypeLib2_Constructor_ { int i, j, cTD = tlbSegDir.pTypdescTab.length / (2*sizeof(INT)); INT16 td[4]; + pTypeLibImpl->ctTypeDesc = cTD; pTypeLibImpl->pTypeDesc = TLB_Alloc( cTD * sizeof(TYPEDESC)); MSFT_ReadLEWords(td, sizeof(td), &cx, tlbSegDir.pTypdescTab.offset); for(i=0; i<cTD; ) @@ -3542,6 +3544,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( { TLBImpLib *pImpLib, *pImpLibNext; TLBCustData *pCustData, *pCustDataNext; + int i; /* remove cache entry */ if(This->path) @@ -3588,7 +3591,10 @@ static ULONG WINAPI ITypeLib2_fnRelease( TLB_Free(pCustData); } - /* FIXME: free arrays inside elements of This->pTypeDesc */ + for (i = 0; i < This->ctTypeDesc; i++) + if (This->pTypeDesc[i].vt == VT_CARRAY) + TLB_Free(This->pTypeDesc[i].u.lpadesc); + TLB_Free(This->pTypeDesc); for (pImpLib = This->pImpLibs; pImpLib; pImpLib = pImpLibNext)

1 0

Rob Shearman : oleaut32: Fix a crash in dump_DispParms when running the typelib test with debug tracing on .
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 47bf80da8cc279c4e4be57f49eaca02a534701ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bf80da8cc279c4e4be57f49… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 24 13:01:00 2006 +0100 oleaut32: Fix a crash in dump_DispParms when running the typelib test with debug tracing on. --- dlls/oleaut32/typelib.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8cf4357..0f8f287 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1298,15 +1298,19 @@ static void dump_DispParms(const DISPPAR TRACE("args=%u named args=%u\n", pdp->cArgs, pdp->cNamedArgs); - if (pdp->cNamedArgs) + if (pdp->cNamedArgs && pdp->rgdispidNamedArgs) + { TRACE("named args:\n"); - for (index = 0; index < pdp->cNamedArgs; index++) - TRACE( "\t0x%x\n", pdp->rgdispidNamedArgs[index] ); + for (index = 0; index < pdp->cNamedArgs; index++) + TRACE( "\t0x%x\n", pdp->rgdispidNamedArgs[index] ); + } - if (pdp->cArgs) + if (pdp->cArgs && pdp->rgvarg) + { TRACE("args:\n"); - for (index = 0; index < pdp->cArgs; index++) - dump_Variant( &pdp->rgvarg[index] ); + for (index = 0; index < pdp->cArgs; index++) + dump_Variant( &pdp->rgvarg[index] ); + } } static void dump_TypeInfo(const ITypeInfoImpl * pty)

1 0

Rob Shearman : oleaut32: Fix a reference count leak in CreateDispTypeInfo.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: a26af4861dc53e8606a2417c1afbb255c1fe6618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26af4861dc53e8606a2417c1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 24 13:00:51 2006 +0100 oleaut32: Fix a reference count leak in CreateDispTypeInfo. --- dlls/oleaut32/typelib.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5485c79..f0e871a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6788,6 +6788,10 @@ HRESULT WINAPI CreateDispTypeInfo( pTypeLibImpl->TypeInfoCount++; *pptinfo = (ITypeInfo*)pTIClass; + + ITypeInfo_AddRef(*pptinfo); + ITypeLib_Release((ITypeLib *)&pTypeLibImpl->lpVtbl); + return S_OK; }

1 0

Rob Shearman : oleaut32: Fix a reference count leak in the typelib test.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 2b65782d1e110c5dd072c0bdeb24555dc7665a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b65782d1e110c5dd072c0bde… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 24 13:01:23 2006 +0100 oleaut32: Fix a reference count leak in the typelib test. --- dlls/oleaut32/tests/typelib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index ccc5b26..75aaca9 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -114,6 +114,7 @@ static void test_TypeComp(void) "desckind should have been DESCKIND_TYPECOMP instead of %d\n", desckind); ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ITypeComp_Release(bindptr.lptcomp); /* test getting a function within a TKIND_MODULE */ ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszSavePicture);

1 0

Rob Shearman : oleaut32: Initialise all members of the FUNCDESC structure in CreateDispTypeInfo.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: d72ef78fa67731fe0aca1b313275f07635261d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72ef78fa67731fe0aca1b313… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 24 13:00:46 2006 +0100 oleaut32: Initialise all members of the FUNCDESC structure in CreateDispTypeInfo. --- dlls/oleaut32/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d866b9b..5485c79 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6721,12 +6721,14 @@ HRESULT WINAPI CreateDispTypeInfo( *ppFuncDesc = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppFuncDesc)); (*ppFuncDesc)->Name = SysAllocString(md->szName); (*ppFuncDesc)->funcdesc.memid = md->dispid; + (*ppFuncDesc)->funcdesc.lprgscode = NULL; (*ppFuncDesc)->funcdesc.funckind = FUNC_VIRTUAL; (*ppFuncDesc)->funcdesc.invkind = md->wFlags; (*ppFuncDesc)->funcdesc.callconv = md->cc; (*ppFuncDesc)->funcdesc.cParams = md->cArgs; (*ppFuncDesc)->funcdesc.cParamsOpt = 0; (*ppFuncDesc)->funcdesc.oVft = md->iMeth << 2; + (*ppFuncDesc)->funcdesc.cScodes = 0; (*ppFuncDesc)->funcdesc.wFuncFlags = 0; (*ppFuncDesc)->funcdesc.elemdescFunc.tdesc.vt = md->vtReturn; (*ppFuncDesc)->funcdesc.elemdescFunc.u.paramdesc.wParamFlags = PARAMFLAG_NONE;

1 0

Jonathan Ernst : oledlg: Updated French translation.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 29a20902ac4aa4a070f24bb063defe267506c651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a20902ac4aa4a070f24bb06… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Oct 24 13:23:06 2006 +0200 oledlg: Updated French translation. --- dlls/oledlg/oledlg_Fr.rc | 58 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 9 deletions(-) diff --git a/dlls/oledlg/oledlg_Fr.rc b/dlls/oledlg/oledlg_Fr.rc index 8cf7f10..41654cb 100644 --- a/dlls/oledlg/oledlg_Fr.rc +++ b/dlls/oledlg/oledlg_Fr.rc @@ -2,7 +2,7 @@ * oledlg dll resources * French language support * - * Copyright (C) 2005 Jonathan Ernst + * Copyright (C) 2005-2006 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,30 +30,70 @@ BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "Type d'objet:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + LTEXT "Type d'objet :",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE DEFPUSHBUTTON "OK",IDOK,221,7,66,14 PUSHBUTTON "Annuler",IDCANCEL,221,24,66,14 GROUPBOX "R�sultat",IDC_RESULT,7,103,208,41 - CONTROL "Cr�er Nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + CONTROL "Cr�er nouveau",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "Cr�er Contr�le",IDC_CREATECONTROL,"Button", + CONTROL "Cr�er le contr�le",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 - CONTROL "Cr�er Depuis Fichier",IDC_CREATEFROMFILE,"Button", + CONTROL "Cr�er depuis le fichier",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 PUSHBUTTON "&Ajoute Contr�le...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE - CONTROL "Afficher Comme Ic�ne",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + CONTROL "Afficher comme ic�ne",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Parcourir...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE - LTEXT "Fichier:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + LTEXT "Fichier :",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE END STRINGTABLE DISCARDABLE { IDS_RESULTOBJDESC "Ins�rer un nouvel object %s dans votre document" - IDS_RESULTFILEOBJDESC "Ins�re le contenu du fichier comme un objet dans votre document afin que vous puissiez l'activer en utilisant le programme avec lequel vous l'avez cr��." + IDS_RESULTFILEOBJDESC "Ins�re le contenu du fichier comme un objet dans votre document afin que vous puissiez l'activer en utilisant le programme avec lequel il a �t� cr��." IDS_BROWSE "Parcourir" IDS_NOTOLEMOD "Le fichier ne semble pas �tre un module OLE valide. Impossible d'enregistrer le contr�le OLE." - IDS_NOTOLEMODCAPTION "Ajouter Contr�le" + IDS_NOTOLEMODCAPTION "Ajouter un contr�le" +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Collage sp�cial" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Source :", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "C&oller", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Coller le &lien", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Comme :", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Annuler", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "Aid&e", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Afficher comme ic�ne", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "Changer l'&ic�ne...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< le r�sultat vient ici >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "R�sultat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Ins�re le contenu du presse-papiers dans votre document comme %s." + IDS_PS_PASTE_OBJECT "Ins�re le contenu du presse-papiers dans votre document de sorte que vous puissiez l'activer en utilisant %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Ins�re le contenu du presse-papiers dans votre document de sorte que vous puissiez l'activer en utilisant %s. Il sera affich� comme une ic�ne." + IDS_PS_PASTE_LINK_DATA "Ins�re le contenu du presse-papiers dans votre document comme %s. Les donn�es sont li�es au fichier source de sorte que les modifications de celles-ci seront r�percut�es dans votre document." + IDS_PS_PASTE_LINK_OBJECT "Ins�re le contenu du presse-papiers dans votre document. L'image est li�e au fichier source de sorte que les modifications de celle-ci seront r�percut�es dans votre document." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Ins�re un raccourci qui pointe vers l'emplacement du contenu du presse-papiers. Le raccourci est li� au fichier source de sorte que les modifications de celui-ci seront r�percut�es dans votre document." + IDS_PS_NON_OLE "Ins�re le contenu du presse-papiers dans votre document." + IDS_PS_UNKNOWN_TYPE "Type inconnu" + IDS_PS_UNKNOWN_SRC "Source inconnue" + IDS_PS_UNKNOWN_APP "le programme avec lequel il a �t� cr��" }

1 0

Huw Davies : winex11.drv: Give XCloseIM another chance.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 87fbc7a3a86ec180adb9e833e1b39e6346fd7789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fbc7a3a86ec180adb9e833e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 24 11:39:28 2006 +0100 winex11.drv: Give XCloseIM another chance. --- dlls/winex11.drv/x11drv_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index a33a374..a06f7ea 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -465,8 +465,8 @@ static void thread_detach(void) X11DRV_ResetSelectionOwner(); CloseHandle( data->display_fd ); wine_tsx11_lock(); + if (data->xim) XCloseIM( data->xim ); XCloseDisplay( data->display ); - /* if (data->xim) XCloseIM( data->xim ); */ /* crashes Xlib */ wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, data ); }

1 0

Huw Davies : winex11.drv: Only initialize static variables once per process .
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: d7eb2262b08cdd379e9c322b2abac807ce2d4491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7eb2262b08cdd379e9c322b2… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 24 12:32:00 2006 +0100 winex11.drv: Only initialize static variables once per process. --- dlls/winex11.drv/xim.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 4d0b7ad..ff98f01 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -430,17 +430,20 @@ XIM X11DRV_SetupXIM(Display *display, co ximStyleCallback = ximStyle; } - } + } wine_tsx11_unlock(); - LoadImmDll(); - - if (pImmCreateContext) + if(!hImmDll) { - root_context = pImmCreateContext(); - if (pImmAssociateContext) - pImmAssociateContext(0,root_context); + LoadImmDll(); + + if (pImmCreateContext) + { + root_context = pImmCreateContext(); + if (pImmAssociateContext) + pImmAssociateContext(0,root_context); + } } return xim;

1 0

Jonathan Ernst : wineconsole: Updated French translation.
by Alexandre Julliard 24 Oct '06

24 Oct '06

Module: wine Branch: master Commit: 4c0a20bdb56463426d0cc34bca13320a3b50f4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0a20bdb56463426d0cc34bc… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Oct 24 13:22:39 2006 +0200 wineconsole: Updated French translation. --- programs/wineconsole/wineconsole_Fr.rc | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole_Fr.rc b/programs/wineconsole/wineconsole_Fr.rc index 3a32bd5..22bd901 100644 --- a/programs/wineconsole/wineconsole_Fr.rc +++ b/programs/wineconsole/wineconsole_Fr.rc @@ -1,5 +1,6 @@ /* * Copyright 2001 Eric Pouech + * Copyright 2006 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,7 +21,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN -IDS_EDIT, "&Editer" +IDS_EDIT, "�&dition" IDS_DEFAULT, "Par &d�faut" IDS_PROPERTIES, "&Propri�t�s" IDS_MARK, "&Marquer" @@ -36,6 +37,20 @@ IDS_DLG_TIT_DEFAULT, "Configuration p IDS_DLG_TIT_CURRENT, "Configuration courante" IDS_DLG_TIT_ERROR, "Erreur de configuration" IDS_DLG_ERR_SBWINSIZE, "La taille du tampon �cran doit �tre plus grande que celle de la fen�tre" + +IDS_CMD_INVALID_EVENT_ID "wineconsole : Impossible d'analyser l'�v�nement\n" +IDS_CMD_INVALID_BACKEND "wineconsole : Moteur invalide\n" +IDS_CMD_INVALID_OPTION "wineconsole : Option de la ligne de commande non reconnue\n" +IDS_CMD_ABOUT "D�marre un programme dans une console Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole : �chec lors du d�marrage du programme %s.\n"\ + "La commande est invalide.\n" + +IDS_USAGE_HEADER "\nUsage :\n wineconsole [options] <commande>\n\nOptions :\n" +IDS_USAGE_BACKEND " --backend={user|ncurses} En choisissant � user � une nouvelle fen�tre sera cr��e, � ncurses �\n"\ + " essaiera de convertir le terminal courant en console Wine\n" +IDS_USAGE_COMMAND " <command> Le programme Wine � ex�cuter dans la console\n" +IDS_USAGE_FOOTER "\nExemple :\n wineconsole cmd\nD�marre l'interpr�teur de commandes de Wine dans une console Wine\n\n" + END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105

1 0