March 2010 - Wine-Commits - list.winehq.org

Nikolay Sivov : t2embed: Add TTGetEmbeddingType stub.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: b16b122091e98a4f013d4d4279b7bf15e585781f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16b122091e98a4f013d4d427… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 30 21:48:32 2010 +0400 t2embed: Add TTGetEmbeddingType stub. --- dlls/t2embed/main.c | 7 +++++++ dlls/t2embed/t2embed.spec | 2 +- include/t2embapi.h | 8 ++++++++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index c9c5dc5..a0abc57 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -59,3 +59,10 @@ LONG WINAPI TTLoadEmbeddedFont(HANDLE *phFontReference, ULONG ulFlags, return E_API_NOTIMPL; } + +LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) +{ + FIXME("(%p %p) stub\n", hDC, status); + if (status) *status = EMBED_NOEMBEDDING; + return E_API_NOTIMPL; +} diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index ed5d25b..828501c 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -4,7 +4,7 @@ @ stub TTEmbedFontFromFileA @ stub TTEnableEmbeddingForFacename @ stub TTGetEmbeddedFontInfo -@ stub TTGetEmbeddingType +@ stdcall TTGetEmbeddingType(ptr ptr) @ stub TTIsEmbeddingEnabled @ stub TTIsEmbeddingEnabledForFacename @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) diff --git a/include/t2embapi.h b/include/t2embapi.h index f199764..d0ddef2 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -39,6 +39,14 @@ typedef struct LONG WINAPI TTLoadEmbeddedFont(HANDLE*,ULONG,ULONG*,ULONG,ULONG*,READEMBEDPROC, LPVOID,LPWSTR,LPSTR,TTLOADINFO*); +/* embedding privileges */ +#define EMBED_PREVIEWPRINT 1 +#define EMBED_EDITABLE 2 +#define EMBED_INSTALLABLE 3 +#define EMBED_NOEMBEDDING 4 + +LONG WINAPI TTGetEmbeddingType(HDC, ULONG*); + #ifdef __cplusplus } #endif

1 0

Alexandre Julliard : shell32: Pack the systray data structure to allow crossing 32/64 boundaries.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 4c2c3effb5ca12c19378ade785064843f3f1bfc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c2c3effb5ca12c19378ade78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 21:26:26 2010 +0200 shell32: Pack the systray data structure to allow crossing 32/64 boundaries. --- dlls/shell32/systray.c | 91 ++++++++++++++++++++++++++++++------------- programs/explorer/systray.c | 89 ++++++++++++++++++++++++----------------- 2 files changed, 116 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c2c3effb5ca12c19378a…

1 0

Juan Lang : rsaenh: Add tests of KP_SALT parameter.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: ece32e7f127dfb039da341515cbe87c13f91c632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece32e7f127dfb039da341515… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 30 12:03:31 2010 -0700 rsaenh: Add tests of KP_SALT parameter. --- dlls/rsaenh/tests/rsaenh.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 94b1ed0..9e17531 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -493,6 +493,10 @@ static void test_block_cipher_modes(void) result = CryptSetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, 0); ok(result, "%08x\n", GetLastError()); + result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + ok(dwLen == 11 || broken(dwLen == 0 /* Win9x/NT4 */), "unexpected salt length %d\n", dwLen); + dwLen = 23; result = CryptEncrypt(hKey, 0, TRUE, 0, NULL, &dwLen, 24); ok(result, "CryptEncrypt failed: %08x\n", GetLastError()); @@ -738,6 +742,12 @@ static void test_aes(int keylen) for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; + /* AES provider doesn't support salt */ + result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); + todo_wine + ok(!result && (GetLastError() == NTE_BAD_KEY || GetLastError() == ERROR_NO_TOKEN /* Win7 */), + "expected NTE_BAD_KEY or ERROR_NO_TOKEN, got %08x\n", GetLastError()); + dwLen = 13; result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); ok(result, "%08x\n", GetLastError()); @@ -944,8 +954,13 @@ static void test_rc2(void) result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); + /* The default salt length is always 11... */ + ok(dwLen == 11, "unexpected salt length %d\n", dwLen); + /* and the default salt is always empty. */ pbTemp = HeapAlloc(GetProcessHeap(), 0, dwLen); CryptGetKeyParam(hKey, KP_SALT, pbTemp, &dwLen, 0); + for (i=0; i<dwLen; i++) + ok(!pbTemp[i], "unexpected salt value %02x @ %d\n", pbTemp[i], i); HeapFree(GetProcessHeap(), 0, pbTemp); dwLen = sizeof(DWORD); @@ -969,6 +984,16 @@ static void test_rc2(void) result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen); ok(result, "%08x\n", GetLastError()); + /* Setting the salt also succeeds... */ + result = CryptSetKeyParam(hKey, KP_SALT, pbData, 0); + todo_wine + ok(result, "setting salt failed: %08x\n", GetLastError()); + /* but the resulting salt length is now zero? */ + dwLen = 0; + result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + todo_wine + ok(dwLen == 0, "unexpected salt length %d\n", dwLen); /* What sizes salt can I set? */ salt.pbData = pbData; for (i=0; i<24; i++) @@ -976,6 +1001,10 @@ static void test_rc2(void) salt.cbData = i; result = CryptSetKeyParam(hKey, KP_SALT_EX, (BYTE *)&salt, 0); ok(result, "setting salt failed for size %d: %08x\n", i, GetLastError()); + /* The returned salt length is the same as the set salt length */ + result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + ok(dwLen == i, "size %d: unexpected salt length %d\n", i, dwLen); } salt.cbData = 25; SetLastError(0xdeadbeef); @@ -1123,6 +1152,15 @@ static void test_rc4(void) result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen); ok(result, "%08x\n", GetLastError()); + /* Setting the salt also succeeds... */ + result = CryptSetKeyParam(hKey, KP_SALT, pbData, 0); + todo_wine + ok(result, "setting salt failed: %08x\n", GetLastError()); + /* but the resulting salt length is now zero? */ + dwLen = 0; + result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + ok(dwLen == 0, "unexpected salt length %d\n", dwLen); /* What sizes salt can I set? */ salt.pbData = pbData; for (i=0; i<24; i++) @@ -1130,6 +1168,10 @@ static void test_rc4(void) salt.cbData = i; result = CryptSetKeyParam(hKey, KP_SALT_EX, (BYTE *)&salt, 0); ok(result, "setting salt failed for size %d: %08x\n", i, GetLastError()); + /* The returned salt length is the same as the set salt length */ + result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + ok(dwLen == i, "size %d: unexpected salt length %d\n", i, dwLen); } salt.cbData = 25; SetLastError(0xdeadbeef); @@ -1701,6 +1743,12 @@ static void test_rsa_encrypt(void) "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT," " got %08x\n", dwVal); + /* An RSA key doesn't support salt */ + result = CryptGetKeyParam(hRSAKey, KP_SALT, NULL, &dwLen, 0); + todo_wine + ok(!result && GetLastError() == NTE_BAD_KEY, + "expected NTE_BAD_KEY, got %08x\n", GetLastError()); + /* The key exchange key's public key may be exported.. */ result = CryptExportKey(hRSAKey, 0, PUBLICKEYBLOB, 0, NULL, &dwLen); ok(result, "%08x\n", GetLastError());

1 0

Alexandre Julliard : user32: Pack the structure for WM_DDE_ACK to allow crossing 32/64 boundaries.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 01578f51bae7d75a1360a5d3a413d4079e3ae887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01578f51bae7d75a1360a5d3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:42:09 2010 +0200 user32: Pack the structure for WM_DDE_ACK to allow crossing 32/64 boundaries. --- dlls/user32/message.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a2401e4..b93c703 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2000,8 +2000,9 @@ static BOOL post_dde_message( struct packed_message *data, const struct send_mes HGLOBAL h = dde_get_pair( (HANDLE)uiHi ); if (h) { + ULONGLONG hpack = pack_ptr( h ); /* send back the value of h on the other side */ - push_data( data, &h, sizeof(HGLOBAL) ); + push_data( data, &hpack, sizeof(hpack) ); lp = uiLo; TRACE( "send dde-ack %lx %08lx => %p\n", uiLo, uiHi, h ); } @@ -2102,11 +2103,13 @@ static BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM case WM_DDE_ACK: if (size) { + ULONGLONG hpack; /* hMem is being passed */ - if (size != sizeof(HGLOBAL)) return FALSE; + if (size != sizeof(hpack)) return FALSE; if (!buffer || !*buffer) return FALSE; uiLo = *lparam; - memcpy( &hMem, *buffer, size ); + memcpy( &hpack, *buffer, size ); + hMem = unpack_ptr( hpack ); uiHi = (UINT_PTR)hMem; TRACE("recv dde-ack %lx mem=%lx[%lx]\n", uiLo, uiHi, GlobalSize( hMem )); }

1 0

André Hentschel : wineboot: Update German translation.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 99f9269e9b6d237aac85efcf07f9a8b38ad08df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f9269e9b6d237aac85efcf0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 30 19:43:35 2010 +0200 wineboot: Update German translation. --- programs/wineboot/wineboot_De.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot_De.rc b/programs/wineboot/wineboot_De.rc index b65e8f3..2bfc03d 100644 --- a/programs/wineboot/wineboot_De.rc +++ b/programs/wineboot/wineboot_De.rc @@ -38,3 +38,13 @@ BEGIN LTEXT "Wenn Sie das Programm beenden, können Sie ungespeicherte Daten verlieren.", IDC_STATIC,7,28,172,19 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "Die Konfiguration von Wine in %s wird aktualisiert, bitte warten...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

Paul Vriens : ddrawex/tests: Don't crash on some Win98/WinMe boxes.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: d82bd17dd107d14fdadd990d7c733b6934281d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82bd17dd107d14fdadd990d7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 30 19:44:59 2010 +0200 ddrawex/tests: Don't crash on some Win98/WinMe boxes. --- dlls/ddrawex/tests/surface.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index d5a26b5..d5d347b 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -261,6 +261,11 @@ static void test_surface_from_dc3(void) ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw3_CreateSurface(dd3, &ddsd, &surf1, NULL); + if (hr == DDERR_UNSUPPORTEDMODE) { + win_skip("Unsupported mode\n"); + IDirectDraw3_Release(dd3); + return; + } ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x.\n", hr); hr = IDirectDrawSurface3_QueryInterface(surf1, &IID_IDirectDrawSurface, (void **)&surf3); @@ -323,6 +328,11 @@ static void test_surface_from_dc4(void) ddsd2.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw4_CreateSurface(dd4, &ddsd2, &surf4, NULL); + if (hr == DDERR_UNSUPPORTEDMODE) { + win_skip("Unsupported mode\n"); + IDirectDraw3_Release(dd4); + return; + } ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x.\n", hr); hr = IDirectDrawSurface4_QueryInterface(surf4, &IID_IDirectDrawSurface, (void **)&surf1);

1 0

Juan Lang : rsaenh: Support setting salt via KP_SALT (resend).
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: c5a6b7b36674e8b7f7dc687b01773b88fa7d7312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a6b7b36674e8b7f7dc687b0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 30 10:26:48 2010 -0700 rsaenh: Support setting salt via KP_SALT (resend). --- dlls/rsaenh/rsaenh.c | 27 +++++++++++++++++++++++++++ dlls/rsaenh/tests/rsaenh.c | 3 --- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 74ad392..d35805a 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3354,6 +3354,33 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam setup_key(pCryptKey); return TRUE; + case KP_SALT: + switch (pCryptKey->aiAlgid) { + case CALG_RC2: + case CALG_RC4: + if (!pbData) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + /* MSDN: the base provider always sets eleven bytes of + * salt value. + */ + memcpy(pCryptKey->abKeyValue + pCryptKey->dwKeyLen, + pbData, 11); + pCryptKey->dwSaltLen = 11; + setup_key(pCryptKey); + /* Strange but true: salt length reset to 0 after setting + * it via KP_SALT. + */ + pCryptKey->dwSaltLen = 0; + break; + default: + SetLastError(NTE_BAD_KEY); + return FALSE; + } + return TRUE; + case KP_SALT_EX: { CRYPT_INTEGER_BLOB *blob = (CRYPT_INTEGER_BLOB *)pbData; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 9e17531..53fc0d6 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -986,13 +986,11 @@ static void test_rc2(void) /* Setting the salt also succeeds... */ result = CryptSetKeyParam(hKey, KP_SALT, pbData, 0); - todo_wine ok(result, "setting salt failed: %08x\n", GetLastError()); /* but the resulting salt length is now zero? */ dwLen = 0; result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - todo_wine ok(dwLen == 0, "unexpected salt length %d\n", dwLen); /* What sizes salt can I set? */ salt.pbData = pbData; @@ -1154,7 +1152,6 @@ static void test_rc4(void) /* Setting the salt also succeeds... */ result = CryptSetKeyParam(hKey, KP_SALT, pbData, 0); - todo_wine ok(result, "setting salt failed: %08x\n", GetLastError()); /* but the resulting salt length is now zero? */ dwLen = 0;

1 0

Juan Lang : rsaenh: Don't return salt for algorithms that don't support it.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 1991ff2a0cf5d10588d91fde83a602d5faf39cbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1991ff2a0cf5d10588d91fde8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 30 12:05:25 2010 -0700 rsaenh: Don't return salt for algorithms that don't support it. --- dlls/rsaenh/rsaenh.c | 12 ++++++++++-- dlls/rsaenh/tests/rsaenh.c | 2 -- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index d35805a..8a5be99 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3513,8 +3513,16 @@ BOOL WINAPI RSAENH_CPGetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam pCryptKey->dwBlockLen); case KP_SALT: - return copy_param(pbData, pdwDataLen, - &pCryptKey->abKeyValue[pCryptKey->dwKeyLen], pCryptKey->dwSaltLen); + switch (pCryptKey->aiAlgid) { + case CALG_RC2: + case CALG_RC4: + return copy_param(pbData, pdwDataLen, + &pCryptKey->abKeyValue[pCryptKey->dwKeyLen], + pCryptKey->dwSaltLen); + default: + SetLastError(NTE_BAD_KEY); + return FALSE; + } case KP_PADDING: dwValue = PKCS5_PADDING; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 53fc0d6..b4bdcfa 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -744,7 +744,6 @@ static void test_aes(int keylen) /* AES provider doesn't support salt */ result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); - todo_wine ok(!result && (GetLastError() == NTE_BAD_KEY || GetLastError() == ERROR_NO_TOKEN /* Win7 */), "expected NTE_BAD_KEY or ERROR_NO_TOKEN, got %08x\n", GetLastError()); @@ -1742,7 +1741,6 @@ static void test_rsa_encrypt(void) /* An RSA key doesn't support salt */ result = CryptGetKeyParam(hRSAKey, KP_SALT, NULL, &dwLen, 0); - todo_wine ok(!result && GetLastError() == NTE_BAD_KEY, "expected NTE_BAD_KEY, got %08x\n", GetLastError());

1 0

Frédéric Delanoy : wineboot: Updated French translation.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 2202bd3e3e0b0292978b0e98eb001b1ce9dc29c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2202bd3e3e0b0292978b0e98e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Mar 30 20:50:01 2010 +0200 wineboot: Updated French translation. --- programs/wineboot/wineboot_Fr.rc | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/programs/wineboot/wineboot_Fr.rc b/programs/wineboot/wineboot_Fr.rc index 6229e90..d927504 100644 --- a/programs/wineboot/wineboot_Fr.rc +++ b/programs/wineboot/wineboot_Fr.rc @@ -2,6 +2,7 @@ * WineBoot resources * * Copyright 2007 Jonathan Ernst + * Copyright 2010 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,19 +22,30 @@ #include "resource.h" +/* UTF-8 */ #pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 +IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 79 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Attente du programme" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Annuler",IDCANCEL,129,49,50,15 - PUSHBUTTON "Arrêter le programme",IDOK,51,49,71,15 - LTEXT "Une simulation de déconnexion ou d'extinction est en cours, mais ce programme ne répond pas.", - IDC_STATIC,7,7,172,19 - LTEXT "Si vous arrêtez le programme, vous pouvez perdre toutes les données non enregistrées.", - IDC_STATIC,7,28,172,15 + DEFPUSHBUTTON "Annuler",IDCANCEL,129,58,50,15 + PUSHBUTTON "Arrêter le programme",IDOK,49,58,76,15 + LTEXT "Une simulation de déconnexion ou d'extinction de l'ordinateur est en cours, mais ce programme ne répond pas.", + IDC_STATIC,7,7,172,25 + LTEXT "Si vous l'arrêtez, vous pouvez perdre toutes les données non enregistrées.", + IDC_STATIC,7,35,172,17 +END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "La configuration de Wine est en cours de mise à jour dans %s ; veuillez patienter...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX END

1 0

Aurimas Fišeras : wineboot: Update Lithuanian translation.
by Alexandre Julliard March 31, 2010

March 31, 2010

Module: wine Branch: master Commit: 9e0c62d61abd0a31a30c58caba714b137045866e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0c62d61abd0a31a30c58cab… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Mar 30 19:07:38 2010 +0300 wineboot: Update Lithuanian translation. --- programs/wineboot/wineboot_Lt.rc | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/wineboot_Lt.rc b/programs/wineboot/wineboot_Lt.rc index 7db56e9..1ecb0a9 100644 --- a/programs/wineboot/wineboot_Lt.rc +++ b/programs/wineboot/wineboot_Lt.rc @@ -1,7 +1,7 @@ /* * WineBoot Lithuanian resources * - * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * Copyright 2009-2010 Aurimas Fišeras <aurimas(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,3 +38,13 @@ BEGIN LTEXT "Jei nutrauksite procesą, tai galite prarasti visus neišsaugotus duomenis.", IDC_STATIC,7,28,172,17 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "Wine konfigūracija (%s) yra atnaujinama, prašome palaukti...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0