wine-commits May 2008

wine-commits@winehq.org

4 participants
722 discussions

Alexandre Julliard : Revert "quartz: Clean up pullpin code."
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: aac5fa3469057b52edad3b3994099a0d28304635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac5fa3469057b52edad3b399… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 5 18:24:22 2008 +0200 Revert "quartz: Clean up pullpin code." This reverts commit 3066116f76c0c44950fde3552485b37dce24d1f8. --- dlls/quartz/pin.c | 115 +++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 94 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 5f705d0..8619776 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1233,7 +1233,6 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinI pPinImpl->rtStop = ((LONGLONG)0x7fffffff << 32) | 0xffffffff; pPinImpl->dRate = 1.0; pPinImpl->state = Req_Die; - assert(pCustomRequest); pPinImpl->fnCustomRequest = pCustomRequest; pPinImpl->stop_playback = 1; @@ -1400,6 +1399,44 @@ ULONG WINAPI PullPin_Release(IPin *iface) return refCount; } +static HRESULT PullPin_Standard_Request(PullPin *This, BOOL start) +{ + REFERENCE_TIME rtSampleStart; + REFERENCE_TIME rtSampleStop; + IMediaSample *sample = NULL; + HRESULT hr; + + TRACE("Requesting sample!\n"); + + if (start) + This->rtNext = This->rtCurrent; + + if (This->rtNext >= This->rtStop) + /* Last sample has already been queued, request nothing more */ + return S_OK; + + hr = IMemAllocator_GetBuffer(This->pAlloc, &sample, NULL, NULL, 0); + + if (SUCCEEDED(hr)) + { + rtSampleStart = This->rtNext; + rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(IMediaSample_GetSize(sample)); + if (rtSampleStop > This->rtStop) + rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(This->rtStop), This->cbAlign)); + hr = IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); + + This->rtCurrent = This->rtNext; + This->rtNext = rtSampleStop; + + if (SUCCEEDED(hr)) + hr = IAsyncReader_Request(This->pReader, sample, 0); + } + if (FAILED(hr)) + FIXME("Failed to queue sample : %08x\n", hr); + + return hr; +} + static void CALLBACK PullPin_Flush(PullPin *This) { IMediaSample *pSample; @@ -1408,8 +1445,6 @@ static void CALLBACK PullPin_Flush(PullPin *This) EnterCriticalSection(This->pin.pCritSec); if (This->pReader) { - SendFurther((IPin *)This, deliver_beginflush, NULL, NULL ); - /* Flush outstanding samples */ IAsyncReader_BeginFlush(This->pReader); for (;;) @@ -1422,12 +1457,13 @@ static void CALLBACK PullPin_Flush(PullPin *This) break; assert(!IMediaSample_GetActualDataLength(pSample)); + if (This->fnCustomRequest) + This->fnSampleProc(This->pin.pUserData, pSample, dwUser); + IMediaSample_Release(pSample); } IAsyncReader_EndFlush(This->pReader); - SendFurther((IPin *)This, deliver_endflush, NULL, NULL ); - This->fnCleanProc(This->pin.pUserData); } LeaveCriticalSection(This->pin.pCritSec); } @@ -1454,7 +1490,10 @@ static void CALLBACK PullPin_Thread_Process(PullPin *This) } /* There is no sample in our buffer */ - hr = This->fnCustomRequest(This->pin.pUserData); + if (!This->fnCustomRequest) + hr = PullPin_Standard_Request(This, TRUE); + else + hr = This->fnCustomRequest(This->pin.pUserData); if (FAILED(hr)) ERR("Request error: %x\n", hr); @@ -1471,18 +1510,46 @@ static void CALLBACK PullPin_Thread_Process(PullPin *This) hr = IAsyncReader_WaitForNext(This->pReader, 10000, &pSample, &dwUser); - if (SUCCEEDED(hr)) + /* Calling fnCustomRequest is not specifically useful here: It can be handled inside fnSampleProc */ + if (pSample && !This->fnCustomRequest) + hr = PullPin_Standard_Request(This, FALSE); + + /* Return an empty sample on error to the implementation in case it does custom parsing, so it knows it's gone */ + if (SUCCEEDED(hr) || (This->fnCustomRequest && pSample)) { REFERENCE_TIME rtStart, rtStop; + BOOL rejected; IMediaSample_GetTime(pSample, &rtStart, &rtStop); - hr = This->fnSampleProc(This->pin.pUserData, pSample, dwUser); + do + { + hr = This->fnSampleProc(This->pin.pUserData, pSample, dwUser); + + if (This->fnCustomRequest) + break; + + rejected = FALSE; + if (This->rtCurrent == rtStart) + { + rejected = TRUE; + TRACE("DENIED!\n"); + Sleep(10); + /* Maybe it's transient? */ + } + /* rtNext = rtCurrent, because the next sample is already queued */ + else if (rtStop != This->rtCurrent && rtStop < This->rtStop) + { + WARN("Position changed! rtStop: %u, rtCurrent: %u\n", (DWORD)BYTES_FROM_MEDIATIME(rtStop), (DWORD)BYTES_FROM_MEDIATIME(This->rtCurrent)); + PullPin_Flush(This); + hr = PullPin_Standard_Request(This, TRUE); + } + } while (rejected && (This->rtCurrent < This->rtStop && hr == S_OK && !This->stop_playback)); } else { /* FIXME: This is not well handled yet! */ - ERR("Processing/wait error: %x\n", hr); + ERR("Processing error: %x\n", hr); } if (pSample) @@ -1697,6 +1764,12 @@ HRESULT WINAPI PullPin_BeginFlush(IPin * iface) PullPin *This = (PullPin *)iface; TRACE("(%p)->()\n", This); + EnterCriticalSection(This->pin.pCritSec); + { + SendFurther( iface, deliver_beginflush, NULL, NULL ); + } + LeaveCriticalSection(This->pin.pCritSec); + EnterCriticalSection(&This->thread_lock); { PullPin_WaitForStateChange(This, INFINITE); @@ -1706,14 +1779,15 @@ HRESULT WINAPI PullPin_BeginFlush(IPin * iface) PullPin_PauseProcessing(This); PullPin_WaitForStateChange(This, INFINITE); } - - EnterCriticalSection(This->pin.pCritSec); - SendFurther( iface, deliver_beginflush, NULL, NULL ); - LeaveCriticalSection(This->pin.pCritSec); } - LeaveCriticalSection(&This->thread_lock); + EnterCriticalSection(This->pin.pCritSec); + { + This->fnCleanProc(This->pin.pUserData); + } + LeaveCriticalSection(This->pin.pCritSec); + return S_OK; } @@ -1728,18 +1802,17 @@ HRESULT WINAPI PullPin_EndFlush(IPin * iface) FILTER_STATE state; IBaseFilter_GetState(This->pin.pinInfo.pFilter, INFINITE, &state); - EnterCriticalSection(This->pin.pCritSec); - SendFurther( iface, deliver_endflush, NULL, NULL ); - LeaveCriticalSection(This->pin.pCritSec); - if (This->stop_playback && state == State_Running) - { PullPin_StartProcessing(This); - PullPin_WaitForStateChange(This, INFINITE); - } + + PullPin_WaitForStateChange(This, INFINITE); } LeaveCriticalSection(&This->thread_lock); + EnterCriticalSection(This->pin.pCritSec); + SendFurther( iface, deliver_endflush, NULL, NULL ); + LeaveCriticalSection(This->pin.pCritSec); + return S_OK; }

1 0

Alexandre Julliard : preloader: Silence the warning for the low 64k.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 7a4d57502931fbcfcdb3b319bc27a5d3f7df9206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4d57502931fbcfcdb3b319b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 5 17:19:24 2008 +0200 preloader: Silence the warning for the low 64k. --- loader/preloader.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 0ca33fd..109ad3f 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -1084,8 +1084,10 @@ void* wld_start( void **stack ) if (wld_mmap( preload_info[i].addr, preload_info[i].size, PROT_NONE, MAP_FIXED | MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, -1, 0 ) == (void *)-1) { - wld_printf( "preloader: Warning: failed to reserve range %p-%p\n", - preload_info[i].addr, (char *)preload_info[i].addr + preload_info[i].size ); + /* don't warn for low 64k */ + if (preload_info[i].addr >= (void *)0x10000) + wld_printf( "preloader: Warning: failed to reserve range %p-%p\n", + preload_info[i].addr, (char *)preload_info[i].addr + preload_info[i].size ); remove_preload_range( i ); i--; }

1 0

Alexandre Julliard : winex11: The XIM callback is called with the X11 lock held.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: dffab36e8b4a0f9efaef9701da4f75b1b976e02c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffab36e8b4a0f9efaef9701d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 5 15:08:33 2008 +0200 winex11: The XIM callback is called with the X11 lock held. --- dlls/winex11.drv/xim.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index a4fbdb2..8512583 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -374,8 +374,10 @@ static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data) } /*********************************************************************** -* X11DRV Ime creation -*/ + * X11DRV Ime creation + * + * Should always be called with the x11 lock held + */ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); @@ -385,13 +387,10 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data) XIM xim; XIMCallback destroy; - wine_tsx11_lock(); - xim = XOpenIM(display, NULL, NULL, NULL); if (xim == NULL) { WARN("Could not open input method.\n"); - wine_tsx11_unlock(); return; } @@ -411,7 +410,6 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data) { WARN("Could not find supported input style.\n"); XCloseIM(xim); - wine_tsx11_unlock(); return; } else @@ -474,8 +472,10 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data) thread_data->xim = xim; XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, NULL); + wine_tsx11_unlock(); IME_UpdateAssociation(NULL); + wine_tsx11_lock(); }

1 0

Jens Albretsen : shell32: Added missing Danish translations.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 22328d0ce51c300375ebbb2e9e2cf73200f431ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=22328d0ce51c300375ebbb2e9… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 4 23:48:48 2008 +0200 shell32: Added missing Danish translations. --- dlls/shell32/shell32_Da.rc | 232 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 217 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22328d0ce51c300375ebb…

1 0

Jens Albretsen : wordpad: Added Danish translation.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 19f452a5a9c72db97c5af3d37f8914b661987ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f452a5a9c72db97c5af3d37… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 4 23:41:45 2008 +0200 wordpad: Added Danish translation. --- programs/wordpad/Da.rc | 237 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/rsrc.rc | 1 + 2 files changed, 238 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Da.rc b/programs/wordpad/Da.rc new file mode 100644 index 0000000..092d190 --- /dev/null +++ b/programs/wordpad/Da.rc @@ -0,0 +1,237 @@ +/* + * Copyright 2008 by Jens Albretsen <jens(a)albretsen.dk> + * + * 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 + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Ny...\tCtrl+N", ID_FILE_NEW + MENUITEM "&�ben ...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Gemme\tCtrl+S", ID_FILE_SAVE + MENUITEM "Gemme &som ...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Udskriv ...\tCtrl+P", ID_PRINT + MENUITEM "&Forh�ndsvisning ...", ID_PREVIEW + MENUITEM "&Side indstillinger ...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&Afslut", ID_FILE_EXIT + END + POPUP "R&ediger" + BEGIN + MENUITEM "&Fortryd\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Gendag\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Klip\tCtrl+X", ID_EDIT_CUT + MENUITEM "K&opier\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Inds�t\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&Fjern\tDEL", ID_EDIT_CLEAR + MENUITEM "&Marker alt\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&S�g efter ...\tCrtl+F", ID_FIND + MENUITEM "S�g efter &n�ste\tF3", ID_FIND_NEXT + MENUITEM "E&rstat ...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "S&krivebeskyttet", ID_EDIT_READONLY + MENUITEM "�&ndret", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&Ekstra" + BEGIN + MENUITEM "&Information om markeret omr�de", ID_EDIT_SELECTIONINFO + MENUITEM "Tegn&format", ID_EDIT_CHARFORMAT + MENUITEM "Stan&dard tegnformat", ID_EDIT_DEFCHARFORMAT + MENUITEM "&Afsnitsformat", ID_EDIT_PARAFORMAT + MENUITEM "&Hent tekst", ID_EDIT_GETTEXT + END + END + POPUP "&Vis" + BEGIN + MENUITEM "V�rk&t�jslinie", ID_TOGGLE_TOOLBAR + MENUITEM "&Formatteringlinie", ID_TOGGLE_FORMATBAR + MENUITEM "&Lineal", ID_TOGGLE_RULER + MENUITEM "&Statuslinie", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Alternativer ...", ID_VIEWPROPERTIES + END + POPUP "&Inds�t" + BEGIN + MENUITEM "&Dato og tid ...", ID_DATETIME + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Skrifttype ...", ID_FONTSETTINGS + MENUITEM "&Bullets" ID_BULLET + MENUITEM "&Afsnit ..." ID_PARAFORMAT + MENUITEM "&Tabulatorer ..." ID_TABSTOPS + POPUP "&Baggrund" + BEGIN + MENUITEM "&System\tCtrl+1", ID_BACK_1 + MENUITEM "&Huskeseddel\tCtrl+2", ID_BACK_2 + END + END + POPUP "&Hj�lp" + BEGIN + MENUITEM "&Om Wine Wordpad" ID_ABOUT + END +END + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Klip" ID_EDIT_CUT + MENUITEM "K&opier" ID_EDIT_COPY + MENUITEM "&Inds�t" ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Bullets" ID_BULLET + MENUITEM "&Afsnit ..." ID_PARAFORMAT + END +END + +IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Dato og tid" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Tilg�ngelige formater",0,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,87,12,40,12 + PUSHBUTTON "&Annuller",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ny" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Ny dokumenttype",0,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,97,12,40,12 + PUSHBUTTON "&Annuller",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Formater afsnit" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Indryk", 0, 10, 10, 120, 68 + LTEXT "Venstre", 0, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "H�jre", 0, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "F�rste linie", 0, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "Justering", 0, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Tabulatorer" +FONT 8, "MS SHell DLg" +BEGIN + GROUPBOX "Tabulatorstop", 0, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "&Tilf�j", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&Fjern", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Annuller", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "Fjern all&e", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +STYLE DS_SYSMODAL +Caption "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Liniebrydning", 0, 10, 10, 130, 85 + RADIOBUTTON "Bryd tekst efter v&indusbredden", IDC_PAGEFMT_WW, 18, 25, 117, 15 + RADIOBUTTON "Bryd tekst efter &margen", IDC_PAGEFMT_WM, 18, 45, 117, 15 + GROUPBOX "V�rkt�jslinier", 0, 150, 10, 120, 85 + CHECKBOX "&V�rkt�jslinie", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "&Formatteringlinie", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "&Lineal", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statuslinie", IDC_PAGEFMT_SB, 160, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "Rig tekstformat (*.rtf)" + STRING_TEXT_FILES_TXT, "Tekstdokument (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicode-tekstdokument (*.txt)" + STRING_ALL_FILES, "Alle filer (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "Rig tekstdokument" + STRING_NEWFILE_TXT, "Tekstdokument" + STRING_NEWFILE_TXT_UNICODE, "Tekstdokument (Unicode)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "Venstrestillet" + STRING_ALIGN_RIGHT, "H�jrestillet" + STRING_ALIGN_CENTER, "Midterstillet" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "Printerfiler (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Alternativer" + STRING_VIEWPROPS_TEXT, "Tekst" + STRING_VIEWPROPS_RICHTEXT, "Rig tekst" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "Udskriv" + STRING_PREVIEW_NEXTPAGE, "N�ste side" + STRING_PREVIEW_PREVPAGE, "Forrige side" + STRING_PREVIEW_TWOPAGES, "To sider" + STRING_PREVIEW_ONEPAGE, "�n side" + STRING_PREVIEW_CLOSE, "Luk" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_UNITS_CM, "cm" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "Dokument" + STRING_PROMPT_SAVE_CHANGES, "Gemme �ndringer i �%s�?" + STRING_SEARCH_FINISHED, "F�rdig med at s�ge i dokumentet." + STRING_LOAD_RICHED_FAILED, "Kunne ikke indl�se RichEdit-biblioteket." + STRING_SAVE_LOSEFORMATTING, "Du har valgt at gemme i rent tekstformat, noget som " \ + "vil medf�re at al formatering g�r tabt. Er du " \ + "sikker p� at du vil forts�tte?" + STRING_INVALID_NUMBER, "Ugyldigt talformat" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage dokumenter er ikke underst�ttet" +END diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 58eae27..452f920 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -64,6 +64,7 @@ IDI_WRI ICON "wri.ico" /* @makedep: txt.ico */ IDI_TXT ICON "txt.ico" +#include "Da.rc" #include "De.rc" #include "En.rc" #include "Fr.rc"

1 0

Jens Albretsen : shlwapi: Added Danish translation.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 67afde85046d2d2dcc34c07c5cb0c6f1df20eef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67afde85046d2d2dcc34c07c5… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 4 22:38:24 2008 +0200 shlwapi: Added Danish translation. --- dlls/shlwapi/shlwapi.rc | 1 + dlls/shlwapi/shlwapi_Da.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.rc b/dlls/shlwapi/shlwapi.rc index 28d6f43..2b50214 100644 --- a/dlls/shlwapi/shlwapi.rc +++ b/dlls/shlwapi/shlwapi.rc @@ -25,6 +25,7 @@ #include "version.rc" +#include "shlwapi_Da.rc" #include "shlwapi_De.rc" #include "shlwapi_En.rc" #include "shlwapi_Eo.rc" diff --git a/dlls/shlwapi/shlwapi_Da.rc b/dlls/shlwapi/shlwapi_Da.rc new file mode 100644 index 0000000..4ed0e61 --- /dev/null +++ b/dlls/shlwapi/shlwapi_Da.rc @@ -0,0 +1,43 @@ +/* + * English resources for shlwapi + * + * Copyright 2008 Jens Albretsen + * + * 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 + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Fejl!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Vis ikke denne besked igen", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Annuller" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nej" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ + IDS_BYTES_FORMAT "%ld bytes" + IDS_TIME_INTERVAL_HOURS " hr" + IDS_TIME_INTERVAL_MINUTES " min" + IDS_TIME_INTERVAL_SECONDS " sec" +}

1 0

Jens Albretsen : comdlg: Added missing Danish translations.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 12f296b8a7a0482d9c7ad9b642fbd013a9e22484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f296b8a7a0482d9c7ad9b64… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 4 22:30:21 2008 +0200 comdlg: Added missing Danish translations. --- dlls/comdlg32/cdlg_Da.rc | 283 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 274 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12f296b8a7a0482d9c7ad…

1 0

Jens Albretsen : wineps.drv: Added Danish translation.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 48a83b0b66f7a0714f261ccd3aadf8d44f036646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a83b0b66f7a0714f261ccd3… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 4 22:16:48 2008 +0200 wineps.drv: Added Danish translation. --- dlls/wineps.drv/rsrc.rc | 1 + dlls/wineps.drv/wps_Da.rc | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/rsrc.rc b/dlls/wineps.drv/rsrc.rc index 54f888b..d12b185 100644 --- a/dlls/wineps.drv/rsrc.rc +++ b/dlls/wineps.drv/rsrc.rc @@ -34,6 +34,7 @@ */ #include "wps_Bg.rc" #include "wps_Cs.rc" +#include "wps_Da.rc" #include "wps_De.rc" #include "wps_En.rc" #include "wps_Es.rc" diff --git a/dlls/wineps.drv/wps_Da.rc b/dlls/wineps.drv/wps_Da.rc new file mode 100644 index 0000000..0b54ca5 --- /dev/null +++ b/dlls/wineps.drv/wps_Da.rc @@ -0,0 +1,37 @@ +/* + * Copyright 2008 Jens Albretsen <jens(a)albretsen.dk> + * + * 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 + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Papir" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Papirst�rrelse:", -1, 10, 6, 100, 8 + LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | + WS_TABSTOP + GROUPBOX "Retning", -1, 10, 80, 200, 50 + CONTROL "&St�ende", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + WS_TABSTOP, 20, 90, 60, 10 + CONTROL "&Liggende", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + 20, 110, 60, 10 + LTEXT "Retninger:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | + WS_TABSTOP +}

1 0

Jens Albretsen : credui: Added Danish translation.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: e162f9d787e84e4b1078c6b279a8593c60b52c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e162f9d787e84e4b1078c6b27… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 4 19:00:25 2008 +0200 credui: Added Danish translation. --- dlls/credui/credui.rc | 1 + dlls/credui/credui_Da.rc | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index 28a887d..1de419f 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -27,6 +27,7 @@ /* @makedep: banner.bmp */ IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp +#include "credui_Da.rc" #include "credui_De.rc" #include "credui_En.rc" #include "credui_Es.rc" diff --git a/dlls/credui/credui_Da.rc b/dlls/credui/credui_Da.rc new file mode 100644 index 0000000..943882e --- /dev/null +++ b/dlls/credui/credui_Da.rc @@ -0,0 +1,50 @@ +/* + * Danish language resource file for Credentials UI + * + * Copyright 2008 Jens Albretsen + * + * 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 + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Brugernavn:",IDC_STATIC,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Kodeord:",IDC_STATIC,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&Husk mit kodeord",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Annuller",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Tilslut til %s" + IDS_MESSAGEFORMAT "Tilslutter til %s" + IDS_INCORRECTPASSWORDTITLE "Tilslutning fejlede" + IDS_INCORRECTPASSWORD "V�r sikker p� at dit brugernavn\nog kodeord er korrekt." + IDS_CAPSLOCKONTITLE "Caps Lock er p�" + IDS_CAPSLOCKON "Caps Lock kan v�re skyld i at taster dit kodeord forkert.\n\nTryk p� Caps Lock tasten for at sl� det fra\nf�r du indtaster dit kodeord." +}

1 0

Jens Albretsen : avifil32: Added Danish translation.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: b434e2c2abfa3ae1629afc366a2b590ed504cc6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b434e2c2abfa3ae1629afc366… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 4 17:20:43 2008 +0200 avifil32: Added Danish translation. --- dlls/avifil32/avifile_Da.rc | 50 +++++++++++++++++++++++++++++++++++++++++++ dlls/avifil32/rsrc.rc | 1 + 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/avifil32/avifile_Da.rc b/dlls/avifil32/avifile_Da.rc new file mode 100644 index 0000000..a9ca5e7 --- /dev/null +++ b/dlls/avifil32/avifile_Da.rc @@ -0,0 +1,50 @@ +/* + * Copyright 2008 Jens Albretsen + * + * 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 + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Komprimerings indstillinger" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&V�lg en stream:",-1,2,5,114,10 + COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Indstillinger...",IDC_OPTIONS,145,17,45,14 + AUTOCHECKBOX "&Interleave hver",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL + LTEXT "billeder",-1,104,43,36,9 + LTEXT "Nuv�rende format:",-1,3,56,53,9 + LTEXT "This space for rent",IDC_FORMATTEXT,55,56,90,26 + DEFPUSHBUTTON "OK",IDOK,145,42,45,14 + PUSHBUTTON "Annuller",IDCANCEL,145,61,45,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "Lydkurve: %s" + IDS_WAVEFILETYPE "Lydkurve" + IDS_ALLMULTIMEDIA "Alle multimedia filer" + IDS_ALLFILES "Alle files (*.*)(a)*.*" + IDS_VIDEO "video" + IDS_AUDIO "audio" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Wine AVI-default-filehandler" + IDS_UNCOMPRESSED "ukomprimeret" +} diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc index c8c0682..bd56594 100644 --- a/dlls/avifil32/rsrc.rc +++ b/dlls/avifil32/rsrc.rc @@ -39,6 +39,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL * in one of the specific files. */ #include "avifile_Cs.rc" +#include "avifile_Da.rc" #include "avifile_De.rc" #include "avifile_En.rc" #include "avifile_Es.rc"

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
73
Older →

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