wine-commits September 2006

wine-commits@winehq.org

3 participants
651 discussions

Thomas Weidenmueller : rpcrt4: Fix RpcMgmtSetServerStackSize prototype.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: bc0f9c49b01ee090b86b7e4b5236f3e7ea80e3ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc0f9c49b01ee090b86b7e4… Author: Thomas Weidenmueller <thomas(a)reactsoft.com> Date: Wed Sep 27 15:03:20 2006 +0200 rpcrt4: Fix RpcMgmtSetServerStackSize prototype. --- dlls/rpcrt4/rpc_server.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 7dceb2d..a57617c 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1008,8 +1008,8 @@ RPC_STATUS WINAPI RpcMgmtIsServerListeni /*********************************************************************** * RpcMgmtSetServerStackSize (RPCRT4.@) */ -RPC_STATUS WINAPI RpcMgmtSetServerStackSize(unsigned int ThreadStackSize) +RPC_STATUS WINAPI RpcMgmtSetServerStackSize(unsigned long ThreadStackSize) { - FIXME("(0x%x): stub\n", ThreadStackSize); + FIXME("(0x%lx): stub\n", ThreadStackSize); return RPC_S_OK; }

1 0

Paul Vriens : crypt32: A small test to verify when to write function pointers.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: 93c37404f42782e71093dcff0063d48bb08233a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93c37404f42782e71093dcf… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Sep 28 12:11:04 2006 +0200 crypt32: A small test to verify when to write function pointers. --- dlls/crypt32/tests/sip.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 61293aa..6fa6b99 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -283,41 +283,50 @@ static void test_SIPLoad(void) SetLastError(0xdeadbeef); memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); sdi.cbSize = sizeof(SIP_DISPATCH_INFO); + sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; ret = CryptSIPLoad(&dummySubject, 0, &sdi); ok ( !ret, "Expected CryptSIPLoad to fail\n"); todo_wine ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN, "Expected TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08lx\n", GetLastError()); + ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n"); /* cbSize not initialized */ SetLastError(0xdeadbeef); memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; ret = CryptSIPLoad(&dummySubject, 0, &sdi); ok ( !ret, "Expected CryptSIPLoad to fail\n"); todo_wine ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN, "Expected TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08lx\n", GetLastError()); + ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n"); /* cbSize not initialized, but valid subject (named unknown but registered by wintrust) */ SetLastError(0xdeadbeef); memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); + sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; ret = CryptSIPLoad(&unknown, 0, &sdi); todo_wine { ok ( ret, "Expected CryptSIPLoad to succeed\n"); ok ( GetLastError() == ERROR_PROC_NOT_FOUND, "Expected ERROR_PROC_NOT_FOUND, got 0x%08lx\n", GetLastError()); + ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); } /* All OK */ SetLastError(0xdeadbeef); memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); sdi.cbSize = sizeof(SIP_DISPATCH_INFO); + sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; ret = CryptSIPLoad(&unknown, 0, &sdi); todo_wine ok ( ret, "Expected CryptSIPLoad to succeed\n"); ok ( GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got 0x%08lx\n", GetLastError()); + todo_wine + ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); /* The function addresses returned by CryptSIPLoad are actually the addresses of * crypt32's own functions. A function calling these addresses will end up first @@ -351,11 +360,13 @@ static void test_SIPLoad(void) SetLastError(0xdeadbeef); memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO)); sdi.cbSize = sizeof(SIP_DISPATCH_INFO); + sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; ret = CryptSIPLoad(&unknown, 1, &sdi); ok ( !ret, "Expected CryptSIPLoad to fail\n"); todo_wine ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got 0x%08lx\n", GetLastError()); + ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n"); } START_TEST(sip)

1 0

Detlef Riekenberg : localspl/tests: Add initial test.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: ecb97fc24c78f85a8f051084e68a8299b0cd8609 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecb97fc24c78f85a8f05108… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Sep 28 11:47:52 2006 +0200 localspl/tests: Add initial test. --- Makefile.in | 2 + configure | 3 +- configure.ac | 1 + dlls/Makefile.in | 1 + dlls/localspl/tests/Makefile.in | 13 +++++++ dlls/localspl/tests/localmon.c | 72 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 ++ programs/winetest/winetest.rc | 1 + 8 files changed, 95 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ecb97fc24c78f85a8f0…

1 0

Benjamin Arai : clusapi: Implement stub dll for clusapi.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: 493bc6b875d8c0c41e9a22da2c420216d4490c73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=493bc6b875d8c0c41e9a22d… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Wed Sep 27 16:02:35 2006 -0700 clusapi: Implement stub dll for clusapi. --- Makefile.in | 2 + configure | 3 + configure.ac | 1 dlls/.gitignore | 1 dlls/Makefile.in | 5 ++ dlls/clusapi/Makefile.in | 14 +++++ dlls/clusapi/clusapi.c | 56 ++++++++++++++++++++++ dlls/clusapi/clusapi.spec | 115 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 196 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=493bc6b875d8c0c41e9…

1 0

James Hawkins : msi: Follow state resolution rules when a feature parent saves a component.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: cabc7ee1ae327e4e29c3f9910498d83f48e56af7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cabc7ee1ae327e4e29c3f99… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 27 19:37:06 2006 -0700 msi: Follow state resolution rules when a feature parent saves a component. --- dlls/msi/helpers.c | 27 +++++++++++++++++++++++++-- dlls/msi/tests/package.c | 10 ++-------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index d1664bf..868d737 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -33,6 +33,7 @@ #include "msipriv.h" #include "winuser.h" #include "wine/unicode.h" #include "action.h" +#include "msidefs.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -892,8 +893,30 @@ void ACTION_UpdateComponentStates(MSIPAC f->ActionRequest == INSTALLSTATE_SOURCE) ) { TRACE("Saved by %s\n", debugstr_w(f->Feature)); - component->ActionRequest = f->ActionRequest; - component->Action = f->ActionRequest; + + if (component->Attributes & msidbComponentAttributesOptional) + { + if (f->Attributes & msidbFeatureAttributesFavorSource) + { + component->Action = INSTALLSTATE_SOURCE; + component->ActionRequest = INSTALLSTATE_SOURCE; + } + else + { + component->Action = INSTALLSTATE_LOCAL; + component->ActionRequest = INSTALLSTATE_LOCAL; + } + } + else if (component->Attributes & msidbComponentAttributesSourceOnly) + { + component->Action = INSTALLSTATE_SOURCE; + component->ActionRequest = INSTALLSTATE_SOURCE; + } + else + { + component->Action = INSTALLSTATE_LOCAL; + component->ActionRequest = INSTALLSTATE_LOCAL; + } } } } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 5ed8b5b..6542a25 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2626,10 +2626,7 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "virgo", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); - } + ok( action == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -2643,10 +2640,7 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "cassiopeia", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); - } + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee;

1 0

James Hawkins : msi: A feature state of INSTALLSTATE_ABSENT translates into a component state of INSTALLSTATE_UNKNOWN .
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: d83aa64c57072fad6960076ce3aab830e2cfe639 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d83aa64c57072fad6960076… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Sep 27 19:36:16 2006 -0700 msi: A feature state of INSTALLSTATE_ABSENT translates into a component state of INSTALLSTATE_UNKNOWN. --- dlls/msi/helpers.c | 5 ++++- dlls/msi/tests/package.c | 15 +++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index dbca4f3..d1664bf 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -849,6 +849,9 @@ void ACTION_UpdateComponentStates(MSIPAC newstate = feature->ActionRequest; + if (newstate == INSTALLSTATE_ABSENT) + newstate = INSTALLSTATE_UNKNOWN; + LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) { MSICOMPONENT* component = cl->component; @@ -879,7 +882,7 @@ void ACTION_UpdateComponentStates(MSIPAC if ( f->ActionRequest != INSTALLSTATE_LOCAL && f->ActionRequest != INSTALLSTATE_SOURCE ) { - break; + continue; } LIST_FOR_EACH_ENTRY( clist, &f->Components, ComponentList, entry ) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index abf996f..5ed8b5b 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2667,30 +2667,21 @@ static void test_featureparents(void) r = MsiGetComponentState(hpkg, "canis", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "monoceros", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; r = MsiGetComponentState(hpkg, "lepus", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - todo_wine - { - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); - } + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee;

1 0

Juan Lang : crypt32: Implement CertGetPublicKeyLength.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: 4f11b1af28abb2bf8089422cc935ea22b40586c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f11b1af28abb2bf8089422… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Sep 27 23:07:26 2006 -0700 crypt32: Implement CertGetPublicKeyLength. --- dlls/crypt32/cert.c | 39 +++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 2 + dlls/crypt32/tests/cert.c | 77 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b131f11..185f133 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -772,6 +772,45 @@ BOOL WINAPI CertComparePublicKeyInfo(DWO return ret; } +DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, + PCERT_PUBLIC_KEY_INFO pPublicKey) +{ + DWORD len = 0; + + TRACE("(%08lx, %p)\n", dwCertEncodingType, pPublicKey); + + if (dwCertEncodingType != X509_ASN_ENCODING) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return 0; + } + if (pPublicKey->Algorithm.pszObjId && + !strcmp(pPublicKey->Algorithm.pszObjId, szOID_RSA_DH)) + { + FIXME("unimplemented for DH public keys\n"); + SetLastError(CRYPT_E_ASN1_BADTAG); + } + else + { + DWORD size; + PBYTE buf; + BOOL ret = CryptDecodeObjectEx(dwCertEncodingType, + RSA_CSP_PUBLICKEYBLOB, pPublicKey->PublicKey.pbData, + pPublicKey->PublicKey.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, + &size); + + if (ret) + { + RSAPUBKEY *rsaPubKey = (RSAPUBKEY *)((LPBYTE)buf + + sizeof(BLOBHEADER)); + + len = rsaPubKey->bitlen; + LocalFree(buf); + } + } + return len; +} + typedef BOOL (*CertCompareFunc)(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara); diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index ab2c947..8da0dad 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -57,7 +57,7 @@ @ stdcall CertGetIssuerCertificateFromStore(long ptr ptr ptr) @ stdcall CertGetNameStringA(ptr long long ptr ptr long) @ stdcall CertGetNameStringW(ptr long long ptr ptr long) -@ stub CertGetPublicKeyLength +@ stdcall CertGetPublicKeyLength(long ptr) @ stdcall CertGetSubjectCertificateFromStore(ptr long ptr) @ stdcall CertGetValidUsages(long ptr ptr ptr ptr) @ stub CertIsRDNAttrsInCertificateName diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index f1bec9f..398ef15 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1903,6 +1903,82 @@ static void testAcquireCertPrivateKey(vo CertFreeCertificateContext(cert); } +static void testGetPublicKeyLength(void) +{ + static char oid_rsa_rsa[] = szOID_RSA_RSA; + static char oid_rsa_dh[] = szOID_RSA_DH; + static char bogusOID[] = "1.2.3"; + DWORD ret; + CERT_PUBLIC_KEY_INFO info = { { 0 } }; + BYTE bogusKey[] = { 1, 2, 3, 4, 5, 6, 7, 8 }; + BYTE key[] = { 0x30,0x0f,0x02,0x08,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, + 0x02,0x03,0x01,0x00,0x01 }; + + /* Crashes + ret = CertGetPublicKeyLength(0, NULL); + */ + /* With an empty public key info */ + SetLastError(0xdeadbeef); + ret = CertGetPublicKeyLength(0, &info); + ok(ret == 0 && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected length 0 and ERROR_FILE_NOT_FOUND, got length %ld, %08lx\n", + ret, GetLastError()); + SetLastError(0xdeadbeef); + ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); + ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_EOD, + "Expected length 0 and CRYPT_E_ASN1_EOD, got length %ld, %08lx\n", + ret, GetLastError()); + /* With a nearly-empty public key info */ + info.Algorithm.pszObjId = oid_rsa_rsa; + SetLastError(0xdeadbeef); + ret = CertGetPublicKeyLength(0, &info); + ok(ret == 0 && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected length 0 and ERROR_FILE_NOT_FOUND, got length %ld, %08lx\n", + ret, GetLastError()); + SetLastError(0xdeadbeef); + ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); + ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_EOD, + "Expected length 0 and CRYPT_E_ASN1_EOD, got length %ld, %08lx\n", + ret, GetLastError()); + /* With a bogus key */ + info.PublicKey.cbData = sizeof(bogusKey); + info.PublicKey.pbData = bogusKey; + SetLastError(0xdeadbeef); + ret = CertGetPublicKeyLength(0, &info); + ok(ret == 0 && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected length 0 and ERROR_FILE_NOT_FOUND, got length %ld, %08lx\n", + ret, GetLastError()); + SetLastError(0xdeadbeef); + ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); + ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected length 0 and CRYPT_E_ASN1_BADTAGTAG, got length %ld, %08lx\n", + ret, GetLastError()); + /* With a believable RSA key but a bogus OID */ + info.Algorithm.pszObjId = bogusOID; + info.PublicKey.cbData = sizeof(key); + info.PublicKey.pbData = key; + SetLastError(0xdeadbeef); + ret = CertGetPublicKeyLength(0, &info); + ok(ret == 0 && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected length 0 and ERROR_FILE_NOT_FOUND, got length %ld, %08lx\n", + ret, GetLastError()); + SetLastError(0xdeadbeef); + ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); + ok(ret == 56, "Expected length 56, got %ld\n", ret); + /* An RSA key with the DH OID */ + info.Algorithm.pszObjId = oid_rsa_dh; + SetLastError(0xdeadbeef); + ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); + ok(ret == 0 && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected length 0 and CRYPT_E_ASN1_BADTAG, got length %ld, %08lx\n", + ret, GetLastError()); + /* With the RSA OID */ + info.Algorithm.pszObjId = oid_rsa_rsa; + SetLastError(0xdeadbeef); + ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info); + ok(ret == 56, "Expected length 56, got %ld\n", ret); +} + START_TEST(cert) { init_function_pointers(); @@ -1925,4 +2001,5 @@ START_TEST(cert) testCompareCert(); testVerifySubjectCert(); testAcquireCertPrivateKey(); + testGetPublicKeyLength(); }

1 0

Dmitry Timoshkov : gdi32: Make GdiFont a proper C structure, with GdiFont* being a pointer.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: ddfba2b459597625c70bef084216377c3faa131e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ddfba2b459597625c70bef0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Sep 28 15:11:06 2006 +0900 gdi32: Make GdiFont a proper C structure, with GdiFont* being a pointer. --- dlls/gdi/freetype.c | 108 ++++++++++++++++++++++++------------------------ dlls/gdi/gdi_private.h | 32 +++++++------- 2 files changed, 70 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ddfba2b459597625c70…

1 0

Marcus Meissner : ntdll: Align stack to 4 bytes.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: 57a04062fee9a1939adc3955ba555830a533c4e7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57a04062fee9a1939adc395… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Sep 27 22:10:16 2006 +0200 ntdll: Align stack to 4 bytes. --- dlls/ntdll/signal_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9a8f197..21d4d24 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -521,7 +521,7 @@ typedef void (WINAPI *raise_func)( EXCEP */ inline static void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *gs ) { - void *stack = (void *)ESP_sig(sigcontext); + void *stack = (void *)(ESP_sig(sigcontext) & ~3); TEB *teb = get_current_teb(); struct ntdll_thread_regs *thread_regs = (struct ntdll_thread_regs *)teb->SpareBytes1;

1 0

Detlef Riekenberg : localspl: Start implementation of InitializePrintMonitor.
by Alexandre Julliard 28 Sep '06

28 Sep '06

Module: wine Branch: master Commit: 26c5839d61de888882a6732c2f1fc41fd2a5aeff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26c5839d61de888882a6732… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Sep 27 23:22:33 2006 +0200 localspl: Start implementation of InitializePrintMonitor. --- dlls/localspl/Makefile.in | 1 + dlls/localspl/localmon.c | 70 +++++++++++++++++++++++++++++++++++++++++ dlls/localspl/localspl_main.c | 11 ------ 3 files changed, 71 insertions(+), 11 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 7d80fb7..0e74179 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -6,6 +6,7 @@ MODULE = localspl.dll IMPORTS = kernel32 C_SRCS = \ + localmon.c \ localspl_main.c @MAKE_DLL_RULES@ diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c new file mode 100644 index 0000000..6665585 --- /dev/null +++ b/dlls/localspl/localmon.c @@ -0,0 +1,70 @@ +/* + * Implementation of the Local Printmonitor + * + * Copyright 2006 Detlef Riekenberg + * + * 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 <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "winver.h" +#include "winnls.h" + +#include "winspool.h" +#include "ddk/winsplp.h" + +#include "wine/unicode.h" +#include "wine/debug.h" + + +WINE_DEFAULT_DEBUG_CHANNEL(localspl); + +/***************************************************** + * InitializePrintMonitor (LOCALSPL.@) + * + * Initialize the Monitor for the Local Ports + * + * PARAMS + * regroot [I] Registry-Path, where the settings are stored + * + * RETURNS + * Success: Pointer to a MONITOREX Structure + * Failure: NULL + * + * NOTES + * Native localspl.dll fails, when the Section "Ports" is missing in "win.ini". + * + */ + +LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) +{ + FIXME("(%s) stub\n", debugstr_w(regroot)); + if (!regroot || !regroot[0]) { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 0bc94f6..48d1efb 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -58,14 +58,3 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, } return TRUE; } - - -/***************************************************** - * InitializePrintMonitor (LOCALSPL.@) - */ - -LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) -{ - FIXME("(%s) stub\n", debugstr_w(regroot)); - return NULL; -}

1 0

← Newer
1
2
3
4
5
6
7
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2006