April 2008 - Wine-commits - list.winehq.org

Dan Hipschman : qedit/tests: Don't forget CoUninitialize.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 8b432b3655637aaf4541906def9ff301b9801731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b432b3655637aaf4541906de… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 15:58:17 2008 -0700 qedit/tests: Don't forget CoUninitialize. --- dlls/qedit/tests/mediadet.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 5d5178d..b550c8e 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -43,4 +43,5 @@ START_TEST(mediadet) { CoInitialize(NULL); test_mediadet(); + CoUninitialize(); }

1 0

Andrew Talbot : wintrust: Avoid assigning to struct members from other structs.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: e68cc16a11f92c59f8cb02781612ce98c844e590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68cc16a11f92c59f8cb02781… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Apr 4 17:56:34 2008 +0100 wintrust: Avoid assigning to struct members from other structs. --- dlls/wintrust/register.c | 184 ++++++++++++++++++++++++++-------------------- 1 files changed, 103 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e68cc16a11f92c59f8cb0…

1 0

Dan Hipschman : qedit/tests: Add test framework and test for IMediaDet_put_Filename.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 999bc5bcb292a796454d081abf0ca1d868a00090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=999bc5bcb292a796454d081ab… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Apr 4 15:59:08 2008 -0700 qedit/tests: Add test framework and test for IMediaDet_put_Filename. --- dlls/qedit/tests/Makefile.in | 4 ++- dlls/qedit/tests/mediadet.c | 66 ++++++++++++++++++++++++++++++++++++++++++ dlls/qedit/tests/qedit.rc | 22 ++++++++++++++ dlls/qedit/tests/test.avi | Bin 0 -> 5676 bytes 4 files changed, 91 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in index 5236975..94c5e60 100644 --- a/dlls/qedit/tests/Makefile.in +++ b/dlls/qedit/tests/Makefile.in @@ -3,12 +3,14 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = qedit.dll -IMPORTS = ole32 kernel32 +IMPORTS = oleaut32 ole32 kernel32 EXTRALIBS = -lstrmiids -luuid CTESTS = \ mediadet.c +RC_SRCS = qedit.rc + @MAKE_TEST_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index b550c8e..b9ea9c0 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -25,22 +25,88 @@ #include "wine/test.h" #include "qedit.h" +static WCHAR test_avi_filename[MAX_PATH]; + +static BOOL init_tests(void) +{ + static WCHAR temp_path[MAX_PATH]; + static WCHAR prefix[] = {'D','E','S',0}; + static WCHAR avi[] = {'a','v','i',0}; + HRSRC res; + HGLOBAL data; + char *mem; + DWORD size, written; + HANDLE fh; + + res = FindResourceW(NULL, (LPWSTR) 1, (LPWSTR) 256); + if (!res) + return FALSE; + + data = LoadResource(NULL, res); + if (!data) + return FALSE; + + mem = LockResource(data); + if (!mem) + return FALSE; + + size = SizeofResource(NULL, res); + if (size == 0) + return FALSE; + + if (!GetTempPathW(sizeof temp_path, temp_path)) + return FALSE; + + /* We might end up relying on the extension here, so .TMP is no good. */ + if (!GetTempFileNameW(temp_path, prefix, 0, test_avi_filename)) + return FALSE; + + DeleteFileW(test_avi_filename); + lstrcpyW(test_avi_filename + lstrlenW(test_avi_filename) - 3, avi); + + fh = CreateFileW(test_avi_filename, GENERIC_WRITE, 0, NULL, + CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + if (fh == INVALID_HANDLE_VALUE) + return FALSE; + + if (!WriteFile(fh, mem, size, &written, NULL) || written != size) + return FALSE; + + CloseHandle(fh); + + return TRUE; +} + static void test_mediadet(void) { HRESULT hr; IMediaDet *pM = NULL; + BSTR filename = NULL; hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM); ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); ok(pM != NULL, "pM is NULL\n"); + filename = SysAllocString(test_avi_filename); + hr = IMediaDet_put_Filename(pM, filename); + todo_wine ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); + SysFreeString(filename); + hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); + + DeleteFileW(test_avi_filename); } START_TEST(mediadet) { + if (!init_tests()) + { + skip("Couldn't initialize tests!\n"); + return; + } + CoInitialize(NULL); test_mediadet(); CoUninitialize(); diff --git a/dlls/qedit/tests/qedit.rc b/dlls/qedit/tests/qedit.rc new file mode 100644 index 0000000..b138624 --- /dev/null +++ b/dlls/qedit/tests/qedit.rc @@ -0,0 +1,22 @@ +/* + * Resource file for qedit tests. + * + * Copyright 2008 Google (Dan Hipschman) + * + * 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 + */ + +/* @makedep: test.avi */ +1 256 test.avi diff --git a/dlls/qedit/tests/test.avi b/dlls/qedit/tests/test.avi new file mode 100644 index 0000000..8756c64 Binary files /dev/null and b/dlls/qedit/tests/test.avi differ

1 0

Paul Vriens : rsaenh/tests: Fix a test on W2K and above.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 66c022c28cb3cc758f53d31467f70020bb6ca126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66c022c28cb3cc758f53d3146… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Apr 4 17:39:37 2008 +0200 rsaenh/tests: Fix a test on W2K and above. --- dlls/rsaenh/tests/rsaenh.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4fef6e9..0119f28 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winerror.h" #include "wincrypt.h" +#include "winreg.h" static HCRYPTPROV hProv; static const char szContainer[] = "winetest"; @@ -55,6 +56,33 @@ static const cryptdata cTestData[4] = { 12,12,16} }; +/* + * 1. Take the MD5 Hash of the container name (with an extra null byte) + * 2. Turn the hash into a 4 DWORD hex value + * 3. Append a '_' + * 4. Add the MachineGuid + * + */ +static void uniquecontainer(char *unique) +{ + /* MD5 hash of "winetest\0" in 4 DWORD hex */ + static const char szContainer_md5[] = "9d20fd8d05ed2b8455d125d0bf6d6a70"; + static const char szCryptography[] = "Software\\Microsoft\\Cryptography"; + static const char szMachineGuid[] = "MachineGuid"; + HKEY hkey; + char guid[MAX_PATH]; + DWORD size = MAX_PATH; + + /* Get the MachineGUID */ + RegOpenKeyA(HKEY_LOCAL_MACHINE, szCryptography, &hkey); + RegQueryValueExA(hkey, szMachineGuid, NULL, NULL, (LPBYTE)guid, &size); + RegCloseKey(hkey); + + lstrcpy(unique, szContainer_md5); + lstrcat(unique, "_"); + lstrcat(unique, guid); +} + static void printBytes(const char *heading, const BYTE *pb, size_t cb) { size_t i; @@ -1849,11 +1877,21 @@ static void test_null_provider(void) SetLastError(0xdeadbeef); result = CryptGetProvParam(prov, PP_UNIQUE_CONTAINER, (LPBYTE)szName, &dataLen, 0); if (!result && GetLastError() == NTE_BAD_TYPE) + { skip("PP_UNIQUE_CONTAINER is not supported (win9x or NT)\n"); + } else - ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, - "failed getting PP_UNIQUE_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", - (result)? "TRUE":"FALSE",GetLastError(),dataLen); + { + char container[MAX_PATH]; + + ok(result, "failed getting PP_UNIQUE_CONTAINER : 0x%08X\n", GetLastError()); + uniquecontainer(container); + todo_wine + { + ok(dataLen == strlen(container)+1, "Expected a param length of 70, got %d\n", dataLen); + ok(!strcmp(container, szName), "Wrong container name : %s\n", szName); + } + } result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result && GetLastError() == NTE_NO_KEY, "Expected NTE_NO_KEY, got %08x\n", GetLastError());

1 0

Andrew Talbot : port: Remove superfluous semicolon.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 8ba539844b275472f46556b092c70a5332870478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba539844b275472f46556b09… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Apr 4 17:56:29 2008 +0100 port: Remove superfluous semicolon. --- libs/port/interlocked.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index c2d85b6..12b326f 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -49,7 +49,7 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr, "lock; cmpxchg8b (%esi)\n\t" "pop %esi\n\t" "pop %ebx\n\t" - "ret"); + "ret") __ASM_GLOBAL_FUNC(interlocked_xchg, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%edx\n\t"

1 0

Alexandre Julliard : user32: Fix a few ShowWindow todo tests.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: d0e1dd84b22b1906a44f682394b5d1b90ba5ded8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e1dd84b22b1906a44f68239… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 18:22:40 2008 +0200 user32: Fix a few ShowWindow todo tests. --- dlls/user32/tests/msg.c | 8 ++++---- dlls/user32/winpos.c | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6f37f48..a866987 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9443,7 +9443,7 @@ static void test_ShowWindow(void) /* 16 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, /* 17 */ { SW_SHOW, FALSE, WS_VISIBLE, WmShow, FALSE }, /* 18 */ { SW_SHOW, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, -/* 19 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, TRUE }, +/* 19 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, FALSE }, /* 20 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 21 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 22 */ { SW_SHOWMINNOACTIVE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmShowMinNoActivate, TRUE }, @@ -9464,11 +9464,11 @@ static void test_ShowWindow(void) /* 37 */ { SW_RESTORE, FALSE, WS_VISIBLE, WmRestore_2, FALSE }, /* 38 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 39 */ { SW_SHOWNOACTIVATE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, -/* 40 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_2, TRUE }, +/* 40 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_2, FALSE }, /* 41 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 42 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_2, TRUE }, /* 43 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmMinMax_2, FALSE }, -/* 44 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, TRUE }, +/* 44 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, FALSE }, /* 45 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, /* 46 */ { SW_RESTORE, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmRestore_3, FALSE }, /* 47 */ { SW_RESTORE, TRUE, WS_VISIBLE, WmRestore_4, FALSE }, @@ -9478,7 +9478,7 @@ static void test_ShowWindow(void) /* 51 */ { SW_SHOWNORMAL, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 52 */ { SW_HIDE, TRUE, 0, WmHide_1, FALSE }, /* 53 */ { SW_HIDE, FALSE, 0, WmEmptySeq, FALSE }, -/* 54 */ { SW_MINIMIZE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_3, TRUE }, +/* 54 */ { SW_MINIMIZE, FALSE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_3, FALSE }, /* 55 */ { SW_HIDE, TRUE, WS_MINIMIZE, WmHide_2, FALSE }, /* 56 */ { SW_SHOWNOACTIVATE, FALSE, WS_VISIBLE, WmShowNoActivate_2, FALSE }, /* 57 */ { SW_SHOW, TRUE, WS_VISIBLE, WmEmptySeq, FALSE } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 04377b9..5d346ee 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -983,11 +983,9 @@ static BOOL show_window( HWND hwnd, INT cmd ) break; case SW_SHOWMINNOACTIVE: - swp |= SWP_NOACTIVATE | SWP_NOZORDER; - /* fall through */ case SW_MINIMIZE: case SW_FORCEMINIMIZE: /* FIXME: Does not work if thread is hung. */ - if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; + swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* fall through */ case SW_SHOWMINIMIZED: swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;

1 0

Alexandre Julliard : winex11: Ignore ConfigureNotify events when a window is iconified.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f6662c7bbec5eb010f5d4cd4844758fdaba4fa0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6662c7bbec5eb010f5d4cd48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 4 18:22:23 2008 +0200 winex11: Ignore ConfigureNotify events when a window is iconified. --- dlls/winex11.drv/winpos.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 1779b45..25f7413 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -549,7 +549,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if (!hwnd) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->mapped) return; + if (!data->mapped || data->iconic) return; /* Get geometry */ @@ -586,7 +586,6 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) hwnd, rect.left, rect.top, x, y ); if ((rect.right - rect.left == cx && rect.bottom - rect.top == cy) || - IsIconic(hwnd) || (IsRectEmpty( &rect ) && event->width == 1 && event->height == 1)) { if (flags & SWP_NOMOVE) return; /* if nothing changed, don't do anything */

1 0

softpub exported functions prototypes
by andre furtado 04 Apr '08

04 Apr '08

add softpub exported functions prototypes... HRESULT WINAPI GenericChainCertificateTrust(IN OUT PCRYPT_PROVIDER_DATA pProvData)HRESULT WINAPI GenericChainFinalProv(IN OUT PCRYPT_PROVIDER_DATA pProvData)HRESULT WINAPI HTTPSCertificateTrust(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubDefCertInit(CRYPT_PROVIDER_DATA *pProvData)BOOL WINAPI SoftpubFreeDefUsageCallData(const char *pszUsageOID, CRYPT_PROVIDER_DEFUSAGE *psDefUsage)BOOL WINAPI SoftpubLoadDefUsageCallData(const char *pszUsageOID, CRYPT_PROVIDER_DEFUSAGE *psDefUsage)BOOL CALLBACK AddPersonalTrustDBPages(LPVOID lpv, LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) HRESULT WINAPI DriverCleanupPolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI DriverFinalPolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI DriverInitializePolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI HTTPSFinalProv(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI OfficeCleanupPolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI OfficeInitializePolicy(CRYPT_PROVIDER_DATA *pProvData)BOOL WINAPI OpenPersonalTrustDBDialog(HWND hWnd)HRESULT WINAPI OfficeInitializePolicy(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *pProvData)BOOL WINAPI SoftpubCheckCert(CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSignerChain, DWORD idxCounterSigner)HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubDumpStructure(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubInitialize(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *pProvData)HRESULT SoftpubLoadSignature(CRYPT_PROVIDER_DATA *pProvData)HRESULT WINAPI FindCertsByIssuer(OUT PCERT_CHAIN pCertChains, IN OUT DWORD *pcbCertChains, OUT DWORD *pcCertChains, IN BYTE* pbEncodedIssuerName, IN DWORD cbEncodedIssuerName, IN LPCWSTR pwszPurpose, IN DWORD dwKeySpec) André Renato Furtado talk2cod(a)hotmail.com _________________________________________________________________ Confira vídeos com notícias do NY Times, gols direto do Lance, videocassetadas e muito mais no MSN Video! http://video.msn.com/?mkt=pt-br

1 0

xenroll exported functions
by andre furtado 04 Apr '08

04 Apr '08

add documentation for exported functions of the xenroll library...IEnroll * WINAPI PIEnrollGetNoCOM(void)*/ returns a pointer to an IEnroll interface. */IEnroll2 * WINAPI PIEnroll2GetNoCOM(void)*/ returns a pointer to an IEnroll2 interface. */IEnroll4 * WINAPI PIEnroll4GetNoCOM(void)*/ returns a pointer to an IEnroll4 interface. */ André Renato Furtado talk2cod(a)hotmail.com _________________________________________________________________ Instale a Barra de Ferramentas com Desktop Search e ganhe EMOTICONS para o Messenger! É GRÁTIS! http://www.msn.com.br/emoticonpack

1 0

xenroll exported functions
by andre furtado 04 Apr '08

04 Apr '08

add documentation for exported functions of the xenroll library...IEnroll * WINAPI PIEnrollGetNoCOM(void)*/ returns a pointer to an IEnroll interface. */IEnroll2 * WINAPI PIEnroll2GetNoCOM(void)*/ returns a pointer to an IEnroll2 interface. */IEnroll4 * WINAPI PIEnroll4GetNoCOM(void)*/ returns a pointer to an IEnroll4 interface. */ André Renato Furtado talk2cod(a)hotmail.com _________________________________________________________________ Conheça o Windows Live Spaces, a rede de relacionamentos do Messenger! http://www.amigosdomessenger.com.br/

1 0