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

Hans Leidekker : winhttp: Add a partial implementation of WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT .
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: be370380901c506bafe33e0fafd0592ebd73eea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be370380901c506bafe33e0fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 20 14:49:52 2010 +0200 winhttp: Add a partial implementation of WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT. --- dlls/winhttp/session.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 12 ++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 490da05..e0c1c2f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -559,6 +559,18 @@ static void str_to_buffer( WCHAR *buffer, const WCHAR *str, LPDWORD buflen ) *buflen = len * sizeof(WCHAR); } +static WCHAR *blob_to_str( DWORD encoding, CERT_NAME_BLOB *blob ) +{ + WCHAR *ret; + DWORD size, format = CERT_SIMPLE_NAME_STR | CERT_NAME_STR_CRLF_FLAG; + + size = CertNameToStrW( encoding, blob, format, NULL, 0 ); + if ((ret = LocalAlloc( 0, size * sizeof(WCHAR) ))) + CertNameToStrW( encoding, blob, format, ret, size ); + + return ret; +} + static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) { request_t *request = (request_t *)hdr; @@ -598,6 +610,34 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf *buflen = sizeof(cert); return TRUE; } + case WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT: + { + const CERT_CONTEXT *cert; + WINHTTP_CERTIFICATE_INFO *ci = buffer; + + FIXME("partial stub\n"); + + if (!buffer || *buflen < sizeof(*ci)) + { + *buflen = sizeof(*ci); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + if (!(cert = netconn_get_certificate( &request->netconn ))) return FALSE; + + ci->ftExpiry = cert->pCertInfo->NotAfter; + ci->ftStart = cert->pCertInfo->NotBefore; + ci->lpszSubjectInfo = blob_to_str( cert->dwCertEncodingType, &cert->pCertInfo->Subject ); + ci->lpszIssuerInfo = blob_to_str( cert->dwCertEncodingType, &cert->pCertInfo->Issuer ); + ci->lpszProtocolName = NULL; + ci->lpszSignatureAlgName = NULL; + ci->lpszEncryptionAlgName = NULL; + ci->dwKeySize = 128; + + CertFreeCertificateContext( cert ); + *buflen = sizeof(*ci); + return TRUE; + } case WINHTTP_OPTION_SECURITY_KEY_BITNESS: { if (!buffer || *buflen < sizeof(DWORD)) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 05c548c..21cc501 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -770,6 +770,7 @@ static void test_secure_connection(void) DWORD size, status, policy, bitness; BOOL ret; CERT_CONTEXT *cert; + WINHTTP_CERTIFICATE_INFO info; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -823,6 +824,17 @@ static void test_secure_connection(void) ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_KEY_BITNESS, &bitness, &size ); ok(ret, "failed to retrieve key bitness %u\n", GetLastError()); + size = sizeof(info); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size ); + ok(ret, "failed to retrieve certificate info %u\n", GetLastError()); + + trace("lpszSubjectInfo %s\n", wine_dbgstr_w(info.lpszSubjectInfo)); + trace("lpszIssuerInfo %s\n", wine_dbgstr_w(info.lpszIssuerInfo)); + trace("lpszProtocolName %s\n", wine_dbgstr_w(info.lpszProtocolName)); + trace("lpszSignatureAlgName %s\n", wine_dbgstr_w(info.lpszSignatureAlgName)); + trace("lpszEncryptionAlgName %s\n", wine_dbgstr_w(info.lpszEncryptionAlgName)); + trace("dwKeySize %u\n", info.dwKeySize); + ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError());

1 0

Andrey Turkin : kernel32: Enhance EndUpdateResource.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: a610fc17d8dd215651d272eb1787e011b2c5549a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a610fc17d8dd215651d272eb1… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed Jul 21 17:57:37 2010 +0400 kernel32: Enhance EndUpdateResource. --- dlls/kernel32/resource.c | 116 +++++++++++---- dlls/kernel32/tests/resource.c | 323 ++++++++++++++++++++++++++++++++-------- 2 files changed, 344 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a610fc17d8dd215651d27…

1 0

Dylan Smith : user32/tests: Minimized windows shouldn't be resizable.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: f35dabad99cf8fbaec458a67c96ea1aededd4651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35dabad99cf8fbaec458a67c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 20 17:53:15 2010 -0400 user32/tests: Minimized windows shouldn't be resizable. --- dlls/user32/tests/win.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eadad3a..522a0f5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4872,7 +4872,7 @@ static void test_ShowWindow(void) { HWND hwnd; DWORD style; - RECT rcMain, rc; + RECT rcMain, rc, rcMinimized; LPARAM ret; SetRect(&rcMain, 120, 120, 210, 210); @@ -4914,8 +4914,16 @@ static void test_ShowWindow(void) ok(style & WS_VISIBLE, "window should be visible\n"); ok(style & WS_MINIMIZE, "window should be minimized\n"); ok(!(style & WS_MAXIMIZE), "window should not be maximized\n"); + GetWindowRect(hwnd, &rcMinimized); + ok(!EqualRect(&rcMain, &rcMinimized), "rects shouldn't match\n"); + /* shouldn't be able to resize minized windows */ + ret = SetWindowPos(hwnd, 0, 0, 0, + (rcMinimized.right - rcMinimized.left) * 2, + (rcMinimized.bottom - rcMinimized.top) * 2, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + ok(ret, "not expected ret: %lu\n", ret); GetWindowRect(hwnd, &rc); - ok(!EqualRect(&rcMain, &rc), "rects shouldn't match\n"); + todo_wine ok(EqualRect(&rc, &rcMinimized), "rects should match\n"); ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret);

1 0

Michael Stefaniuc : shdoclc: Remove the ignored common resource attributes.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 141e7cdb5492125043ec43cb55a810bfce14a26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=141e7cdb5492125043ec43cb5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 23:56:14 2010 +0200 shdoclc: Remove the ignored common resource attributes. --- dlls/shdoclc/Da.rc | 4 ++-- dlls/shdoclc/De.rc | 4 ++-- dlls/shdoclc/En.rc | 4 ++-- dlls/shdoclc/Es.rc | 4 ++-- dlls/shdoclc/Fr.rc | 4 ++-- dlls/shdoclc/Hu.rc | 4 ++-- dlls/shdoclc/It.rc | 4 ++-- dlls/shdoclc/Ja.rc | 4 ++-- dlls/shdoclc/Ko.rc | 4 ++-- dlls/shdoclc/Lt.rc | 4 ++-- dlls/shdoclc/Nl.rc | 4 ++-- dlls/shdoclc/No.rc | 4 ++-- dlls/shdoclc/Pl.rc | 4 ++-- dlls/shdoclc/Pt.rc | 6 +++--- dlls/shdoclc/Ro.rc | 4 ++-- dlls/shdoclc/Ru.rc | 4 ++-- dlls/shdoclc/Si.rc | 4 ++-- dlls/shdoclc/Sv.rc | 4 ++-- dlls/shdoclc/Uk.rc | 4 ++-- dlls/shdoclc/Zh.rc | 8 ++++---- 20 files changed, 43 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=141e7cdb5492125043ec4…

1 0

Michael Stefaniuc : serialui: Remove the ignored common resource attributes .
by Alexandre Julliard July 22, 2010

July 22, 2010

1 0

Michael Stefaniuc : msi: Remove the ignored common resource attributes.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 7e037305d6317eeb32beb0922896eeea28b9d6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e037305d6317eeb32beb0922… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 23:53:26 2010 +0200 msi: Remove the ignored common resource attributes. --- dlls/msi/msi.rc | 2 +- dlls/msi/msi_Bg.rc | 2 +- dlls/msi/msi_Da.rc | 2 +- dlls/msi/msi_De.rc | 2 +- dlls/msi/msi_En.rc | 2 +- dlls/msi/msi_Eo.rc | 2 +- dlls/msi/msi_Es.rc | 2 +- dlls/msi/msi_Fi.rc | 2 +- dlls/msi/msi_Fr.rc | 2 +- dlls/msi/msi_Hu.rc | 2 +- dlls/msi/msi_It.rc | 2 +- dlls/msi/msi_Ko.rc | 2 +- dlls/msi/msi_Lt.rc | 2 +- dlls/msi/msi_Nl.rc | 2 +- dlls/msi/msi_No.rc | 2 +- dlls/msi/msi_Pl.rc | 2 +- dlls/msi/msi_Pt.rc | 4 ++-- dlls/msi/msi_Ro.rc | 2 +- dlls/msi/msi_Ru.rc | 2 +- dlls/msi/msi_Si.rc | 2 +- dlls/msi/msi_Sr.rc | 4 ++-- dlls/msi/msi_Sv.rc | 2 +- dlls/msi/msi_Tr.rc | 2 +- dlls/msi/msi_Uk.rc | 2 +- dlls/msi/msi_Zh.rc | 4 ++-- 25 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index 466269a..8b26d90 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -21,7 +21,7 @@ #include "windef.h" /* @makedep: msiserver.tlb */ -1 TYPELIB LOADONCALL DISCARDABLE msiserver.tlb +1 TYPELIB msiserver.tlb /* @makedep: instadvert.bmp */ 0x1001 BITMAP instadvert.bmp diff --git a/dlls/msi/msi_Bg.rc b/dlls/msi/msi_Bg.rc index 8aea169..63b0255 100644 --- a/dlls/msi/msi_Bg.rc +++ b/dlls/msi/msi_Bg.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "�� %s �� " diff --git a/dlls/msi/msi_Da.rc b/dlls/msi/msi_Da.rc index fa7e1c4..88aa3bd 100644 --- a/dlls/msi/msi_Da.rc +++ b/dlls/msi/msi_Da.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Kunne ikke �bne den specificerede installationspakke. Kontroller stien og pr�v igen." 5 "kunne ikke finden stien '%s'." diff --git a/dlls/msi/msi_De.rc b/dlls/msi/msi_De.rc index e07b5ef..8c113f9 100644 --- a/dlls/msi/msi_De.rc +++ b/dlls/msi/msi_De.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL #pragma code_page(65001) -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Das angegebene Installationspaket konnte nicht geöffnet werden. Bitte überprüfen Sie den Pfadnamen und versuchen Sie es noch einmal." 5 "Der Pfad %s wurde nicht gefunden." diff --git a/dlls/msi/msi_En.rc b/dlls/msi/msi_En.rc index c506e00..2bfc165 100644 --- a/dlls/msi/msi_En.rc +++ b/dlls/msi/msi_En.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "path %s not found" diff --git a/dlls/msi/msi_Eo.rc b/dlls/msi/msi_Eo.rc index 8b8c8d3..d2c7d96 100644 --- a/dlls/msi/msi_Eo.rc +++ b/dlls/msi/msi_Eo.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "Mi ne trovis la vojon %s" diff --git a/dlls/msi/msi_Es.rc b/dlls/msi/msi_Es.rc index f5425db..b27d7c1 100644 --- a/dlls/msi/msi_Es.rc +++ b/dlls/msi/msi_Es.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "No se ha podido abrir el paquete de instalaci�n especificado. Por favor, compruebe la ruta del archivo y vuelva a intentarlo." 5 "ruta %s no encontrada" diff --git a/dlls/msi/msi_Fi.rc b/dlls/msi/msi_Fi.rc index f3d58bf..7769a8a 100644 --- a/dlls/msi/msi_Fi.rc +++ b/dlls/msi/msi_Fi.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "Polkua %s ei l�ydy." diff --git a/dlls/msi/msi_Fr.rc b/dlls/msi/msi_Fr.rc index 6cd1fc5..62fd941 100644 --- a/dlls/msi/msi_Fr.rc +++ b/dlls/msi/msi_Fr.rc @@ -26,7 +26,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Le paquet d'installation spécifié n'a pu être ouvert. Veuillez vérifier le chemin du fichier et réessayer." 5 "Le chemin %s est introuvable" diff --git a/dlls/msi/msi_Hu.rc b/dlls/msi/msi_Hu.rc index 846de4c..2c21e7c 100644 --- a/dlls/msi/msi_Hu.rc +++ b/dlls/msi/msi_Hu.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "%s �tvonal nem tal�lhat�" diff --git a/dlls/msi/msi_It.rc b/dlls/msi/msi_It.rc index 0586bb4..0c47280 100644 --- a/dlls/msi/msi_It.rc +++ b/dlls/msi/msi_It.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Impossibile aprire il pacchetto di installazione specificato. Per favore controlla l'indirizzo del file e riprova." 5 "percorso %s non trovato" diff --git a/dlls/msi/msi_Ko.rc b/dlls/msi/msi_Ko.rc index 04efd83..346e9be 100644 --- a/dlls/msi/msi_Ko.rc +++ b/dlls/msi/msi_Ko.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 " �� ġ ��Ű�� ϴ�. �� θ� Ȯ��ϰ� �ٽ� �õ��Ͻʽÿ�." 5 "%s ��θ� ã�� ϴ�" diff --git a/dlls/msi/msi_Lt.rc b/dlls/msi/msi_Lt.rc index c88592c..6c2a641 100644 --- a/dlls/msi/msi_Lt.rc +++ b/dlls/msi/msi_Lt.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Nepavyko atverti nurodyto diegimo paketo. Patikrinkite failo kelią ir mėginkite dar kartą." 5 "kelias %s nerastas" diff --git a/dlls/msi/msi_Nl.rc b/dlls/msi/msi_Nl.rc index 306cfd7..29cb8a3 100644 --- a/dlls/msi/msi_Nl.rc +++ b/dlls/msi/msi_Nl.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Het opgegeven installatie pakket kon niet worden geopend. Verifieer het bestandspad en probeer opnieuw." 5 "Pad %s niet gevonden" diff --git a/dlls/msi/msi_No.rc b/dlls/msi/msi_No.rc index 93e26c6..d9e5938 100644 --- a/dlls/msi/msi_No.rc +++ b/dlls/msi/msi_No.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Klarte ikke �pne den oppgitte installasjonspakken. Kontroller filbanen og pr�v igjen." 5 "Fant ikke stien '%s'." diff --git a/dlls/msi/msi_Pl.rc b/dlls/msi/msi_Pl.rc index ceb64dd..e3f8bd4 100644 --- a/dlls/msi/msi_Pl.rc +++ b/dlls/msi/msi_Pl.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Nie uda�o si� otworzy� wybranego pakietu instalacyjnego. Sprawd� czy �cie�ka jest poprawna i spr�buj ponownie." 5 "�cie�ka '%s' nie zosta�a odnaleziona" diff --git a/dlls/msi/msi_Pt.rc b/dlls/msi/msi_Pt.rc index 4a1045c..d8b75d9 100644 --- a/dlls/msi/msi_Pt.rc +++ b/dlls/msi/msi_Pt.rc @@ -26,7 +26,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "O pacote de instalação especificado não pôde ser aberto. Por favor, verifique o arquivo e tente novamente." 5 "caminho %s não encontrado" @@ -67,7 +67,7 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "localização %s não encontrada" diff --git a/dlls/msi/msi_Ro.rc b/dlls/msi/msi_Ro.rc index ffd9c5e..989e848 100644 --- a/dlls/msi/msi_Ro.rc +++ b/dlls/msi/msi_Ro.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Pachetul de instalare menționat nu a putut fi deschis. Verificați calea și încercați din nou." 5 "calea %s nu a fost găsită" diff --git a/dlls/msi/msi_Ru.rc b/dlls/msi/msi_Ru.rc index 7cd4a2b..6e635f5 100644 --- a/dlls/msi/msi_Ru.rc +++ b/dlls/msi/msi_Ru.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Указанный пакет не может быть открыт. Проверьте файл и повторите попытку." 5 "путь %s не найден" diff --git a/dlls/msi/msi_Si.rc b/dlls/msi/msi_Si.rc index 3477f1b..1c689c2 100644 --- a/dlls/msi/msi_Si.rc +++ b/dlls/msi/msi_Si.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Navedenega namestitvenega paketa ni mogoče odpreti. Preverite ime datoteke in poskusite znova." 5 "pot %s ne obstaja" diff --git a/dlls/msi/msi_Sr.rc b/dlls/msi/msi_Sr.rc index 552aec8..ed481ea 100644 --- a/dlls/msi/msi_Sr.rc +++ b/dlls/msi/msi_Sr.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Instalacija ne može biti otvorena. Molimo proverite destinaciju fajla i pokušajte ponovo." 5 "putanja %s nije nađena" @@ -66,7 +66,7 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Инсталација не може бити отворена. Молимо проверите дестинацију фајла и покушајте поново." 5 "путања %s није нађена" diff --git a/dlls/msi/msi_Sv.rc b/dlls/msi/msi_Sv.rc index 4c37cfc..ed61893 100644 --- a/dlls/msi/msi_Sv.rc +++ b/dlls/msi/msi_Sv.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Det angivna installationspaketet kunde inte �ppnas. Kontrollera fils�kv�gen och f�rs�k igen." 5 "s�kv�gen %s hittades inte" diff --git a/dlls/msi/msi_Tr.rc b/dlls/msi/msi_Tr.rc index c6a12c1..ad4c14e 100644 --- a/dlls/msi/msi_Tr.rc +++ b/dlls/msi/msi_Tr.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "The specified installation package could not be opened. Please check the file path and try again." 5 "%s yolu bulunamad�" diff --git a/dlls/msi/msi_Uk.rc b/dlls/msi/msi_Uk.rc index 2407bbe..60e2a3f 100644 --- a/dlls/msi/msi_Uk.rc +++ b/dlls/msi/msi_Uk.rc @@ -27,7 +27,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "Не вдалося відкрити вказаний пакет інсталяції. Перевірте шлях до файлу та спробуйте знов." 5 "шлях %s не знайдено" diff --git a/dlls/msi/msi_Zh.rc b/dlls/msi/msi_Zh.rc index 91fd540..0eb376d 100644 --- a/dlls/msi/msi_Zh.rc +++ b/dlls/msi/msi_Zh.rc @@ -25,7 +25,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "不能打开所指定的安装软件包. 请检查文件路径后再试." 5 "路径 %s 没找到" @@ -66,7 +66,7 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL -STRINGTABLE DISCARDABLE +STRINGTABLE { 4 "不能開啟所指定的安裝軟件包. 請檢查檔案路徑後再試." 5 "路徑 %s 沒找到"

1 0

Michael Stefaniuc : view: Remove the ignored common resource attributes.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 14cef3946bea532c3666e2d7ae37f4eb06c2f3b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14cef3946bea532c3666e2d7a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 23:57:12 2010 +0200 view: Remove the ignored common resource attributes. --- programs/view/Cs.rc | 2 +- programs/view/Cy.rc | 2 +- programs/view/Da.rc | 2 +- programs/view/De.rc | 2 +- programs/view/En.rc | 2 +- programs/view/Eo.rc | 2 +- programs/view/Es.rc | 2 +- programs/view/Fr.rc | 2 +- programs/view/It.rc | 2 +- programs/view/Ja.rc | 2 +- programs/view/Ko.rc | 2 +- programs/view/Lt.rc | 2 +- programs/view/Nl.rc | 2 +- programs/view/No.rc | 2 +- programs/view/Pl.rc | 2 +- programs/view/Pt.rc | 4 ++-- programs/view/Ro.rc | 2 +- programs/view/Ru.rc | 2 +- programs/view/Si.rc | 2 +- programs/view/Sv.rc | 2 +- programs/view/Tr.rc | 2 +- programs/view/Uk.rc | 2 +- programs/view/Zh.rc | 4 ++-- 23 files changed, 25 insertions(+), 25 deletions(-) diff --git a/programs/view/Cs.rc b/programs/view/Cs.rc index 58ee9ca..7527b27 100644 --- a/programs/view/Cs.rc +++ b/programs/view/Cs.rc @@ -71,7 +71,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Oby�ejn� prohl�e� metasoubor�" END diff --git a/programs/view/Cy.rc b/programs/view/Cy.rc index 68ec8f7..9cd7dcc 100644 --- a/programs/view/Cy.rc +++ b/programs/view/Cy.rc @@ -66,7 +66,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Viewer Rheolaidd Metafile" END diff --git a/programs/view/Da.rc b/programs/view/Da.rc index 8996cf8..a9a395b 100644 --- a/programs/view/Da.rc +++ b/programs/view/Da.rc @@ -66,7 +66,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Normal metafil-fremviser" END diff --git a/programs/view/De.rc b/programs/view/De.rc index 736f7bf..3b2e80b 100644 --- a/programs/view/De.rc +++ b/programs/view/De.rc @@ -68,7 +68,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Regulärer Metafile Betrachter" END diff --git a/programs/view/En.rc b/programs/view/En.rc index b201290..0895563 100644 --- a/programs/view/En.rc +++ b/programs/view/En.rc @@ -67,7 +67,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Regular Metafile Viewer" END diff --git a/programs/view/Eo.rc b/programs/view/Eo.rc index bc61a8d..77f1149 100644 --- a/programs/view/Eo.rc +++ b/programs/view/Eo.rc @@ -66,7 +66,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Videbligilo la� Regulaj Metadosieroj" END diff --git a/programs/view/Es.rc b/programs/view/Es.rc index e0f53f3..36cbde3 100644 --- a/programs/view/Es.rc +++ b/programs/view/Es.rc @@ -66,7 +66,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Regular Metafile Viewer" END diff --git a/programs/view/Fr.rc b/programs/view/Fr.rc index bcbb0ca..ee633dc 100644 --- a/programs/view/Fr.rc +++ b/programs/view/Fr.rc @@ -71,7 +71,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Visionneuse de fichiers Metafile réguliers" END diff --git a/programs/view/It.rc b/programs/view/It.rc index c54c264..b26728e 100644 --- a/programs/view/It.rc +++ b/programs/view/It.rc @@ -71,7 +71,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Visualizzatore di Metafile Regolari" END diff --git a/programs/view/Ja.rc b/programs/view/Ja.rc index 0b69216..8c11d4d 100644 --- a/programs/view/Ja.rc +++ b/programs/view/Ja.rc @@ -70,7 +70,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "標準メタファイルビュアー" END diff --git a/programs/view/Ko.rc b/programs/view/Ko.rc index 3451626..efbd9dd 100644 --- a/programs/view/Ko.rc +++ b/programs/view/Ko.rc @@ -68,7 +68,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "�� Ÿ�� " END diff --git a/programs/view/Lt.rc b/programs/view/Lt.rc index fdcf731..c400b33 100644 --- a/programs/view/Lt.rc +++ b/programs/view/Lt.rc @@ -69,7 +69,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Įprastinė metafailų žiūryklė" END diff --git a/programs/view/Nl.rc b/programs/view/Nl.rc index 62627f4..047e451 100644 --- a/programs/view/Nl.rc +++ b/programs/view/Nl.rc @@ -65,7 +65,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Algemene Metafile weergave" END diff --git a/programs/view/No.rc b/programs/view/No.rc index 4a18853..638a21f 100644 --- a/programs/view/No.rc +++ b/programs/view/No.rc @@ -66,7 +66,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Vanlig metafil-framviser" END diff --git a/programs/view/Pl.rc b/programs/view/Pl.rc index 28828d8..69e783b 100644 --- a/programs/view/Pl.rc +++ b/programs/view/Pl.rc @@ -67,7 +67,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Podgl�d plik�w WMF (Regular Metafile)" END diff --git a/programs/view/Pt.rc b/programs/view/Pt.rc index 5ae626a..e7510b0 100644 --- a/programs/view/Pt.rc +++ b/programs/view/Pt.rc @@ -94,14 +94,14 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Visualizador Regular de Metafiles" END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Visualizador Regular de Ficheiros Meta" END diff --git a/programs/view/Ro.rc b/programs/view/Ro.rc index 8c05f06..b23f8f5 100644 --- a/programs/view/Ro.rc +++ b/programs/view/Ro.rc @@ -67,7 +67,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Vizualizator de fișiere metafile normale" END diff --git a/programs/view/Ru.rc b/programs/view/Ru.rc index 2c0d3d9..54ef68e 100644 --- a/programs/view/Ru.rc +++ b/programs/view/Ru.rc @@ -68,7 +68,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Просмотрщик обычных метафайлов" END diff --git a/programs/view/Si.rc b/programs/view/Si.rc index 8e6a0f2..2461893 100644 --- a/programs/view/Si.rc +++ b/programs/view/Si.rc @@ -68,7 +68,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Program za ogled Metafile slik" END diff --git a/programs/view/Sv.rc b/programs/view/Sv.rc index 2f7eea3..8425905 100644 --- a/programs/view/Sv.rc +++ b/programs/view/Sv.rc @@ -66,7 +66,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Regular Metafile viewer" END diff --git a/programs/view/Tr.rc b/programs/view/Tr.rc index 3e6ea6f..eecedeb 100644 --- a/programs/view/Tr.rc +++ b/programs/view/Tr.rc @@ -67,7 +67,7 @@ END */ /*FIXME: to be completed*/ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Regular Metafile Viewer" END diff --git a/programs/view/Uk.rc b/programs/view/Uk.rc index b73b1f3..ca4a3c9 100644 --- a/programs/view/Uk.rc +++ b/programs/view/Uk.rc @@ -71,7 +71,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "Переглядач звичайних метафайлів" END diff --git a/programs/view/Zh.rc b/programs/view/Zh.rc index 05067f8..14b1af6 100644 --- a/programs/view/Zh.rc +++ b/programs/view/Zh.rc @@ -68,7 +68,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "普通 Metafile 阅读器" END @@ -118,7 +118,7 @@ END * */ -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_DESCRIPTION "普通 Metafile 閱讀器" END

1 0

Alexandre Julliard : wrc: Display a warning in pedantic mode when using memory options in 32-bit resources .
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 0fbe4458714bdcff93c7f6752f7ef2bc8493e26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fbe4458714bdcff93c7f6752… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 10:43:08 2010 +0200 wrc: Display a warning in pedantic mode when using memory options in 32-bit resources. --- tools/wrc/parser.y | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index cfc02f9..8c49114 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -1708,15 +1708,22 @@ loadmemopts } ; -lamo : tPRELOAD { $$ = new_int(WRC_MO_PRELOAD); } - | tMOVEABLE { $$ = new_int(WRC_MO_MOVEABLE); } - | tDISCARDABLE { $$ = new_int(WRC_MO_DISCARDABLE); } - | tPURE { $$ = new_int(WRC_MO_PURE); } - ; - -lama : tLOADONCALL { $$ = new_int(~WRC_MO_PRELOAD); } - | tFIXED { $$ = new_int(~WRC_MO_MOVEABLE); } - | tIMPURE { $$ = new_int(~WRC_MO_PURE); } +lamo : tPRELOAD { $$ = new_int(WRC_MO_PRELOAD); + if (win32 && pedantic) parser_warning("PRELOAD is ignored in 32-bit mode\n"); } + | tMOVEABLE { $$ = new_int(WRC_MO_MOVEABLE); + if (win32 && pedantic) parser_warning("MOVEABLE is ignored in 32-bit mode\n"); } + | tDISCARDABLE { $$ = new_int(WRC_MO_DISCARDABLE); + if (win32 && pedantic) parser_warning("DISCARDABLE is ignored in 32-bit mode\n"); } + | tPURE { $$ = new_int(WRC_MO_PURE); + if (win32 && pedantic) parser_warning("PURE is ignored in 32-bit mode\n"); } + ; + +lama : tLOADONCALL { $$ = new_int(~WRC_MO_PRELOAD); + if (win32 && pedantic) parser_warning("LOADONCALL is ignored in 32-bit mode\n"); } + | tFIXED { $$ = new_int(~WRC_MO_MOVEABLE); + if (win32 && pedantic) parser_warning("FIXED is ignored in 32-bit mode\n"); } + | tIMPURE { $$ = new_int(~WRC_MO_PURE); + if (win32 && pedantic) parser_warning("IMPURE is ignored in 32-bit mode\n"); } ; /* ------------------------------ Win32 options ------------------------------ */

1 0

Michael Stefaniuc : sane.ds: Remove the ignored common resource attributes.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 7cb044d3d8aaf1cee629c259f19177732bed37af URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb044d3d8aaf1cee629c259f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 23:56:02 2010 +0200 sane.ds: Remove the ignored common resource attributes. --- dlls/sane.ds/sane_Da.rc | 4 ++-- dlls/sane.ds/sane_De.rc | 4 ++-- dlls/sane.ds/sane_En.rc | 4 ++-- dlls/sane.ds/sane_Es.rc | 4 ++-- dlls/sane.ds/sane_Fi.rc | 4 ++-- dlls/sane.ds/sane_Fr.rc | 4 ++-- dlls/sane.ds/sane_Hu.rc | 4 ++-- dlls/sane.ds/sane_It.rc | 4 ++-- dlls/sane.ds/sane_Ja.rc | 4 ++-- dlls/sane.ds/sane_Ko.rc | 4 ++-- dlls/sane.ds/sane_Lt.rc | 4 ++-- dlls/sane.ds/sane_Nl.rc | 4 ++-- dlls/sane.ds/sane_No.rc | 4 ++-- dlls/sane.ds/sane_Pl.rc | 4 ++-- dlls/sane.ds/sane_Pt.rc | 6 +++--- dlls/sane.ds/sane_Ro.rc | 4 ++-- dlls/sane.ds/sane_Ru.rc | 4 ++-- dlls/sane.ds/sane_Si.rc | 4 ++-- dlls/sane.ds/sane_Sv.rc | 4 ++-- dlls/sane.ds/sane_Uk.rc | 4 ++-- dlls/sane.ds/sane_Zh.rc | 8 ++++---- 21 files changed, 45 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7cb044d3d8aaf1cee629c…

1 0

Michael Stefaniuc : credui: Remove the ignored common resource attributes.
by Alexandre Julliard July 22, 2010

July 22, 2010

Module: wine Branch: master Commit: 9a0cf1f2607c3596f921b035d13a865fec8bbfe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0cf1f2607c3596f921b035d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 21 23:51:13 2010 +0200 credui: Remove the ignored common resource attributes. --- dlls/credui/credui.rc | 2 +- dlls/credui/credui_Da.rc | 4 ++-- dlls/credui/credui_De.rc | 4 ++-- dlls/credui/credui_En.rc | 4 ++-- dlls/credui/credui_Es.rc | 4 ++-- dlls/credui/credui_Fr.rc | 4 ++-- dlls/credui/credui_Hu.rc | 4 ++-- dlls/credui/credui_It.rc | 4 ++-- dlls/credui/credui_Ko.rc | 4 ++-- dlls/credui/credui_Lt.rc | 4 ++-- dlls/credui/credui_Nl.rc | 4 ++-- dlls/credui/credui_No.rc | 4 ++-- dlls/credui/credui_Pl.rc | 4 ++-- dlls/credui/credui_Pt.rc | 8 ++++---- dlls/credui/credui_Ro.rc | 4 ++-- dlls/credui/credui_Ru.rc | 4 ++-- dlls/credui/credui_Si.rc | 4 ++-- dlls/credui/credui_Sv.rc | 2 +- dlls/credui/credui_Uk.rc | 4 ++-- dlls/credui/credui_Zh.rc | 8 ++++---- 20 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a0cf1f2607c3596f921b…

1 0