November 2009 - Wine-commits

Jörg Höhle : mciwave: Allow (again) to set wave format parameters prior to recording.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: de00535c13fba643c9c2bc178225be3cecafd92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de00535c13fba643c9c2bc178… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 18 19:04:14 2009 +0200 mciwave: Allow (again) to set wave format parameters prior to recording. --- dlls/mciwave/mciwave.c | 149 +++++++++++++++++++++--------------------------- dlls/winmm/tests/mci.c | 5 +- 2 files changed, 68 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de00535c13fba643c9c2b…

1 0

Mikey Alexander : shell32/tests: Add Program Manager DDE conformance tests.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 91bf659dd6fd958cd70fa16dd9c51b155b1e47c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bf659dd6fd958cd70fa16dd… Author: Mikey Alexander <firesword14(a)yahoo.com> Date: Mon Nov 2 19:23:16 2009 -0800 shell32/tests: Add Program Manager DDE conformance tests. --- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/progman_dde.c | 566 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 567 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91bf659dd6fd958cd70fa…

1 0

Paul Chitescu : sccbase: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: b24fb8bfcfa0c14f0759bcbb08c9c4b246937a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24fb8bfcfa0c14f0759bcbb0… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:51 2009 +0200 sccbase: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/sccbase/main.c | 18 ++++++++++++++++++ dlls/sccbase/sccbase.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/sccbase/main.c b/dlls/sccbase/main.c index 37abe5f..7a012f5 100644 --- a/dlls/sccbase/main.c +++ b/dlls/sccbase/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (SCCBASE.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (SCCBASE.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} diff --git a/dlls/sccbase/sccbase.spec b/dlls/sccbase/sccbase.spec index c63d06b..ffc2111 100644 --- a/dlls/sccbase/sccbase.spec +++ b/dlls/sccbase/sccbase.spec @@ -22,5 +22,5 @@ @ stub CPSetProvParam @ stub CPSignHash @ stub CPVerifySignature -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Paul Chitescu : mssip32: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: e5e6547ddcbbff0c48ab935d9867c9fb0260a550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e6547ddcbbff0c48ab935d9… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:36 2009 +0200 mssip32: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/mssip32/main.c | 18 ++++++++++++++++++ dlls/mssip32/mssip32.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mssip32/main.c b/dlls/mssip32/main.c index 91ec17f..7d13701 100644 --- a/dlls/mssip32/main.c +++ b/dlls/mssip32/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (MSSIP32.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (MSSIP32.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} diff --git a/dlls/mssip32/mssip32.spec b/dlls/mssip32/mssip32.spec index 0c09bfb..b7fd869 100644 --- a/dlls/mssip32/mssip32.spec +++ b/dlls/mssip32/mssip32.spec @@ -5,5 +5,5 @@ @ stub CryptSIPPutSignedDataMsg @ stub CryptSIPRemoveSignedDataMsg @ stub CryptSIPVerifyIndirectData -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Paul Chitescu : dssenh: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 0b76859f06b8a5740c092d3774361ea359c4036c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b76859f06b8a5740c092d377… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:27 2009 +0200 dssenh: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/dssenh/dssenh.spec | 4 ++-- dlls/dssenh/main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index 037be06..c5c2545 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -23,5 +23,5 @@ @ stub CPSetProvParam @ stub CPSignHash @ stub CPVerifySignature -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 9578d1b..4c55ff8 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (DSSENH.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (DSSENH.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +}

1 0

Paul Chitescu : initpki: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: a921e0743a79dc9bb93c25ab177ab2e7f75f3b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a921e0743a79dc9bb93c25ab1… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:34 2009 +0200 initpki: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/initpki/initpki.spec | 4 ++-- dlls/initpki/main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/initpki/initpki.spec b/dlls/initpki/initpki.spec index 51d80bc..e9db624 100644 --- a/dlls/initpki/initpki.spec +++ b/dlls/initpki/initpki.spec @@ -1,4 +1,4 @@ @ stub DllInstall -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub InitializePKI diff --git a/dlls/initpki/main.c b/dlls/initpki/main.c index d936dd8..caa0036 100644 --- a/dlls/initpki/main.c +++ b/dlls/initpki/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (INITPKI.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (INITPKI.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +}

1 0

Paul Chitescu : slbcsp: Stubs for DllRegisterServer() and DllUnregisterServer().
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 6d3b409c5aecf512d09fa6a527239b884b46687d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3b409c5aecf512d09fa6a52… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Nov 4 22:57:52 2009 +0200 slbcsp: Stubs for DllRegisterServer() and DllUnregisterServer(). --- dlls/slbcsp/main.c | 18 ++++++++++++++++++ dlls/slbcsp/slbcsp.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/slbcsp/main.c b/dlls/slbcsp/main.c index 594f811..a6aece1 100644 --- a/dlls/slbcsp/main.c +++ b/dlls/slbcsp/main.c @@ -44,3 +44,21 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * DllRegisterServer (SLBCSP.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} + +/***************************************************** + * DllUnregisterServer (SLBCSP.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("Not implemented.\n"); + return E_UNEXPECTED; +} diff --git a/dlls/slbcsp/slbcsp.spec b/dlls/slbcsp/slbcsp.spec index d3462fa..7ce1733 100644 --- a/dlls/slbcsp/slbcsp.spec +++ b/dlls/slbcsp/slbcsp.spec @@ -23,5 +23,5 @@ @ stub CPReleaseContext @ stub CPSignHash @ stub CPVerifySignature -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

Juan Lang : wintrust: Fix a test failure on Win2008.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 2768710c363b200a17d83b453bfd303aa4a1d5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2768710c363b200a17d83b453… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 4 13:41:19 2009 -0800 wintrust: Fix a test failure on Win2008. --- dlls/wintrust/tests/softpub.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 31a51a2..c60ccb3 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -326,8 +326,10 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_NOSIGNATURE || data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == - TRUST_E_SUBJECT_FORM_UNKNOWN, - "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", + TRUST_E_SUBJECT_FORM_UNKNOWN || + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_PROVIDER_UNKNOWN, + "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN or TRUST_E_PROVIDER_UNKNOWN, got %08x\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); if (data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == TRUST_E_NOSIGNATURE)

1 0

Juan Lang : crypt32: Don' t copy past end of buffer when removing the last string in a multistring.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: 88e599c4cf118d323b4566e7f456dcaf5ba309be URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e599c4cf118d323b4566e7f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 4 16:29:33 2009 -0800 crypt32: Don't copy past end of buffer when removing the last string in a multistring. --- dlls/crypt32/oid.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index ddc6efc..0a3889d 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -873,9 +873,18 @@ static BOOL CRYPT_RemoveStringFromMultiString(LPWSTR multi, LPCWSTR toRemove) { DWORD len = CRYPT_GetMultiStringCharacterLen(multi); - /* Copy remainder of string "left" */ - memmove(spotToRemove, spotToRemove + lstrlenW(toRemove) + 1, - (len - (spotToRemove - multi)) * sizeof(WCHAR)); + if (spotToRemove + lstrlenW(toRemove) + 2 >= multi + len) + { + /* Removing last string in list, terminate multi string directly */ + *spotToRemove = 0; + *(spotToRemove + 1) = 0; + } + else + { + /* Copy remainder of string "left" */ + memmove(spotToRemove, spotToRemove + lstrlenW(toRemove) + 1, + (len - (spotToRemove - multi)) * sizeof(WCHAR)); + } ret = TRUE; } else

1 0

Juan Lang : crypt32: Add a warning if a store's ref count is invalid.
by Alexandre Julliard 05 Nov '09

05 Nov '09

Module: wine Branch: master Commit: a16ca1d0395a079418c5bc163a3b8440d125fb88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16ca1d0395a079418c5bc163… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 4 16:45:52 2009 -0800 crypt32: Add a warning if a store's ref count is invalid. --- dlls/crypt32/store.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 69578f2..3a786b0 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1175,6 +1175,8 @@ BOOL WINAPI CertCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) if ( hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC ) return FALSE; + if (hcs->ref <= 0) + ERR("%p's ref count is %d\n", hcs, hcs->ref); if (InterlockedDecrement(&hcs->ref) == 0) { TRACE("%p's ref count is 0, freeing\n", hcs);

1 0