January 2009 - Wine-commits

Juan Lang : rsaenh: Fix some recently introduced test failures on Win9x/NT4 .
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: e5fcbad5b6c90d2ce7655c536fc76005731312ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5fcbad5b6c90d2ce7655c536… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 29 17:39:05 2009 -0800 rsaenh: Fix some recently introduced test failures on Win9x/NT4. --- dlls/rsaenh/tests/rsaenh.c | 42 ++++++++++++++++++++++++++++-------------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 5d58222..b5af81f 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -793,7 +793,8 @@ static void test_rc2(void) result = CryptGetKeyParam(hKey, KP_PERMISSIONS, (BYTE*)&dwModeBits, &dwLen, 0); ok(result, "%08x\n", GetLastError()); ok(dwModeBits == - (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT), + (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT) || + broken(dwModeBits == 0xffffffff), /* Win9x/NT4 */ "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT," " got %08x\n", dwModeBits); @@ -1232,7 +1233,8 @@ static void test_import_private(void) result = CryptGetKeyParam(hSessionKey, KP_PERMISSIONS, (BYTE*)&dwVal, &dwLen, 0); ok(result, "%08x\n", GetLastError()); ok(dwVal == - (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT), + (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT) || + broken(dwVal == 0xffffffff), /* Win9x/NT4 */ "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT," " got %08x\n", dwVal); @@ -1564,7 +1566,8 @@ static void test_rsa_encrypt(void) result = CryptGetKeyParam(hRSAKey, KP_PERMISSIONS, (BYTE*)&dwVal, &dwLen, 0); ok(result, "%08x\n", GetLastError()); ok(dwVal == - (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT), + (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT) || + broken(dwVal == 0xffffffff), /* Win9x/NT4 */ "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT," " got %08x\n", dwVal); @@ -1574,14 +1577,17 @@ static void test_rsa_encrypt(void) /* but its private key may not be. */ SetLastError(0xdeadbeef); result = CryptExportKey(hRSAKey, 0, PRIVATEKEYBLOB, 0, NULL, &dwLen); - ok(!result && GetLastError() == NTE_BAD_KEY_STATE, + ok(!result && + (GetLastError() == NTE_BAD_KEY_STATE || + broken(GetLastError() == 0xdeadbeef) /* Win9x/NT4 */), "expected NTE_BAD_KEY_STATE, got %08x\n", GetLastError()); /* Setting the permissions of the key exchange key isn't allowed, either. */ dwVal |= CRYPT_EXPORT; SetLastError(0xdeadbeef); result = CryptSetKeyParam(hRSAKey, KP_PERMISSIONS, (BYTE *)&dwVal, 0); - ok(!result && GetLastError() == NTE_BAD_DATA, - "expected NTE_BAD_DATA, got %08x\n", GetLastError()); + ok(!result && + (GetLastError() == NTE_BAD_DATA || GetLastError() == NTE_BAD_FLAGS), + "expected NTE_BAD_DATA or NTE_BAD_FLAGS, got %08x\n", GetLastError()); CryptDestroyKey(hRSAKey); @@ -1595,7 +1601,8 @@ static void test_rsa_encrypt(void) result = CryptGetKeyParam(hRSAKey, KP_PERMISSIONS, (BYTE*)&dwVal, &dwLen, 0); ok(result, "%08x\n", GetLastError()); ok(dwVal == - (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT), + (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT) || + broken(dwVal == 0xffffffff), /* Win9x/NT4 */ "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT," " got %08x\n", dwVal); @@ -1605,14 +1612,17 @@ static void test_rsa_encrypt(void) /* but its private key may not be. */ SetLastError(0xdeadbeef); result = CryptExportKey(hRSAKey, 0, PRIVATEKEYBLOB, 0, NULL, &dwLen); - ok(!result && GetLastError() == NTE_BAD_KEY_STATE, + ok(!result && + (GetLastError() == NTE_BAD_KEY_STATE || + broken(GetLastError() == 0xdeadbeef) /* Win9x/NT4 */), "expected NTE_BAD_KEY_STATE, got %08x\n", GetLastError()); /* Setting the permissions of the signature key isn't allowed, either. */ dwVal |= CRYPT_EXPORT; SetLastError(0xdeadbeef); result = CryptSetKeyParam(hRSAKey, KP_PERMISSIONS, (BYTE *)&dwVal, 0); - ok(!result && GetLastError() == NTE_BAD_DATA, - "expected NTE_BAD_DATA, got %08x\n", GetLastError()); + ok(!result && + (GetLastError() == NTE_BAD_DATA || GetLastError() == NTE_BAD_FLAGS), + "expected NTE_BAD_DATA or NTE_BAD_FLAGS, got %08x\n", GetLastError()); dwLen = 12; result = CryptEncrypt(hRSAKey, 0, TRUE, 0, abData, &dwLen, (DWORD)sizeof(abData)); @@ -1656,7 +1666,8 @@ static void test_import_export(void) result = CryptGetKeyParam(hPublicKey, KP_PERMISSIONS, (BYTE*)&dwVal, &dwDataLen, 0); ok(result, "%08x\n", GetLastError()); ok(dwVal == - (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT), + (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT) || + broken(dwVal == 0xffffffff), /* Win9x/NT4 */ "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_DECRYPT|CRYPT_ENCRYPT," " got %08x\n", dwVal); result = CryptExportKey(hPublicKey, 0, PUBLICKEYBLOB, 0, emptyKey, &dwLen); @@ -2134,7 +2145,8 @@ static void test_key_permissions(void) result = CryptGetKeyParam(hKey1, KP_PERMISSIONS, (BYTE*)&dwVal, &dwLen, 0); ok(result, "%08x\n", GetLastError()); ok(dwVal == - (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT), + (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT) || + broken(dwVal == 0xffffffff), /* Win9x/NT4 */ "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT," " got %08x\n", dwVal); @@ -2154,7 +2166,8 @@ static void test_key_permissions(void) result = CryptGetKeyParam(hKey1, KP_PERMISSIONS, (BYTE*)&dwVal, &dwLen, 0); ok(result, "%08x\n", GetLastError()); ok(dwVal == - (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT), + (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT) || + broken(dwVal == 0xffffffff), /* Win9x/NT4 */ "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT," " got %08x\n", dwVal); /* Thus, changing the export flag of the key doesn't affect whether the key @@ -2174,7 +2187,8 @@ static void test_key_permissions(void) result = CryptGetKeyParam(hKey2, KP_PERMISSIONS, (BYTE*)&dwVal, &dwLen, 0); ok(result, "%08x\n", GetLastError()); ok(dwVal == - (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT), + (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT) || + broken(dwVal == 0xffffffff), /* Win9x/NT4 */ "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT," " got %08x\n", dwVal);

1 0

Juan Lang : cryptnet: Skip failing tests no matter what the last error is, but only on Windows.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: bc2fa00789d9775f7c8d3815e8df4bb3661fa093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2fa00789d9775f7c8d3815e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 29 16:57:45 2009 -0800 cryptnet: Skip failing tests no matter what the last error is, but only on Windows. --- dlls/cryptnet/tests/cryptnet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index 5a4e773..618e494 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -285,10 +285,10 @@ static void test_retrieveObjectByUrl(void) pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray, NULL, NULL, NULL, NULL); - if (!ret && GetLastError() == ERROR_NOT_SUPPORTED) + if (!ret) { /* File URL support was apparently removed in Vista/Windows 2008 */ - skip("File URLs not supported\n"); + win_skip("File URLs not supported\n"); return; } ok(ret, "CryptRetrieveObjectByUrlA failed: %d\n", GetLastError());

1 0

Juan Lang : cryptui: Fix a few test failures on older Windows versions.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 3b7c62f80b6fb40c226cd4ec5aac5d19e399cf03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7c62f80b6fb40c226cd4ec5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 29 16:52:41 2009 -0800 cryptui: Fix a few test failures on older Windows versions. --- dlls/cryptui/tests/cryptui.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c index 2cac521..534d0e7 100644 --- a/dlls/cryptui/tests/cryptui.c +++ b/dlls/cryptui/tests/cryptui.c @@ -406,7 +406,9 @@ static void test_crypt_ui_wiz_import(void) if (ca) { ret = find_and_delete_cert_in_store(ca, info.u.pCertContext); - ok(ret, "expected to find v1CertWithValidPubKey in CA store\n"); + ok(ret || + broken(!ret) /* Win9x/NT4 */, + "expected to find v1CertWithValidPubKey in CA store\n"); CertCloseStore(ca, 0); } } @@ -463,7 +465,9 @@ static void test_crypt_ui_wiz_import(void) CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE, 0, NULL, &info, store); ok(ret, "CryptUIWizImport failed: %08x\n", GetLastError()); ret = find_and_delete_cert_in_store(store, info.u.pCertContext); - ok(ret, "expected to find iTunesCert3 in memory store\n"); + ok(ret || + broken(!ret) /* Win9x/NT4 */, + "expected to find iTunesCert3 in memory store\n"); CertFreeCertificateContext(info.u.pCertContext); CertCloseStore(store, 0); @@ -503,7 +507,9 @@ static void test_crypt_ui_wiz_import(void) if (ca) { ret = find_and_delete_cert_in_store(ca, info.u.pCertContext); - ok(ret, "expected to find iTunesCert2 in CA store\n"); + ok(ret || + broken(!ret) /* Win9x/NT4 */, + "expected to find iTunesCert2 in CA store\n"); CertCloseStore(ca, 0); } }

1 0

Juan Lang : crypt32: Add index of failing test to output.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 10b7b81e210a1a74bace60e80a4183daebef4af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b7b81e210a1a74bace60e80… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 29 16:53:56 2009 -0800 crypt32: Add index of failing test to output. --- dlls/crypt32/tests/encode.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index cf5a9d6..5c681b6 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1984,10 +1984,10 @@ static void test_encodeBits(DWORD dwEncoding) if (buf) { ok(bufSize == bits[i].encoded[1] + 2, - "Got unexpected size %d, expected %d\n", bufSize, + "%d: Got unexpected size %d, expected %d\n", i, bufSize, bits[i].encoded[1] + 2); ok(!memcmp(buf, bits[i].encoded, bits[i].encoded[1] + 2), - "Unexpected value\n"); + "%d: Unexpected value\n", i); LocalFree(buf); } }

1 0

Juan Lang : crypt32: Fix CryptProtectData tests on older Windows versions.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: b5b097fdaaa1c453bd4cfbb5ea55ef26fc722bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b097fdaaa1c453bd4cfbb5e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 29 17:01:14 2009 -0800 crypt32: Fix CryptProtectData tests on older Windows versions. --- dlls/crypt32/tests/protectdata.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index 30b55b4..97b08c5 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -69,11 +69,16 @@ static void test_cryptprotectdata(void) /* without entropy */ SetLastError(0xDEADBEEF); protected = pCryptProtectData(&plain,desc,NULL,NULL,NULL,0,&cipher); - ok(protected, "Encrypting without entropy.\n"); - r = GetLastError(); - ok(r == ERROR_SUCCESS || - r == ERROR_IO_PENDING, /* win2k */ - "Expected ERROR_SUCCESS or ERROR_IO_PENDING, got %d\n",r); + ok(protected || + broken(!protected), /* Win9x/NT4 */ + "Encrypting without entropy.\n"); + if (protected) + { + r = GetLastError(); + ok(r == ERROR_SUCCESS || + r == ERROR_IO_PENDING, /* win2k */ + "Expected ERROR_SUCCESS or ERROR_IO_PENDING, got %d\n",r); + } cipher_entropy.pbData=NULL; cipher_entropy.cbData=0; @@ -81,7 +86,9 @@ static void test_cryptprotectdata(void) /* with entropy */ SetLastError(0xDEADBEEF); protected = pCryptProtectData(&plain,desc,&entropy,NULL,NULL,0,&cipher_entropy); - ok(protected, "Encrypting with entropy.\n"); + ok(protected || + broken(!protected), /* Win9x/NT4 */ + "Encrypting with entropy.\n"); cipher_no_desc.pbData=NULL; cipher_no_desc.cbData=0;

1 0

Juan Lang : crypt32: Move test for duplicating a NULL cert to existing function.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 44e7d7b682088bed6a00ab22fd1e014b4790fc0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e7d7b682088bed6a00ab22f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jan 29 11:20:46 2009 -0800 crypt32: Move test for duplicating a NULL cert to existing function. --- dlls/crypt32/tests/cert.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 844fd28..a22ec7c 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -662,6 +662,10 @@ static void testDupCert(void) CertFreeCertificateContext(context); } CertCloseStore(store, 0); + + SetLastError(0xdeadbeef); + context = CertDuplicateCertificateContext(NULL); + ok(context == NULL, "Expected context to be NULL\n"); } static BYTE subjectName3[] = { 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, @@ -3136,16 +3140,6 @@ static void testGetPublicKeyLength(void) ok(ret == 56, "Expected length 56, got %d\n", ret); } -static void testCertDuplicateCertificateContext(void) -{ - PCCERT_CONTEXT context; - - SetLastError(0xdeadbeef); - context = CertDuplicateCertificateContext(NULL); - ok(context == NULL, "Expected context to be NULL\n"); -} - - START_TEST(cert) { init_function_pointers(); @@ -3173,5 +3167,4 @@ START_TEST(cert) testVerifyRevocation(); testAcquireCertPrivateKey(); testGetPublicKeyLength(); - testCertDuplicateCertificateContext(); }

1 0

Alexandre Julliard : ntoskrnl.exe: Remove the vectored exception handler on dll unload.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 13ff441aea4ac895294b4c1b6a1950de74d43f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ff441aea4ac895294b4c1b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 30 11:44:13 2009 +0100 ntoskrnl.exe: Remove the vectored exception handler on dll unload. --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7d7236d..a62f02a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1175,6 +1175,9 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); KeQueryTickCount( &count ); /* initialize the global KeTickCount */ break; + case DLL_PROCESS_DETACH: + RtlRemoveVectoredExceptionHandler( vectored_handler ); + break; } return TRUE; }

1 0

Christian Costa : d3dxof: Fix dead code.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 868f63935c311f9c5d3d05ed9d365212ac44e615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868f63935c311f9c5d3d05ed9… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Jan 29 22:46:01 2009 +0100 d3dxof: Fix dead code. --- dlls/d3dxof/parsing.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 3c4299c..13fc5bb 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1149,12 +1149,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) { token = get_TOKEN(buf); if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA)) - { - /* Allow comma instead of semicolon in some specific cases */ - if (!((token == TOKEN_COMMA) && ((i+1) < pt->nb_members) && (pt->members[i].type == pt->members[i+1].type) - && (!pt->members[i].nb_dims) && (!pt->members[i+1].nb_dims))) - return FALSE; - } + return FALSE; } }

1 0

Alasdair Sinclair : setupapi/tests: Fix missing void in empty parameter list.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 3fc0414896b6b20334f8368df5f786957c641a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc0414896b6b20334f8368df… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Thu Jan 29 20:58:48 2009 +0000 setupapi/tests: Fix missing void in empty parameter list. --- dlls/setupapi/tests/devinst.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c75d2f7..a4f80ba 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1133,7 +1133,7 @@ static void testRegisterAndGetDetail(void) } } -static void testDeviceRegistryPropertyA() +static void testDeviceRegistryPropertyA(void) { HDEVINFO set; SP_DEVINFO_DATA devInfo = { sizeof(SP_DEVINFO_DATA), { 0 } }; @@ -1237,7 +1237,7 @@ static void testDeviceRegistryPropertyA() } } -static void testDeviceRegistryPropertyW() +static void testDeviceRegistryPropertyW(void) { HDEVINFO set; SP_DEVINFO_DATA devInfo = { sizeof(SP_DEVINFO_DATA), { 0 } };

1 0

Andrew Talbot : winex11.drv: Declare some functions static.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: f63ceec4329051cd4e367f0cd72976c99517d3af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63ceec4329051cd4e367f0cd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jan 29 21:40:50 2009 +0000 winex11.drv: Declare some functions static. --- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 4f87137..a44de11 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -286,7 +286,7 @@ BOOL X11DRV_SetupGCForBrush( X11DRV_PDEVICE *physDev ) * Setup physDev->gc for drawing operations using current pen. * Return FALSE if pen is PS_NULL, TRUE otherwise. */ -BOOL X11DRV_SetupGCForPen( X11DRV_PDEVICE *physDev ) +static BOOL X11DRV_SetupGCForPen( X11DRV_PDEVICE *physDev ) { XGCValues val; UINT rop2 = GetROP2(physDev->hdc); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 31800f7..8eccfe1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1226,7 +1226,7 @@ void make_window_embedded( Display *display, struct x11drv_win_data *data ) * * Convert a rect from client to X window coordinates */ -void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) +static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) { RECT rc; @@ -1827,7 +1827,7 @@ Window X11DRV_get_whole_window( HWND hwnd ) * * Return the X window associated with the client area of a window */ -Window X11DRV_get_client_window( HWND hwnd ) +static Window X11DRV_get_client_window( HWND hwnd ) { struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 955a08c..7d0b2ba 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -247,7 +247,6 @@ extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ); extern BOOL X11DRV_SetupGCForPatBlt( X11DRV_PDEVICE *physDev, GC gc, BOOL fMapColors ); extern BOOL X11DRV_SetupGCForBrush( X11DRV_PDEVICE *physDev ); -extern BOOL X11DRV_SetupGCForPen( X11DRV_PDEVICE *physDev ); extern BOOL X11DRV_SetupGCForText( X11DRV_PDEVICE *physDev ); extern INT X11DRV_XWStoDS( X11DRV_PDEVICE *physDev, INT width ); extern INT X11DRV_YWStoDS( X11DRV_PDEVICE *physDev, INT height ); @@ -718,7 +717,6 @@ struct x11drv_win_data extern struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ); extern struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd ); extern Window X11DRV_get_whole_window( HWND hwnd ); -extern Window X11DRV_get_client_window( HWND hwnd ); extern XIC X11DRV_get_ic( HWND hwnd ); extern int pixelformat_from_fbconfig_id( XID fbconfig_id ); @@ -753,7 +751,6 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ); extern int X11DRV_check_error(void); -extern void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ); extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ); extern void xinerama_init( unsigned int width, unsigned int height );

1 0