December 2008 - Wine-commits

Nikolay Sivov : oleaut32: Added SAFEARRAY support for RecordInfo:: RecordClear.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: f5e59b43f706cbef1f5723233240c1e9a841cc5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e59b43f706cbef1f5723233… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Dec 7 14:43:25 2008 +0300 oleaut32: Added SAFEARRAY support for RecordInfo::RecordClear. --- dlls/oleaut32/recinfo.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 8fdf85a..19ae217 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -236,6 +236,9 @@ static HRESULT WINAPI IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvEx case VT_UINT_PTR: *(void**)var = NULL; break; + case VT_SAFEARRAY: + SafeArrayDestroy((SAFEARRAY*)var); + break; default: FIXME("Not supported vt = %d\n", This->fields[i].vt); break;

1 0

Daniel Nylander : clock: Updated Swedish translation.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 4c21d5287a5885db10238f5e4c1f871aef1343c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c21d5287a5885db10238f5e4… Author: Daniel Nylander <po(a)danielnylander.se> Date: Sun Dec 7 20:34:12 2008 +0100 clock: Updated Swedish translation. --- programs/clock/Sv.rc | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/programs/clock/Sv.rc b/programs/clock/Sv.rc index a3bcde4..8814b08 100644 --- a/programs/clock/Sv.rc +++ b/programs/clock/Sv.rc @@ -1,7 +1,7 @@ /* * Clock (Swedish resources) * - * Copyright 2007 Daniel Nylander + * Copyright 2007, 2008 Daniel Nylander * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,35 +38,35 @@ MAIN_MENU MENU POPUP "Inf&o" { MENUITEM "&Licens...", IDM_LICENSE MENUITEM "&INGEN GARANTI...", IDM_NOWARRANTY - MENUITEM "&Om Clock...", IDM_ABOUT + MENUITEM "&Om Klocka...", IDM_ABOUT } } STRINGTABLE DISCARDABLE { -IDS_CLOCK, "Clock" +IDS_CLOCK, "Klocka" } STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { IDS_LICENSE_CAPTION, "LICENS" IDS_LICENSE, -"This program 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.\n\ -This program 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.\n\ -You should have received a copy of the GNU Lesser General Public \ -License along with this program; if not, write to the Free Software \ -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" +"Detta program �r fri programvara. Du kan distribuera det och/eller \ +modifiera det under villkoren i GNU General Public License, publicerad \ +av Free Software Foundation, antingen version 2.1 eller (om du s� vill) \ +n�gon senare version. Detta program distribueras i hopp om att det ska \ +vara anv�ndbart,men UTAN N�GON SOM HELST GARANTI, �ven utan \ +underf�rst�dd garanti om S�LJBARHET eller L�MPLIGHET F�R N�GOT \ +SPECIELLT �NDAM�L. Se GNU General Public License f�r ytterligare \ +information. \n\ +Du b�r ha f�tt en kopia av GNU General Public License tillsammans \ +med detta program. Om inte, skriv till Free Software Foundation, \ +Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" IDS_WARRANTY_CAPTION, "INGEN GARANTI" IDS_WARRANTY, -"This program 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." +"Detta program distribueras i hopp om att det ska vara anv�ndbart, \ +men UTAN N�GON SOM HELST GARANTI, �ven utan underf�rst�dd garanti \ +om S�LJBARHET eller L�MPLIGHET F�R N�GOT SPECIELLT �NDAM�L. \ +Se GNU General Public License f�r ytterligare information." }

1 0

Daniel Nylander : winefile: Updated Swedish translation.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: cb372506a828832e13462b527baaaa774cf17ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb372506a828832e13462b527… Author: Daniel Nylander <po(a)danielnylander.se> Date: Sun Dec 7 20:54:34 2008 +0100 winefile: Updated Swedish translation. --- programs/winefile/Sv.rc | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/programs/winefile/Sv.rc b/programs/winefile/Sv.rc index a0926db..78b6065 100644 --- a/programs/winefile/Sv.rc +++ b/programs/winefile/Sv.rc @@ -3,6 +3,7 @@ * Swedish Language Support * * Copyright 2005 David Nordenberg + * Copyright 2008 Daniel Nylander <po(a)danielnylander.se> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -62,8 +63,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Skapa systemdisk...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Anslut &N�tverksenhet", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Koppla ifr�n N�tverksenhet", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "Anslut &n�tverksenhet", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Koppla ifr�n n�tverksenhet", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "Dela ut...", 254 MENUITEM "&Ta bort utdelning...", 255 @@ -82,13 +83,13 @@ IDM_WINEFILE MENU FIXED IMPURE POPUP "&Visa" { MENUITEM "&Tr�d och mapp", 413 - MENUITEM "Bara tr&�d", 411 - MENUITEM "Bara &mapp", 412 + MENUITEM "Endast tr&�d", 411 + MENUITEM "Endast &mapp", 412 MENUITEM SEPARATOR MENUITEM "De&la", ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Namn", ID_VIEW_NAME - MENUITEM "&Alla Fildetaljer", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&Alla fildetaljer", ID_VIEW_ALL_ATTRIBUTES, CHECKED MENUITEM "&Vissa detaljer...", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR MENUITEM "&Sortera efter namn", ID_VIEW_SORT_NAME @@ -108,7 +109,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Enhetsf�lt", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "St&atusf�lt", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "F&ullsk�rm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "H&elsk�rm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR MENUITEM "&Minimera vid k�rning", 504 @@ -185,7 +186,7 @@ STRINGTABLE IDS_DESKTOP "Skrivbord" IDS_SHELL "Skal" IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Ej implementerat �nnu" + IDS_NO_IMPL "Inte implementerat �nnu" IDS_WINE_FILE "Wine File" } @@ -201,5 +202,5 @@ STRINGTABLE IDS_COL_ATTR "Attribut" IDS_COL_SEC "S�kerhet" - IDS_FREE_SPACE_FMT "%s of %s free" + IDS_FREE_SPACE_FMT "%s av %s ledigt" }

1 0

Daniel Nylander : winhlp32: Updated Swedish translation.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 7ac9175ebabf9b671a6dd86bc27bf03ee2b14c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac9175ebabf9b671a6dd86bc… Author: Daniel Nylander <po(a)danielnylander.se> Date: Sun Dec 7 20:54:58 2008 +0100 winhlp32: Updated Swedish translation. --- programs/winhlp32/Sv.rc | 52 +++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/programs/winhlp32/Sv.rc b/programs/winhlp32/Sv.rc index 5fdae29..3bd6c93 100644 --- a/programs/winhlp32/Sv.rc +++ b/programs/winhlp32/Sv.rc @@ -4,7 +4,7 @@ * Copyright 1996 Ulrich Schmid * Swedish language by Karl Backstr�m <karl_b(a)geocities.com> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2007 Daniel Nylander + * Copyright 2007, 2008 Daniel Nylander <po(a)danielnylander.se> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,7 +26,7 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { POPUP "&Arkiv" { - MENUITEM "&Öppna", MNID_FILE_OPEN + MENUITEM "&�ppna", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "&Skriv ut", MNID_FILE_PRINT MENUITEM "Skrivar&konfiguration...", MNID_FILE_SETUP @@ -38,32 +38,32 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL MENUITEM SEPARATOR MENUITEM "&Kommentera...", MNID_EDIT_ANNOTATE } - POPUP "&Bokmärke" { + POPUP "&Bokm�rke" { MENUITEM "&Definiera...", MNID_BKMK_DEFINE } - POPUP "&Options" { - POPUP "Help always visible" + POPUP "A&lternativ" { + POPUP "Hj�lpen alltid synlig" BEGIN - MENUITEM "Default", MNID_OPTS_HELP_DEFAULT - MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE - MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE + MENUITEM "Standard", MNID_OPTS_HELP_DEFAULT + MENUITEM "Synlig", MNID_OPTS_HELP_VISIBLE + MENUITEM "Inte synlig", MNID_OPTS_HELP_NONVISIBLE END - MENUITEM "History", MNID_OPTS_HISTORY - POPUP "Fonts" + MENUITEM "Historik", MNID_OPTS_HISTORY + POPUP "Typsnitt" BEGIN - MENUITEM "Small", MNID_OPTS_FONTS_SMALL + MENUITEM "Liten", MNID_OPTS_FONTS_SMALL MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL - MENUITEM "Large", MNID_OPTS_FONTS_LARGE + MENUITEM "Stor", MNID_OPTS_FONTS_LARGE END - MENUITEM "Use system colors", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Anv�nd systemf�rger", MNID_OPTS_SYSTEM_COLORS } - POPUP "&Hjälp" { - MENUITEM "Hjälp &för hjälp", MNID_HELP_HELPON - MENUITEM "Alltid &överst", MNID_HELP_HELPTOP + POPUP "&Hj�lp" { + MENUITEM "Hj�lp &f�r hj�lp", MNID_HELP_HELPON + MENUITEM "Alltid &�verst", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "&Om WINE", MNID_HELP_WINE + MENUITEM "&Om Wine", MNID_HELP_WINE #endif } } @@ -71,18 +71,18 @@ MAIN_MENU MENU LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL /* Strings */ STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { -STID_WINE_HELP, "WINE Hjälp" +STID_WINE_HELP, "WINE Hj�lp" STID_WHERROR, "FEL" STID_WARNING, "VARNING" STID_INFO, "Information" STID_NOT_IMPLEMENTED, "Inte implementerat" -STID_HLPFILE_ERROR_s, "Fel vid läsning av hjälpfilen `%s'" -STID_INDEX, "&Innehåll" -STID_CONTENTS, "Summary" -STID_BACK, "&Bakåt" +STID_HLPFILE_ERROR_s, "Fel vid l�sning av hj�lpfilen `%s'" +STID_INDEX, "&Inneh�ll" +STID_CONTENTS, "Sammandrag" +STID_BACK, "&Bak�t" STID_ALL_FILES, "Alla filer (*.*)" -STID_HELP_FILES_HLP, "Hjälpfiler (*.hlp)" -STID_FILE_NOT_FOUND_s "Kan inte hitta '%s'. Vill du söka efter denna fil?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" -STID_PSH_INDEX, "Help topics: " +STID_HELP_FILES_HLP, "Hj�lpfiler (*.hlp)" +STID_FILE_NOT_FOUND_s "Kan inte hitta '%s'. Vill du s�ka efter denna fil?" +STID_NO_RICHEDIT "Kan inte hitta en implementation av richedit... Avslutar" +STID_PSH_INDEX, "Hj�lprubriker: " }

1 0

Christian Costa : quartz: Accept null clsMinorType for pins when registering filters + tests.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 1f45516d91bb743241a18b1280f898e0f740eab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f45516d91bb743241a18b128… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sat Dec 6 18:58:11 2008 +0100 quartz: Accept null clsMinorType for pins when registering filters + tests. --- dlls/quartz/filtermapper.c | 6 +- dlls/quartz/tests/filtermapper.c | 81 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index ce296ea..b4c0900 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -560,20 +560,20 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG for (j = 0; j < rgPin2.nMediaTypes; j++) { struct REG_TYPE rt; + const CLSID * clsMinorType = rgPin2.lpMediaType[j].clsMinorType ? rgPin2.lpMediaType[j].clsMinorType : &MEDIASUBTYPE_NULL; rt.signature[0] = '0'; rt.signature[1] = 't'; rt.signature[2] = 'y'; rt.signature[3] = '3'; rt.signature[0] += j; - rt.dwUnused = 0; rt.dwOffsetMajor = find_data(&clsidStore, (const BYTE*)rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); if (rt.dwOffsetMajor == -1) rt.dwOffsetMajor = add_data(&clsidStore, (const BYTE*)rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); rt.dwOffsetMajor += size; - rt.dwOffsetMinor = find_data(&clsidStore, (const BYTE*)rgPin2.lpMediaType[j].clsMinorType, sizeof(CLSID)); + rt.dwOffsetMinor = find_data(&clsidStore, (const BYTE*)clsMinorType, sizeof(CLSID)); if (rt.dwOffsetMinor == -1) - rt.dwOffsetMinor = add_data(&clsidStore, (const BYTE*)rgPin2.lpMediaType[j].clsMinorType, sizeof(CLSID)); + rt.dwOffsetMinor = add_data(&clsidStore, (const BYTE*)clsMinorType, sizeof(CLSID)); rt.dwOffsetMinor += size; add_data(&mainStore, (LPBYTE)&rt, sizeof(rt)); diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 5a13902..122c2ee 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -343,6 +343,86 @@ static void test_ifiltermapper_from_filtergraph(void) if (pgraph2) IFilterGraph2_Release(pgraph2); } +static void test_register_filter_with_null_clsMinorType(void) +{ + IFilterMapper2 *pMapper = NULL; + HRESULT hr; + REGFILTER2 rgf2; + REGFILTERPINS rgPins; + REGFILTERPINS2 rgPins2; + REGPINTYPES rgPinType; + static WCHAR wszPinName[] = {'P', 'i', 'n', 0 }; + static const WCHAR wszFilterName1[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', '1', 0 }; + static const WCHAR wszFilterName2[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', '2', 0 }; + CLSID clsidFilter1; + CLSID clsidFilter2; + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (LPVOID*)&pMapper); + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + if (FAILED(hr)) goto out; + + hr = CoCreateGuid(&clsidFilter1); + ok(hr == S_OK, "CoCreateGuid failed with %x\n", hr); + hr = CoCreateGuid(&clsidFilter2); + ok(hr == S_OK, "CoCreateGuid failed with %x\n", hr); + + rgPinType.clsMajorType = &GUID_NULL; + /* Make sure quartz accepts it without crashing */ + rgPinType.clsMinorType = NULL; + + /* Test with pin descript version 1 */ + ZeroMemory(&rgf2, sizeof(rgf2)); + rgf2.dwVersion = 1; + rgf2.dwMerit = MERIT_UNLIKELY; + S(U(rgf2)).cPins = 1; + S(U(rgf2)).rgPins = &rgPins; + + rgPins.strName = wszPinName; + rgPins.bRendered = 1; + rgPins.bOutput = 0; + rgPins.bZero = 0; + rgPins.bMany = 0; + rgPins.clsConnectsToFilter = NULL; + rgPins.strConnectsToPin = NULL; + rgPins.nMediaTypes = 1; + rgPins.lpMediaType = &rgPinType; + + hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter1, wszFilterName1, NULL, + &CLSID_LegacyAmFilterCategory, NULL, &rgf2); + ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); + + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, &clsidFilter1); + ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); + + /* Test with pin descript version 2 */ + ZeroMemory(&rgf2, sizeof(rgf2)); + rgf2.dwVersion = 2; + rgf2.dwMerit = MERIT_UNLIKELY; + S1(U(rgf2)).cPins2 = 1; + S1(U(rgf2)).rgPins2 = &rgPins2; + + rgPins2.dwFlags = REG_PINFLAG_B_RENDERER; + rgPins2.cInstances = 1; + rgPins2.nMediaTypes = 1; + rgPins2.lpMediaType = &rgPinType; + rgPins2.nMediums = 0; + rgPins2.lpMedium = NULL; + rgPins2.clsPinCategory = NULL; + + hr = IFilterMapper2_RegisterFilter(pMapper, &clsidFilter2, wszFilterName2, NULL, + &CLSID_LegacyAmFilterCategory, NULL, &rgf2); + ok(hr == S_OK, "IFilterMapper2_RegisterFilter failed with %x\n", hr); + + hr = IFilterMapper2_UnregisterFilter(pMapper, &CLSID_LegacyAmFilterCategory, NULL, &clsidFilter2); + ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); + + out: + + if (pMapper) IFilterMapper2_Release(pMapper); +} + + START_TEST(filtermapper) { CoInitialize(NULL); @@ -350,6 +430,7 @@ START_TEST(filtermapper) test_fm2_enummatchingfilters(); test_legacy_filter_registration(); test_ifiltermapper_from_filtergraph(); + test_register_filter_with_null_clsMinorType(); CoUninitialize(); }

1 0

Christian Costa : ddraw: Fix trace.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 1632175b35a74571b2b9c7d6c5280c7b8eb2baa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1632175b35a74571b2b9c7d6c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sat Dec 6 18:58:57 2008 +0100 ddraw: Fix trace. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index cdb33d9..0589648 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -544,7 +544,7 @@ IDirectDrawImpl_SetDisplayModeNoOverride(IDirectDraw7 *iface, ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); WINED3DDISPLAYMODE Mode; HRESULT hr; - TRACE("(%p)->(%d,%d,%d,%d,%x: Relay!\n", This, Width, Height, BPP, RefreshRate, Flags); + TRACE("(%p)->(%d,%d,%d,%d,%x): Relay!\n", This, Width, Height, BPP, RefreshRate, Flags); EnterCriticalSection(&ddraw_cs); if( !Width || !Height )

1 0

Christian Costa : winedbg: Make frame numbers display starting from 0 so we match frame command.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 88cf37fd85c0cf03c0c739509264ed922e7e71e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88cf37fd85c0cf03c0c739509… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sat Dec 6 19:00:10 2008 +0100 winedbg: Make frame numbers display starting from 0 so we match frame command. --- programs/winedbg/stack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 2f86389..8fc877f 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -289,7 +289,7 @@ static void backtrace(void) { dbg_printf("%s%d ", (cf == dbg_curr_thread->curr_frame ? "=>" : " "), - dbg_curr_thread->curr_frame + 1); + dbg_curr_thread->curr_frame); stack_print_addr_and_args(dbg_curr_thread->curr_frame); dbg_printf(" ("); print_bare_address(&dbg_curr_thread->frames[dbg_curr_thread->curr_frame].addr_frame);

1 0

Vincent Povirk : explorer,shell32: Improve ABM_GETTASKBARPOS stub.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 3f68641b92af719631464729a17d0d1268a8cdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f68641b92af719631464729a… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Sat Dec 6 12:43:03 2008 -0600 explorer,shell32: Improve ABM_GETTASKBARPOS stub. --- dlls/shell32/appbar.c | 4 ++-- dlls/shell32/tests/appbar.c | 3 --- programs/explorer/appbar.c | 12 +++++++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/appbar.c b/dlls/shell32/appbar.c index a6834c1..5f9c25f 100644 --- a/dlls/shell32/appbar.c +++ b/dlls/shell32/appbar.c @@ -46,7 +46,7 @@ struct appbar_cmd struct appbar_response { UINT_PTR result; - RECT rc; + APPBARDATA abd; }; /************************************************************************* @@ -112,7 +112,7 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) response = (struct appbar_response*)return_view; ret = response->result; - data->rc = response->rc; + *data = response->abd; UnmapViewOfFile(return_view); diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index af7c5f2..d11a999 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -400,11 +400,8 @@ static void test_appbarget(void) if(ret) { ok(abd.hWnd == (HWND)0xcccccccc, "hWnd overwritten\n"); -todo_wine -{ ok(abd.uEdge <= ABE_BOTTOM, "uEdge not returned\n"); ok(abd.rc.left != 0xcccccccc, "rc not updated\n"); -} } return; diff --git a/programs/explorer/appbar.c b/programs/explorer/appbar.c index 8102318..6564f2c 100644 --- a/programs/explorer/appbar.c +++ b/programs/explorer/appbar.c @@ -47,7 +47,7 @@ struct appbar_cmd struct appbar_response { UINT_PTR result; - RECT rc; + APPBARDATA abd; }; static HWND appbarmsg_window = NULL; @@ -195,7 +195,13 @@ static UINT_PTR handle_appbarmessage(DWORD msg, PAPPBARDATA abd) return ABS_ALWAYSONTOP | ABS_AUTOHIDE; case ABM_GETTASKBARPOS: WINE_FIXME("SHAppBarMessage(ABM_GETTASKBARPOS, hwnd=%p): stub\n", abd->hWnd); - return FALSE; + /* Report the taskbar is at the bottom of the screen. */ + abd->rc.left = 0; + abd->rc.right = GetSystemMetrics(SM_CXSCREEN); + abd->rc.bottom = GetSystemMetrics(SM_CYSCREEN); + abd->rc.top = abd->rc.bottom-1; + abd->uEdge = ABE_BOTTOM; + return TRUE; case ABM_ACTIVATE: WINE_FIXME("SHAppBarMessage(ABM_ACTIVATE, hwnd=%p, lparam=%lx): stub\n", abd->hWnd, abd->lParam); return TRUE; @@ -256,7 +262,7 @@ LRESULT CALLBACK appbar_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara { response = (struct appbar_response*)return_view; response->result = result; - response->rc = cmd.abd.rc; + response->abd = cmd.abd; UnmapViewOfFile(return_view); }

1 0

Rok Mandeljc : setupapi: Added Slovenian translation.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 341d55b400103552d88f1759eb16685b15aa8caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=341d55b400103552d88f1759e… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Sat Dec 6 16:38:12 2008 +0100 setupapi: Added Slovenian translation. --- dlls/setupapi/Si.rc | 38 ++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.rc | 1 + 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Si.rc b/dlls/setupapi/Si.rc new file mode 100644 index 0000000..886644e --- /dev/null +++ b/dlls/setupapi/Si.rc @@ -0,0 +1,38 @@ +/* + * Slovenian resources for SETUPAPI + * + * Copyright 2008 Rok Mandeljc + * + * 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 + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopiranje datotek ..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Prekliči", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Izvor:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Cilj:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +#pragma code_page(default) diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc index affbe5c..9aaeeac 100644 --- a/dlls/setupapi/setupapi.rc +++ b/dlls/setupapi/setupapi.rc @@ -42,6 +42,7 @@ #include "Pl.rc" #include "Pt.rc" #include "Ru.rc" +#include "Si.rc" #include "Sv.rc" #include "Tr.rc" #include "Zh.rc"

1 0

Rok Mandeljc : appwiz.cpl: Added Slovenian translation.
by Alexandre Julliard 08 Dec '08

08 Dec '08

Module: wine Branch: master Commit: 7e6ccb6ca00cb60df596a0d7e3dda26e9c9e74ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6ccb6ca00cb60df596a0d7e… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Sat Dec 6 16:38:14 2008 +0100 appwiz.cpl: Added Slovenian translation. --- dlls/appwiz.cpl/Si.rc | 83 +++++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/appwiz.rc | 1 + 2 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Si.rc b/dlls/appwiz.cpl/Si.rc new file mode 100644 index 0000000..dd6601d --- /dev/null +++ b/dlls/appwiz.cpl/Si.rc @@ -0,0 +1,83 @@ +/* +* Add/Remove Programs Slovenian resources +* +* Copyright 2008 Rok Mandeljc +* +* 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 +* +*/ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_CPL_TITLE, "Dodaj/odstrani programe" + IDS_CPL_DESC, "Omogoča namestitev novih programov oziroma odstranitev programov z vašega računalnika." + IDS_TAB1_TITLE, "Programi" + + IDS_UNINSTALL_FAILED, "Napaka pri zaganjanju odstranitvenega programa '%s'. Ali želite izbrisati odstranitveni vnos za ta program iz registra?" + IDS_NOT_SPECIFIED, "Ni navedeno" + + IDS_COLUMN_NAME, "Ime" + IDS_COLUMN_PUBLISHER, "Založnik" + IDS_COLUMN_VERSION, "Različica" +} + +/* TODO: it's best to use the constant WC_LISTVIEW instead of SysListView32 directly, but the Wine resource compiler doesn't seem to like that... */ + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Dodaj/odstrani programe" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Za namestitev novega programa z diskete, CD-ROMa ali trdega diska kliknite 'Namesti'.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Namesti ...", 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 "Naslednji programi omogočajo samodejno odstranitev. Za odstranitev programa oz. spremembo nameščenih komponent izberite program s seznama in kliknite 'Dodaj/Odstrani'.", 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 "Dodaj/&Odstrani ...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "&Informacije ...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 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 "Informacije" +FONT 8, "MS Shell Dlg" +{ + CONTROL "V redu", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Naslednje informacije lahko uporabite pri pridobivanju tehnične podpore za %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Založnik:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 80, 8 + CONTROL "Različica:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 80, 8 + CONTROL "Kontakt:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 80, 8 + CONTROL "Tehnična podpora:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 80, 8 + CONTROL "Telefon teh. podpore:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 80, 8 + CONTROL "Readme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 80, 8 + CONTROL "Popravki:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 80, 8 + CONTROL "Komentar:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 80, 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 +} + +#pragma code_page(default) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 73f0796..7c95366 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -33,6 +33,7 @@ #include "No.rc" #include "Pt.rc" #include "Ru.rc" +#include "Si.rc" #include "Zh.rc" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

1 0