September 2010 - Wine-commits

Stefan Leichter : hal: Added stub for ExAcquireFastMutex.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: bffe120f4b3a74b69c8f231ad572a5db512a2e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffe120f4b3a74b69c8f231ad… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Sep 22 18:04:53 2010 +0200 hal: Added stub for ExAcquireFastMutex. --- dlls/hal/hal.c | 11 +++++++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 5b38426..3353d04 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -74,6 +74,17 @@ VOID WINAPI ExReleaseFastMutex(PFAST_MUTEX FastMutex) } #ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( ExTryToAcquireFastMutex ) +BOOLEAN WINAPI __regs_ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) +#else +BOOLEAN WINAPI ExTryToAcquireFastMutex(PFAST_MUTEX FastMutex) +#endif +{ + FIXME("(%p) stub\n", FastMutex); + return TRUE; +} + +#ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( KfAcquireSpinLock ) KIRQL WINAPI __regs_KfAcquireSpinLock(PKSPIN_LOCK SpinLock) #else diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 30de722..2a8c155 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -1,6 +1,6 @@ @ stdcall -norelay ExAcquireFastMutex(ptr) @ stdcall -norelay ExReleaseFastMutex(ptr) -@ stub ExTryToAcquireFastMutex +@ stdcall -norelay ExTryToAcquireFastMutex(ptr) @ stub HalClearSoftwareInterrupt @ stub HalRequestSoftwareInterrupt @ stub HalSystemVectorDispatchEntry

1 0

Alexander Morozov : crypt32/tests: Add a test for CryptEncryptMessage.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 476552c5b511fdcdb6b6c72e90c86bc7f43d54c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=476552c5b511fdcdb6b6c72e9… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Sep 22 20:13:56 2010 +0400 crypt32/tests: Add a test for CryptEncryptMessage. --- dlls/crypt32/tests/message.c | 196 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 194 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index f2977cd..b7114b7 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -794,7 +794,7 @@ static const BYTE publicPrivateKeyPair[] = { 0xb1,0x8c,0xea,0x33,0x54,0x08,0x38,0xc9,0xcd,0xac,0x10,0x19,0x4a,0xba,0x89, 0xdc,0xb6,0x73,0xef,0xec,0x56,0x93,0xd6,0xf2,0x4b,0xba,0x50,0x2d,0x8f,0x15, 0xed,0x8b,0xb5,0x67,0xc8,0xfc,0x51,0x5f }; -static const BYTE certForSigning[] = { +static const BYTE cert1[] = { 0x30,0x81,0xd0,0x30,0x81,0xbe,0xa0,0x03,0x02,0x01,0x02,0x02,0x10,0x20,0x42, 0x68,0x69,0xe9,0xea,0x61,0x83,0x11,0xdf,0xc0,0x24,0x2f,0x3b,0xad,0x40,0x30, 0x09,0x06,0x05,0x2b,0x0e,0x03,0x02,0x1d,0x05,0x00,0x30,0x0c,0x31,0x0a,0x30, @@ -810,6 +810,26 @@ static const BYTE certForSigning[] = { 0x1e,0x94,0x09,0x9e,0x50,0x09,0x5b,0xd9,0x60,0xd9,0x9b,0x02,0x03,0x01,0x00, 0x01,0x30,0x09,0x06,0x05,0x2b,0x0e,0x03,0x02,0x1d,0x05,0x00,0x03,0x02,0x00, 0xc1 }; +static const BYTE cert2[] = { +0x30,0x82,0x01,0x15,0x30,0x82,0x01,0x02,0xa0,0x03,0x02,0x01,0x02,0x02,0x10, +0x1c,0xf2,0x1f,0xec,0x6b,0xdc,0x36,0xbf,0x4a,0xd7,0xe1,0x6c,0x84,0x85,0xcd, +0x2e,0x30,0x09,0x06,0x05,0x2b,0x0e,0x03,0x02,0x1d,0x05,0x00,0x30,0x0c,0x31, +0x0a,0x30,0x08,0x06,0x03,0x55,0x04,0x03,0x13,0x01,0x58,0x30,0x20,0x17,0x0d, +0x31,0x30,0x30,0x37,0x31,0x32,0x31,0x31,0x33,0x37,0x35,0x36,0x5a,0x18,0x0f, +0x33,0x30,0x31,0x30,0x30,0x37,0x31,0x32,0x31,0x31,0x33,0x37,0x35,0x36,0x5a, +0x30,0x0c,0x31,0x0a,0x30,0x08,0x06,0x03,0x55,0x04,0x03,0x13,0x01,0x58,0x30, +0x81,0x9f,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01, +0x05,0x00,0x03,0x81,0x8d,0x00,0x30,0x81,0x89,0x02,0x81,0x81,0x00,0xab,0xed, +0x6e,0xe0,0x00,0x3c,0xcf,0x2d,0x2b,0xda,0x05,0x88,0x6a,0x7e,0xed,0x60,0x30, +0x24,0xef,0x6c,0x6b,0xad,0x28,0x9b,0x14,0x90,0xf6,0xd0,0x96,0x79,0x6d,0xad, +0xac,0x46,0x14,0x7b,0x0e,0xfe,0xa9,0x8a,0x05,0x5a,0xc8,0x84,0x38,0x44,0xf9, +0xce,0xb2,0xe6,0xde,0x5b,0x80,0x0b,0x15,0xff,0x1b,0x60,0x3f,0xba,0xb2,0xfe, +0x6e,0xf5,0xdc,0x54,0x33,0xfc,0xfc,0x79,0x0a,0x10,0xa4,0x23,0x6d,0x67,0xeb, +0x16,0xb2,0x92,0xbf,0x63,0x42,0x17,0x0a,0xde,0xe6,0xab,0x8e,0xf7,0x8e,0x41, +0x8c,0x04,0xe8,0xe2,0x38,0x73,0xd3,0x82,0xd7,0xd1,0xee,0xd3,0xa6,0x54,0x8c, +0xcd,0x0b,0x93,0xda,0x63,0x55,0x0d,0x1f,0x68,0x5c,0x30,0xee,0xad,0x2d,0xd5, +0x40,0x56,0xe0,0xd8,0xc7,0xef,0x02,0x03,0x01,0x00,0x01,0x30,0x09,0x06,0x05, +0x2b,0x0e,0x03,0x02,0x1d,0x05,0x00,0x03,0x02,0x00,0x06 }; static const BYTE crl[] = { 0x30,0x81,0xc2,0x30,0x7e,0x02,0x01,0x01,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48, 0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x30,0x3c,0x31,0x0b,0x30,0x09,0x06, @@ -999,7 +1019,7 @@ static void test_sign_message(void) para.dwMsgEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; SetLastError(0xdeadbeef); para.pSigningCert = CertCreateCertificateContext(X509_ASN_ENCODING | - PKCS_7_ASN_ENCODING, certForSigning, sizeof(certForSigning)); + PKCS_7_ASN_ENCODING, cert1, sizeof(cert1)); ok(para.pSigningCert != NULL, "CertCreateCertificateContext failed: %08x\n", GetLastError()); para.HashAlgorithm.pszObjId = oid_rsa_md5; @@ -1150,6 +1170,177 @@ static void test_sign_message(void) CryptReleaseContext(hCryptProv, 0); } +static const BYTE encryptedMessage[] = { +0x30,0x31,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x03,0xa0,0x24, +0x30,0x22,0x02,0x01,0x00,0x31,0x00,0x30,0x1b,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x07,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x03,0x04,0x05,0x00,0x80,0x00 }; + +static void test_encrypt_message(void) +{ + BOOL ret; + CRYPT_ENCRYPT_MESSAGE_PARA para; + static char oid_rsa_rc4[] = szOID_RSA_RC4; + static const BYTE blob[] = { 0x01, 0x02, 0x03, 0x04 }; + PCCERT_CONTEXT certs[2]; + HCRYPTPROV hCryptProv = 0; + LPBYTE encryptedBlob; + DWORD encryptedBlobSize; + + SetLastError(0xdeadbeef); + ret = CryptAcquireContextA(&hCryptProv, NULL, NULL, PROV_RSA_FULL, + CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + certs[0] = CertCreateCertificateContext(X509_ASN_ENCODING | + PKCS_7_ASN_ENCODING, cert1, sizeof(cert1)); + ok(certs[0] != NULL, "CertCreateCertificateContext failed: %08x\n", + GetLastError()); + SetLastError(0xdeadbeef); + certs[1] = CertCreateCertificateContext(X509_ASN_ENCODING | + PKCS_7_ASN_ENCODING, cert2, sizeof(cert2)); + ok(certs[1] != NULL, "CertCreateCertificateContext failed: %08x\n", + GetLastError()); + + memset(&para, 0, sizeof(para)); + SetLastError(0xdeadbeef); + encryptedBlobSize = 255; + ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, + &encryptedBlobSize); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + todo_wine + ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); + para.cbSize = sizeof(para); + para.dwMsgEncodingType = X509_ASN_ENCODING; + SetLastError(0xdeadbeef); + encryptedBlobSize = 255; + ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, + &encryptedBlobSize); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + todo_wine + ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); + para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; + SetLastError(0xdeadbeef); + encryptedBlobSize = 255; + ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, + &encryptedBlobSize); + todo_wine + ok(!ret && + (GetLastError() == CRYPT_E_UNKNOWN_ALGO || + GetLastError() == E_INVALIDARG), /* Win9x */ + "expected CRYPT_E_UNKNOWN_ALGO or E_INVALIDARG, got %08x\n", + GetLastError()); + todo_wine + ok(!encryptedBlobSize, "unexpected size %d\n", encryptedBlobSize); + + para.hCryptProv = hCryptProv; + para.ContentEncryptionAlgorithm.pszObjId = oid_rsa_rc4; + + SetLastError(0xdeadbeef); + encryptedBlobSize = 0; + ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, NULL, + &encryptedBlobSize); + todo_wine + ok(ret || + broken(!ret) /* Win9x */, + "CryptEncryptMessage failed: %08x\n", GetLastError()); + if (ret) + { + encryptedBlob = CryptMemAlloc(encryptedBlobSize); + if (encryptedBlob) + { + SetLastError(0xdeadbeef); + ret = CryptEncryptMessage(&para, 0, NULL, NULL, 0, encryptedBlob, + &encryptedBlobSize); + todo_wine + ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); + todo_wine + ok(encryptedBlobSize == sizeof(encryptedMessage), + "unexpected size of encrypted blob %d\n", encryptedBlobSize); + ok(!memcmp(encryptedBlob, encryptedMessage, encryptedBlobSize), + "unexpected value\n"); + CryptMemFree(encryptedBlob); + } + } + + SetLastError(0xdeadbeef); + encryptedBlobSize = 0; + ret = CryptEncryptMessage(&para, 2, certs, NULL, 0, NULL, + &encryptedBlobSize); + todo_wine + ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); + if (ret) + { + encryptedBlob = CryptMemAlloc(encryptedBlobSize); + if (encryptedBlob) + { + SetLastError(0xdeadbeef); + ret = CryptEncryptMessage(&para, 2, certs, NULL, 0, encryptedBlob, + &encryptedBlobSize); + todo_wine + ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); + CryptMemFree(encryptedBlob); + } + } + + SetLastError(0xdeadbeef); + encryptedBlobSize = 0; + ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), NULL, + &encryptedBlobSize); + todo_wine + ok(ret || + broken(!ret) /* Win9x */, + "CryptEncryptMessage failed: %08x\n", GetLastError()); + if (ret) + { + encryptedBlob = CryptMemAlloc(encryptedBlobSize); + if (encryptedBlob) + { + SetLastError(0xdeadbeef); + ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob), + encryptedBlob, &encryptedBlobSize); + todo_wine + ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); + todo_wine + ok(encryptedBlobSize == 55, + "unexpected size of encrypted blob %d\n", encryptedBlobSize); + CryptMemFree(encryptedBlob); + } + } + + SetLastError(0xdeadbeef); + encryptedBlobSize = 0; + ret = CryptEncryptMessage(&para, 2, certs, blob, sizeof(blob), NULL, + &encryptedBlobSize); + todo_wine + ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); + if (ret) + { + encryptedBlob = CryptMemAlloc(encryptedBlobSize); + if (encryptedBlob) + { + SetLastError(0xdeadbeef); + ret = CryptEncryptMessage(&para, 2, certs, blob, sizeof(blob), + encryptedBlob, &encryptedBlobSize); + todo_wine + ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError()); + CryptMemFree(encryptedBlob); + } + } + + if (certs[0]) + CertFreeCertificateContext(certs[0]); + if (certs[1]) + CertFreeCertificateContext(certs[1]); + if (hCryptProv) + CryptReleaseContext(hCryptProv, 0); +} + START_TEST(message) { test_msg_get_signer_count(); @@ -1159,4 +1350,5 @@ START_TEST(message) test_verify_message_signature(); test_hash_message(); test_sign_message(); + test_encrypt_message(); }

1 0

Peter Oberndorfer : wineconsole: Allow to select popup menu entries with the right mouse button.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 6191e42a0f335d39c5639c8a6ec9d1fb486b1259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6191e42a0f335d39c5639c8a6… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Sep 22 19:29:53 2010 +0200 wineconsole: Allow to select popup menu entries with the right mouse button. --- programs/wineconsole/user.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index f379faf..df39194 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1177,7 +1177,7 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM pt.y = (short)HIWORD(lParam); ClientToScreen(hWnd, &pt); WCUSER_SetMenuDetails(data, PRIVATE(data)->hPopMenu); - TrackPopupMenu(PRIVATE(data)->hPopMenu, TPM_LEFTALIGN|TPM_TOPALIGN, + TrackPopupMenu(PRIVATE(data)->hPopMenu, TPM_LEFTALIGN|TPM_TOPALIGN|TPM_RIGHTBUTTON, pt.x, pt.y, 0, hWnd, NULL); } else

1 0

Peter Oberndorfer : ntdll/tests: Remove unused NtWaitForSingleObject import .
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 9c2203123df76a1db1b11b633d0ccab003045fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2203123df76a1db1b11b633… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Sep 22 19:29:58 2010 +0200 ntdll/tests: Remove unused NtWaitForSingleObject import. --- dlls/ntdll/tests/port.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index d092ed7..20e5831 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -128,7 +128,6 @@ static NTSTATUS (WINAPI *pNtConnectPort)(PHANDLE,PUNICODE_STRING, PLPC_SECTION_WRITE,PLPC_SECTION_READ, PVOID,PVOID,PULONG); static NTSTATUS (WINAPI *pRtlInitUnicodeString)(PUNICODE_STRING,LPCWSTR); -static NTSTATUS (WINAPI *pNtWaitForSingleObject)(HANDLE,BOOLEAN,PLARGE_INTEGER); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static BOOL is_wow64; @@ -150,7 +149,6 @@ static BOOL init_function_ptrs(void) pNtRegisterThreadTerminatePort = (void *)GetProcAddress(hntdll, "NtRegisterThreadTerminatePort"); pNtConnectPort = (void *)GetProcAddress(hntdll, "NtConnectPort"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); - pNtWaitForSingleObject = (void *)GetProcAddress(hntdll, "NtWaitForSingleObject"); if (!pNtCompleteConnectPort || !pNtAcceptConnectPort || !pNtReplyWaitReceivePort || !pNtCreatePort || !pNtRequestWaitReplyPort ||

1 0

Mike Kaplinskiy : ws2_32: Implement AcceptEx and GetAcceptExSockaddrs.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: cf72f406ec7cdfebbd5135ede6e45547ca82dae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf72f406ec7cdfebbd5135ede… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Sep 20 21:30:28 2010 -0400 ws2_32: Implement AcceptEx and GetAcceptExSockaddrs. --- dlls/ws2_32/socket.c | 257 +++++++++++++++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 14 ++- 2 files changed, 263 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf72f406ec7cdfebbd513…

1 0

Austin English : ntoskrnl.exe: Add stub for READ_REGISTER_BUFFER_UCHAR.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 7bc0484c890f45dcd3b4d01e95caa2c7db50f92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc0484c890f45dcd3b4d01e9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 22 00:07:03 2010 -0700 ntoskrnl.exe: Add stub for READ_REGISTER_BUFFER_UCHAR. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 17990e0..18317e2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1532,6 +1532,14 @@ VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOI FIXME("stub\n"); } +/*********************************************************************** + * READ_REGISTER_BUFFER_UCHAR (NTOSKRNL.EXE.@) + */ +VOID WINAPI READ_REGISTER_BUFFER_UCHAR(PUCHAR Register, PUCHAR Buffer, ULONG Count) +{ + FIXME("stub\n"); +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 31af18b..f9eb721 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -921,7 +921,7 @@ @ stub PsSetThreadWin32Thread @ stdcall PsTerminateSystemThread(long) @ stub PsThreadType -@ stub READ_REGISTER_BUFFER_UCHAR +@ stdcall READ_REGISTER_BUFFER_UCHAR(ptr ptr long) @ stub READ_REGISTER_BUFFER_ULONG @ stub READ_REGISTER_BUFFER_USHORT @ stub READ_REGISTER_UCHAR

1 0

Austin English : kernel32: Add a stub for GetSystemDEPPolicy.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: e99612c4c843ac28c6e29ec3dd0bf78546d92646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99612c4c843ac28c6e29ec3d… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 21 21:17:29 2010 -0700 kernel32: Add a stub for GetSystemDEPPolicy. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 9 +++++++++ include/winbase.h | 7 +++++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8a33013..43e339b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -624,6 +624,7 @@ @ stdcall GetSystemDefaultLCID() @ stdcall GetSystemDefaultLangID() @ stdcall GetSystemDefaultUILanguage() +@ stdcall GetSystemDEPPolicy() @ stdcall GetSystemDirectoryA(ptr long) @ stdcall GetSystemDirectoryW(ptr long) @ stdcall GetSystemInfo(ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c1816a8..d4c2063 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3385,3 +3385,12 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void) FIXME("stub\n"); return 0; } + +/********************************************************************** + * GetSystemDEPPolicy (KERNEL32.@) + */ +DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) +{ + FIXME("stub\n"); + return OptIn; +} diff --git a/include/winbase.h b/include/winbase.h index 2c4b5d5..24f6f33 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1234,6 +1234,13 @@ typedef struct tagHW_PROFILE_INFOW { DECL_WINELIB_TYPE_AW(HW_PROFILE_INFO) DECL_WINELIB_TYPE_AW(LPHW_PROFILE_INFO) +typedef enum _DEP_SYSTEM_POLICY_TYPE { + AlwaysOff = 0, + AlwaysOn = 1, + OptIn = 2, + OptOut = 3 +} DEP_SYSTEM_POLICY_TYPE; + /* Event Logging */ #define EVENTLOG_FULL_INFO 0

1 0

Alexandre Julliard : winmm/tests: Fix some tests that fail on Windows with no input device.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: ddac146e7dcb75c1a1a34a119f91fefa72ceccab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddac146e7dcb75c1a1a34a119… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 22 13:30:31 2010 +0200 winmm/tests: Fix some tests that fail on Windows with no input device. --- dlls/winmm/tests/capture.c | 25 +++++-------------------- 1 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 81d6281..d0d5df9 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -666,14 +666,8 @@ static void wave_in_tests(void) dev_name(ndev+1),wave_in_error(rc)); rc=waveInGetDevCapsA(WAVE_MAPPER,&capsA,sizeof(capsA)); - if (ndev>0) - ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NODRIVER, - "waveInGetDevCapsA(%s): MMSYSERR_NOERROR or MMSYSERR_NODRIVER " - "expected, got %s\n",dev_name(WAVE_MAPPER),wave_in_error(rc)); - else - ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, - "waveInGetDevCapsA(%s): MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER " - "expected, got %s\n",dev_name(WAVE_MAPPER),wave_in_error(rc)); + ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NODRIVER || (!ndev && (rc==MMSYSERR_BADDEVICEID)), + "waveInGetDevCapsA(%s): got %s\n",dev_name(WAVE_MAPPER),wave_in_error(rc)); rc=waveInGetDevCapsW(ndev+1,&capsW,sizeof(capsW)); ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NOTSUPPORTED, @@ -681,18 +675,9 @@ static void wave_in_tests(void) "expected, got %s\n",dev_name(ndev+1),wave_in_error(rc)); rc=waveInGetDevCapsW(WAVE_MAPPER,&capsW,sizeof(capsW)); - if (ndev>0) - ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NODRIVER || - rc==MMSYSERR_NOTSUPPORTED, - "waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NODRIVER or " - "MMSYSERR_NOTSUPPORTED expected, got %s\n", - dev_name(ndev+1),wave_in_error(rc)); - else - ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER || - rc==MMSYSERR_NOTSUPPORTED, - "waveInGetDevCapsW(%s): MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER or" - "MMSYSERR_NOTSUPPORTED expected, got %s\n", - dev_name(ndev+1),wave_in_error(rc)); + ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NODRIVER || + rc==MMSYSERR_NOTSUPPORTED || (!ndev && (rc==MMSYSERR_BADDEVICEID)), + "waveInGetDevCapsW(%s): got %s\n", dev_name(ndev+1),wave_in_error(rc)); format.wFormatTag=WAVE_FORMAT_PCM; format.nChannels=2;

1 0

André Hentschel : taskkill: Add German translation.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: e919ef622cb0e36518ae6f531cfa23b30946a6f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e919ef622cb0e36518ae6f531… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 21 21:48:15 2010 +0200 taskkill: Add German translation. --- programs/taskkill/De.rc | 43 +++++++++++++++++++++++++++++++++++++++++ programs/taskkill/Makefile.in | 1 + 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/De.rc b/programs/taskkill/De.rc new file mode 100644 index 0000000..597cc36 --- /dev/null +++ b/programs/taskkill/De.rc @@ -0,0 +1,43 @@ +/* + * Task termination utility + * German language support + * + * Copyright 2010 André Hentschel + * + * 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 "taskkill.h" + +#pragma code_page(65001) + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Aufruf: taskkill [/?] [/f] [/im ProzessName | /pid ProzessID]\n" + STRING_INVALID_OPTION, "Fehler: Unbekannte oder ungültige Kommandozeilenoption angegeben.\n" + STRING_INVALID_PARAM, "Fehler: Ungültiger Kommandozeilenparameter angegeben.\n" + STRING_MISSING_OPTION, "Fehler: Nur eine der Optionen /im oder /pid dürfen angegeben werden.\n" + STRING_MISSING_PARAM, "Fehler: Option %s erwartet einen Kommandozeilenparameter.\n" + STRING_MUTUAL_EXCLUSIVE, "Fehler: Optionen /im und /pid widersprechen sich.\n" + STRING_CLOSE_PID_SEARCH, "Ein Beendigungssignal wurde an die Top-Level Fenster des Prozesses mit der PID %u geschickt.\n" + STRING_CLOSE_PROC_SRCH, "Ein Beendigungssignal wurde an die Top-Level Fenster des Prozessess \"%s\" mit der PID %u geschickt.\n" + STRING_TERM_PID_SEARCH, "Prozess mit der PID %u wurde zum beenden gezwungen.\n" + STRING_TERM_PROC_SEARCH, "Prozess \"%s\" mit der PID %u wurde zum beenden gezwungen.\n" + STRING_SEARCH_FAILED, "Fehler: Konnte Prozess \"%s\" nicht finden.\n" + STRING_ENUM_FAILED, "Fehler: Konnte die Prozessliste nicht Enumerieren.\n" + STRING_TERMINATE_FAILED, "Fehler: Konnte Prozess \"%s\" nicht beenden.\n" +} diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index 53667d2..109eb01 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -6,6 +6,7 @@ IMPORTS = psapi user32 C_SRCS = taskkill.c RC_SRCS = \ + De.rc \ En.rc \ It.rc

1 0

Aurimas Fišeras : taskkill: Add Lithuanian translation .
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 78fc5a54abf39c46670e8eb4f7d8ead40c549544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fc5a54abf39c46670e8eb4f… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Sep 21 22:54:33 2010 +0300 taskkill: Add Lithuanian translation. --- programs/taskkill/Lt.rc | 44 +++++++++++++++++++++++++++++++++++++++++ programs/taskkill/Makefile.in | 3 +- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/programs/taskkill/Lt.rc b/programs/taskkill/Lt.rc new file mode 100644 index 0000000..16b8bf5 --- /dev/null +++ b/programs/taskkill/Lt.rc @@ -0,0 +1,44 @@ +/* + * Task termination utility + * Lithuanian language support + * + * Copyright 2010 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 "taskkill.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Naudojimas: taskkill [/?] [/f] [/im ProcesoVardas | /pid ProcesoID]\n" + STRING_INVALID_OPTION, "Klaida: nurodyta nežinoma arba neteisinga komandos eilutės parinktis.\n" + STRING_INVALID_PARAM, "Klaida: nurodytas neteisingas komandos eilutės parametras.\n" + STRING_MISSING_OPTION, "Klaida: viena iš parinkčių /im arba /pid privalo būti nurodyta.\n" + STRING_MISSING_PARAM, "Klaida: parinkčiai %s reikalingas komandos eilutės parametras.\n" + STRING_MUTUAL_EXCLUSIVE, "Klaida: parinktys /im ir /pid yra nesuderinamos.\n" + STRING_CLOSE_PID_SEARCH, "Užvėrimo pranešimas nusiųstas aukščiausiojo lygio proceso, kurio PID %u, langams.\n" + STRING_CLOSE_PROC_SRCH, "Užvėrimo pranešimas nusiųstas aukščiausiojo lygio proceso „%s“, kurio PID %u, langams.\n" + STRING_TERM_PID_SEARCH, "Procesas, kurio PID %u, buvo priverstinai nutrauktas.\n" + STRING_TERM_PROC_SEARCH, "Procesas „%s“, kurio PID %u, buvo priverstinai nutrauktas.\n" + STRING_SEARCH_FAILED, "Klaida: nepavyko rasti proceso „%s“.\n" + STRING_ENUM_FAILED, "Klaida: nepavyko gauti procesų sąrašo.\n" + STRING_TERMINATE_FAILED, "Klaida: nepavyko nutraukti proceso „%s“.\n" +} diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index 109eb01..249459d 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = taskkill.c RC_SRCS = \ De.rc \ En.rc \ - It.rc + It.rc \ + Lt.rc @MAKE_PROG_RULES@

1 0