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

Gerald Pfeifer : oleaut32: Remove variable rOk which is not really used from VarMod.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 5b8eccd3c6789c86df2a85e5c3a5480d5dac20ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8eccd3c6789c86df2a85e5c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 14 22:01:50 2010 +0200 oleaut32: Remove variable rOk which is not really used from VarMod. --- dlls/oleaut32/variant.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 450856f..3d8e528 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5420,7 +5420,6 @@ end: HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) { BOOL lOk = TRUE; - BOOL rOk = TRUE; HRESULT rc = E_FAIL; int resT = 0; VARIANT lv,rv; @@ -5491,7 +5490,6 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) } - rOk = TRUE; switch (V_VT(right) & VT_TYPEMASK) { case VT_BOOL : case VT_I1 :

1 0

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

May 17, 2010

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: Validate add disposition before checking source certificate's properties.
by Alexandre Julliard May 17, 2010

May 17, 2010

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: Add stub for CERT_STORE_CTRL_AUTO_RESYNC of registry stores.
by Alexandre Julliard May 17, 2010

May 17, 2010

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

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

May 17, 2010

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/tests: Test CertAddCertificateLinkToStore.
by Alexandre Julliard May 17, 2010

May 17, 2010

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

Matej Špindler : notepad: Update Slovenian translation .
by Alexandre Julliard May 17, 2010

May 17, 2010

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 : shell32: Update Slovenian translation .
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 53459e07d61dcd4a8aa794f8d85b8d47e1237f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53459e07d61dcd4a8aa794f8d… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri May 14 20:54:30 2010 +0200 shell32: Update Slovenian translation. --- dlls/shell32/shell32_Si.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Si.rc b/dlls/shell32/shell32_Si.rc index 76ad64b..9b17a35 100644 --- a/dlls/shell32/shell32_Si.rc +++ b/dlls/shell32/shell32_Si.rc @@ -207,6 +207,10 @@ STRINGTABLE IDS_SHV_COLUMN11 "Skupina" IDS_SHV_COLUMN_DELFROM "Prvotna lokacija" IDS_SHV_COLUMN_DELDATE "Datum izbrisa" + IDS_SHV_COL_DOCS "Dokumenti" + IDS_SHV_COL_STATUS "Status" + IDS_SHV_COL_LOCATION "Lokacija" + IDS_SHV_COL_MODEL "Model" /* special folders */ IDS_DESKTOP "Namizje"

1 0

Matej Špindler : winecfg: Update Slovenian translation .
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: edbbd1f00390035b6cab23a428943e2cc33919da URL: http://source.winehq.org/git/wine.git/?a=commit;h=edbbd1f00390035b6cab23a42… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Fri May 14 20:46:03 2010 +0200 winecfg: Update Slovenian translation. --- programs/winecfg/Si.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index eec1658..37da2ae 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -124,6 +124,16 @@ BEGIN PUSHBUTTON "Prekliči",IDCANCEL,57,74,45,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 170, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Izberi črko pogona" +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "V redu",IDOK,105,10,45,14,WS_GROUP + PUSHBUTTON "Prekliči",IDCANCEL,105,30,45,14,WS_GROUP +END + IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg"

1 0

Alexandre Julliard : comctl32/imagelist: Fix the allocated size of the has_alpha array.
by Alexandre Julliard May 17, 2010

May 17, 2010

Module: wine Branch: master Commit: 3915cfbd02faabc7eac1b4ca147a663779987722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3915cfbd02faabc7eac1b4ca1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 17 12:42:25 2010 +0200 comctl32/imagelist: Fix the allocated size of the has_alpha array. --- dlls/comctl32/imagelist.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index e8d3323..c1ea00a 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -324,8 +324,7 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) if (himl->has_alpha) { - char *new_alpha = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - himl->has_alpha, himl->cMaxImage ); + char *new_alpha = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->has_alpha, nNewCount ); if (new_alpha) himl->has_alpha = new_alpha; else {

1 0