wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Juan Lang : crypt32: Implement CertAddCertificateLinkToStore on top of CertAddCertificateContextToStore .
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: d728169d97a881f252fcac5e8d5de8e41cc2a71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d728169d97a881f252fcac5e8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 14 15:48:18 2010 -0700 crypt32: Implement CertAddCertificateLinkToStore on top of CertAddCertificateContextToStore. --- dlls/crypt32/cert.c | 9 ++++++--- dlls/crypt32/tests/store.c | 10 +--------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 3d4a34c..12c013e 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -113,10 +113,12 @@ BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, PCCERT_CONTEXT *ppCertContext) { + static int calls; PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)hCertStore; - FIXME("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, dwAddDisposition, - ppCertContext); + if (!(calls++)) + FIXME("(%p, %p, %08x, %p): semi-stub\n", hCertStore, pCertContext, + dwAddDisposition, ppCertContext); if (store->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) return FALSE; if (store->type == StoreTypeCollection) @@ -124,7 +126,8 @@ BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, SetLastError(E_INVALIDARG); return FALSE; } - return FALSE; + return CertAddCertificateContextToStore(hCertStore, pCertContext, + dwAddDisposition, ppCertContext); } PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType, diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index abc44e2..cab74c6 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2078,7 +2078,6 @@ static void compareStore(HCERTSTORE store, LPCSTR name, const BYTE *pb, { ret = CertSaveStore(store, X509_ASN_ENCODING, CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_MEMORY, &blob, 0); - ok(ret, "CertSaveStore failed: %08x\n", GetLastError()); ok(!memcmp(pb, blob.pbData, cb), "%s: unexpected value\n", name); HeapFree(GetProcessHeap(), 0, blob.pbData); } @@ -2151,19 +2150,16 @@ static void testAddCertificateLink(void) CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); ret = CertAddCertificateLinkToStore(store1, NULL, 0, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); source = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); SetLastError(0xdeadbeef); ret = CertAddCertificateLinkToStore(store1, source, 0, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); ret = CertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, NULL); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (0) { @@ -2179,7 +2175,6 @@ static void testAddCertificateLink(void) CERT_STORE_CREATE_NEW_FLAG, NULL); ret = CertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { @@ -2252,7 +2247,6 @@ static void testAddCertificateLink(void) CERT_STORE_CREATE_NEW_FLAG, NULL); ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { @@ -2313,7 +2307,6 @@ static void testAddCertificateLink(void) /* Test adding a link to a file store. */ ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { @@ -2381,13 +2374,13 @@ static void testAddCertificateLink(void) ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) { ok(linked->hCertStore == store2, "unexpected store"); ret = pCertControlStore(store2, 0, CERT_STORE_CTRL_COMMIT, NULL); ok(ret, "CertControlStore failed: %d\n", ret); + todo_wine compareStore(store2, "file store -> system store", serializedStoreWithCertAndHash, sizeof(serializedStoreWithCertAndHash)); @@ -2405,7 +2398,6 @@ static void testAddCertificateLink(void) ok(store2 != NULL, "CertOpenStore failed: %08x\n", GetLastError()); ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : crypt32: Prohibit adding links to collection stores.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 99b9e1ae3633f6d20bbc093b503d915f8e62e97c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99b9e1ae3633f6d20bbc093b5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 14 15:44:17 2010 -0700 crypt32: Prohibit adding links to collection stores. --- dlls/crypt32/cert.c | 9 +++++++++ dlls/crypt32/tests/store.c | 1 - 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c25e612..3d4a34c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -113,8 +113,17 @@ BOOL WINAPI CertAddCertificateLinkToStore(HCERTSTORE hCertStore, PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition, PCCERT_CONTEXT *ppCertContext) { + PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)hCertStore; + FIXME("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, dwAddDisposition, ppCertContext); + if (store->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + return FALSE; + if (store->type == StoreTypeCollection) + { + SetLastError(E_INVALIDARG); + return FALSE; + } return FALSE; } diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 72a2154..abc44e2 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2354,7 +2354,6 @@ static void testAddCertificateLink(void) SetLastError(0xdeadbeef); ret = CertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, &linked); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); CertFreeCertificateContext(source);

1 0

Juan Lang : crypt32: Validate add disposition before checking source certificate's properties.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 76fc5c8bc5e46b9e935b4078999e2ac711b28fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76fc5c8bc5e46b9e935b40789… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 14 13:49:44 2010 -0700 crypt32: Validate add disposition before checking source certificate's properties. --- dlls/crypt32/store.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index a892394..da3de56 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -855,7 +855,16 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, TRACE("(%p, %p, %08x, %p)\n", hCertStore, pCertContext, dwAddDisposition, ppStoreContext); - if (dwAddDisposition != CERT_STORE_ADD_ALWAYS) + switch (dwAddDisposition) + { + case CERT_STORE_ADD_ALWAYS: + break; + case CERT_STORE_ADD_NEW: + case CERT_STORE_ADD_REPLACE_EXISTING: + case CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: + case CERT_STORE_ADD_USE_EXISTING: + case CERT_STORE_ADD_NEWER: + case CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: { BYTE hashToAdd[20]; DWORD size = sizeof(hashToAdd); @@ -870,6 +879,12 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, pCertContext->dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, NULL); } + break; + } + default: + FIXME("Unimplemented add disposition %d\n", dwAddDisposition); + SetLastError(E_INVALIDARG); + ret = FALSE; } switch (dwAddDisposition) @@ -940,10 +955,6 @@ BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore, else toAdd = CertDuplicateCertificateContext(pCertContext); break; - default: - FIXME("Unimplemented add disposition %d\n", dwAddDisposition); - SetLastError(E_INVALIDARG); - ret = FALSE; } if (toAdd)

1 0

Juan Lang : crypt32/tests: Test CertAddCertificateLinkToStore.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 0dfb0299f64a9a8cbaea95e239dbe9e557d43175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dfb0299f64a9a8cbaea95e23… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 14 15:43:12 2010 -0700 crypt32/tests: Test CertAddCertificateLinkToStore. --- dlls/crypt32/tests/store.c | 357 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 357 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dfb0299f64a9a8cbaea9…

1 0

Juan Lang : crypt32: Add stub for CERT_STORE_CTRL_AUTO_RESYNC of registry stores.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: c232af490e35795ff14eda755355a06c7ae7e366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c232af490e35795ff14eda755… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 14 13:37:26 2010 -0700 crypt32: Add stub for CERT_STORE_CTRL_AUTO_RESYNC of registry stores. --- dlls/crypt32/regstore.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 296b0c9..f4b4295 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -479,6 +479,10 @@ static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags, ret = CRYPT_RegFlushStore(store, dwFlags & CERT_STORE_CTRL_COMMIT_FORCE_FLAG); break; + case CERT_STORE_CTRL_AUTO_RESYNC: + FIXME("CERT_STORE_CTRL_AUTO_RESYNC: stub\n"); + ret = TRUE; + break; default: FIXME("%d: stub\n", dwCtrlType); ret = FALSE;

1 0

Michael Stefaniuc : comdlg32: The Dutch translation uses UTF-8.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 1f13973e8516684e229a51ca6789770558035886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f13973e8516684e229a51ca6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 14 22:35:48 2010 +0200 comdlg32: The Dutch translation uses UTF-8. --- dlls/comdlg32/cdlg_Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index b883a05..8f29a59 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -26,6 +26,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Bestand openen"

1 0

Matej Špindler : mapi32: Add Slovenian translation.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: bdb373d5c4b44a184703affa29ded33585590de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb373d5c4b44a184703affa2… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Sun May 16 10:46:28 2010 +0200 mapi32: Add Slovenian translation. --- dlls/mapi32/Makefile.in | 1 + dlls/mapi32/Si.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 35a14a8..5f334d3 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ Lt.rc \ Nl.rc \ Ru.rc \ + Si.rc \ version.rc @MAKE_DLL_RULES@ diff --git a/dlls/mapi32/Si.rc b/dlls/mapi32/Si.rc new file mode 100644 index 0000000..4abdc82 --- /dev/null +++ b/dlls/mapi32/Si.rc @@ -0,0 +1,32 @@ +/* +* MAPI32 Slovenian resources +* +* Copyright 2010 Matej Spindler +* +* 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 +* +*/ + +#include "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Pošiljanje ni uspelo, ker nimate nameščenega MAPI klienta." + IDS_SEND_MAIL, "Pošlji" +}

1 0

Matej Špindler : wordpad: Update Slovenian translation .
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: ebdf7edfcc4e266a02f272eab7ab49c604e8950e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebdf7edfcc4e266a02f272eab… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri May 14 20:34:04 2010 +0200 wordpad: Update Slovenian translation. --- programs/wordpad/Si.rc | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/wordpad/Si.rc b/programs/wordpad/Si.rc index f7e0c72..556197b 100644 --- a/programs/wordpad/Si.rc +++ b/programs/wordpad/Si.rc @@ -247,13 +247,12 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Zapri" - STRING_PREVIEW_PAGE, "Page" - STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" + STRING_PREVIEW_PAGE, "Stran" + STRING_PREVIEW_PAGES, "Strani" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "inch" + STRING_UNITS_PT, "pt" END STRINGTABLE DISCARDABLE

1 0

Matej Špindler : notepad: Update Slovenian translation .
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: 5846333e9976c989aa3f966890619665bb1fd0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5846333e9976c989aa3f96689… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri May 14 20:46:31 2010 +0200 notepad: Update Slovenian translation. --- programs/notepad/Si.rc | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Si.rc b/programs/notepad/Si.rc index 57a8071..531e9fa 100644 --- a/programs/notepad/Si.rc +++ b/programs/notepad/Si.rc @@ -93,6 +93,14 @@ PUSHBUTTON "Prekliči", IDCANCEL, 180, 21, 40, 15, WS_TABST PUSHBUTTON "&Pomoč", IDHELP, 180, 39, 40, 15, WS_TABSTOP } +IDD_OFN_TEMPLATE DIALOG DISCARDABLE 50,50,300,15 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Kodiranje:", -1, 5,0, 50,12 + COMBOBOX IDC_OFN_ENCCOMBO, 53,0, 156,48, WS_CHILD | WS_VSCROLL | CBS_DROPDOWNLIST +END + STRINGTABLE DISCARDABLE { STRING_PAGESETUP_HEADERVALUE, "&f" @@ -120,4 +128,13 @@ STRING_NOTFOUND, "Niza '%s' ni mogoče na STRING_OUT_OF_MEMORY, "Za dokončanje operacije je na voljo premalo \ pomnilnika.\nZaprite enega ali več programov in poskusite znova." +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Ta datoteka vsebuje Unicode znake, ki bodo izgubljeni,\n\ +če datoteko shranite v %s kodiranju. \n\ +Da bi te znake obdržali, kliknite Prekliči in izberite\n\ +eno izmed Unicode možnosti v seznamu kodiranj.\n\ +Nadaljujem?" }

1 0

Matej Špindler : wineboot: Update Slovenian translation.
by Alexandre Julliard 17 May '10

17 May '10

Module: wine Branch: master Commit: cb53241cba93d60e634909339b31887baae1283b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb53241cba93d60e634909339… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri May 14 20:46:16 2010 +0200 wineboot: Update Slovenian translation. --- programs/wineboot/wineboot_Si.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot_Si.rc b/programs/wineboot/wineboot_Si.rc index 366f170..bb210f9 100644 --- a/programs/wineboot/wineboot_Si.rc +++ b/programs/wineboot/wineboot_Si.rc @@ -37,3 +37,13 @@ BEGIN LTEXT "Če se odločite za končanje programa, lahko izgubite neshranjene podatke.", IDC_STATIC,7,28,172,15 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 "Konfiguracija programa Wine v %s se posodablja, prosimo počkajte...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
96
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 2010