May 2007 - Wine-commits - list.winehq.org

Rob Shearman : setupapi: Partially implement SetupQueryInfOriginalFileInformationW.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: c572ddb40c461d9f945e33169493ef82ce11ab6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c572ddb40c461d9f945e33169… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 3 22:41:04 2007 +0100 setupapi: Partially implement SetupQueryInfOriginalFileInformationW. Implement SetupQueryInfOriginalFileInformationA on top of SetupQueryInfOriginalFileInformationW. --- dlls/setupapi/query.c | 52 +++++++++++++++++++++++++++++++++++++++++-- dlls/setupapi/tests/misc.c | 38 ++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index a580b92..1961375 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -616,9 +616,31 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationA( PSP_ALTPLATFORM_INFO AlternativePlatformInfo, PSP_ORIGINAL_FILE_INFO_A OriginalFileInfo) { - FIXME("(%p, %d, %p, %p): stub\n", InfInformation, InfIndex, + BOOL ret; + SP_ORIGINAL_FILE_INFO_W OriginalFileInfoW; + + TRACE("(%p, %d, %p, %p)\n", InfInformation, InfIndex, AlternativePlatformInfo, OriginalFileInfo); - return FALSE; + + if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) + { + ERR("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize); + SetLastError( ERROR_INVALID_USER_BUFFER ); + return FALSE; + } + + OriginalFileInfoW.cbSize = sizeof(OriginalFileInfoW); + ret = SetupQueryInfOriginalFileInformationW(InfInformation, InfIndex, + AlternativePlatformInfo, &OriginalFileInfoW); + if (ret) + { + WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalInfName, MAX_PATH, + OriginalFileInfo->OriginalInfName, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalCatalogName, MAX_PATH, + OriginalFileInfo->OriginalCatalogName, MAX_PATH, NULL, NULL); + } + + return ret; } /*********************************************************************** @@ -629,7 +651,31 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW( PSP_ALTPLATFORM_INFO AlternativePlatformInfo, PSP_ORIGINAL_FILE_INFO_W OriginalFileInfo) { + LPCWSTR inf_name; + FIXME("(%p, %d, %p, %p): stub\n", InfInformation, InfIndex, AlternativePlatformInfo, OriginalFileInfo); - return FALSE; + + if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) + { + ERR("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize); + return ERROR_INVALID_USER_BUFFER; + } + + /* FIXME: we should get OriginalCatalogName from CatalogFile line in + * the original inf file and cache it, but that would require building a + * .pnf file. */ + OriginalFileInfo->OriginalCatalogName[0] = '\0'; + + /* FIXME: not quite correct as we just return the same file name as + * destination (copied) inf file, not the source (original) inf file. + * to fix it properly would require building a .pnf file */ + /* file name is stored in VersionData field of InfInformation */ + inf_name = strrchrW((LPWSTR)&InfInformation->VersionData[0], '\\'); + if (inf_name) inf_name++; + else inf_name = (LPWSTR)&InfInformation->VersionData[0]; + + strcpyW(OriginalFileInfo->OriginalInfName, inf_name); + + return TRUE; } diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index e6beba5..84b1ce1 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -103,6 +103,42 @@ static BOOL check_format(LPSTR path, LPSTR inf) return (!inf) ? res : res && (inf == path + lstrlen(check) - 3); } +static void test_original_file_name(LPCSTR original, LPCSTR dest) +{ + HINF hinf; + PSP_INF_INFORMATION pspii; + SP_ORIGINAL_FILE_INFO spofi; + BOOL res; + DWORD size; + + hinf = SetupOpenInfFileA(dest, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != NULL, "SetupOpenInfFileA failed with error %d\n", GetLastError()); + + res = SetupGetInfInformation(hinf, INFINFO_INF_SPEC_IS_HINF, NULL, 0, &size); + ok(res, "SetupGetInfInformation failed with error %d\n", GetLastError()); + + pspii = HeapAlloc(GetProcessHeap(), 0, size); + + res = SetupGetInfInformation(hinf, INFINFO_INF_SPEC_IS_HINF, pspii, size, NULL); + ok(res, "SetupGetInfInformation failed with error %d\n", GetLastError()); + + spofi.cbSize = 0; + res = SetupQueryInfOriginalFileInformationA(pspii, 0, NULL, &spofi); + ok(!res && GetLastError() == ERROR_INVALID_USER_BUFFER, + "SetupQueryInfOriginalFileInformationA should have failed with ERROR_INVALID_USER_BUFFER instead of %d\n", GetLastError()); + + spofi.cbSize = sizeof(spofi); + res = SetupQueryInfOriginalFileInformationA(pspii, 0, NULL, &spofi); + ok(res, "SetupQueryInfOriginalFileInformationA failed with error %d\n", GetLastError()); + ok(!spofi.OriginalCatalogName[0], "spofi.OriginalCatalogName should have been \"\" instead of \"%s\"\n", spofi.OriginalCatalogName); + todo_wine + ok(!strcmp(original, spofi.OriginalInfName), "spofi.OriginalInfName of %s didn't match real original name %s\n", spofi.OriginalInfName, original); + + HeapFree(GetProcessHeap(), 0, pspii); + + SetupCloseInfFile(hinf); +} + static void test_SetupCopyOEMInf(void) { CHAR toolong[MAX_PATH * 2]; @@ -233,6 +269,8 @@ static void test_SetupCopyOEMInf(void) ok(file_exists(path), "Expected source inf to exist\n"); ok(size == lstrlen(dest_save) + 1, "Expected size to be lstrlen(dest_save) + 1\n"); + test_original_file_name(strrchr(path, '\\') + 1, dest); + /* get the DestinationInfFileName, DestinationInfFileNameSize, and DestinationInfFileNameComponent */ SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, dest, MAX_PATH, &size, &inf);

1 0

Juan Lang : wincrypt.h: Add missing definitions.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: b7019a7a642d1de3a9a79f3ea3b6b11e72a3282b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7019a7a642d1de3a9a79f3ea… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu May 3 15:19:22 2007 -0700 wincrypt.h: Add missing definitions. --- include/wincrypt.h | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 224 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 90fc1c8..2219bd5 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1941,6 +1941,10 @@ static const WCHAR CERT_TRUST_PUB_AUTHENTICODE_FLAGS_VALUE_NAME[] = #define CERT_FILE_STORE_COMMIT_ENABLE_FLAG 0x00010000 +/* CertCloseStore dwFlags */ +#define CERT_CLOSE_STORE_FORCE_FLAG 0x00000001 +#define CERT_CLOSE_STORE_CHECK_FLAG 0x00000002 + /* dwAddDisposition */ #define CERT_STORE_ADD_NEW 1 #define CERT_STORE_ADD_USE_EXISTING 2 @@ -3004,6 +3008,183 @@ typedef struct _CERT_CHAIN_ENGINE_CONFIG DWORD CycleDetectionModulus; } CERT_CHAIN_ENGINE_CONFIG, *PCERT_CHAIN_ENGINE_CONFIG; +/* message-related definitions */ + +typedef BOOL (WINAPI *PFN_CMSG_STREAM_OUTPUT)(const void *pvArg, BYTE *pbData, + DWORD cbData, BOOL fFinal); + +#define CMSG_INDEFINITE_LENGTH 0xffffffff + +typedef struct _CMSG_STREAM_INFO +{ + DWORD cbContent; + PFN_CMSG_STREAM_OUTPUT pfnStreamOutput; + void *pvArg; +} CMSG_STREAM_INFO, *PCMSG_STREAM_INFO; + +typedef struct _CERT_ISSUER_SERIAL_NUMBER +{ + CERT_NAME_BLOB Issuer; + CRYPT_INTEGER_BLOB SerialNumber; +} CERT_ISSUER_SERIAL_NUMBER, *PCERT_ISSUER_SERIAL_NUMBER; + +typedef struct _CERT_ID +{ + DWORD dwIdChoice; + union { + CERT_ISSUER_SERIAL_NUMBER IssuerSerialNumber; + CRYPT_HASH_BLOB KeyId; + CRYPT_HASH_BLOB HashId; + } DUMMYUNIONNAME; +} CERT_ID, *PCERT_ID; + +#undef CMSG_DATA /* may be defined by sys/socket.h */ +#define CMSG_DATA 1 +#define CMSG_SIGNED 2 +#define CMSG_ENVELOPED 3 +#define CMSG_SIGNED_AND_ENVELOPED 4 +#define CMSG_HASHED 5 +#define CMSG_ENCRYPTED 6 + +#define CMSG_ALL_FLAGS ~0U +#define CMSG_DATA_FLAG (1 << CMSG_DATA) +#define CMSG_SIGNED_FLAG (1 << CMSG_SIGNED) +#define CMSG_ENVELOPED_FLAG (1 << CMSG_ENVELOPED) +#define CMSG_SIGNED_AND_ENVELOPED_FLAG (1 << CMSG_SIGNED_AND_ENVELOPED) +#define CMSG_ENCRYPTED_FLAG (1 << CMSG_ENCRYPTED) + +typedef struct _CMSG_SIGNER_ENCODE_INFO +{ + DWORD cbSize; + PCERT_INFO pCertInfo; + HCRYPTPROV hCryptProv; + DWORD dwKeySpec; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void *pvHashAuxInfo; + DWORD cAuthAttr; + PCRYPT_ATTRIBUTE rgAuthAttr; + DWORD cUnauthAttr; + PCRYPT_ATTRIBUTE rgUnauthAttr; + CERT_ID SignerId; + CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm; + void *pvHashEncryptionAuxInfo; +} CMSG_SIGNER_ENCODE_INFO, *PCMSG_SIGNER_ENCODE_INFO; + +typedef struct _CMSG_SIGNED_ENCODE_INFO +{ + DWORD cbSize; + DWORD cSigners; + PCMSG_SIGNER_ENCODE_INFO rgSigners; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; + DWORD cCrlEncoded; + PCRL_BLOB rgCrlEncoded; + DWORD cAttrCertEncoded; + PCERT_BLOB rgAttrCertEncoded; +} CMSG_SIGNED_ENCODE_INFO, *PCMSG_SIGNED_ENCODE_INFO; + +typedef struct _CMSG_ENVELOPED_ENCODE_INFO +{ + DWORD cbSize; + HCRYPTPROV hCryptProv; + CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; + void *pvEncryptionAuxInfo; + DWORD cRecipients; + PCERT_INFO *rgpRecipientCert; +} CMSG_ENVELOPED_ENCODE_INFO, *PCMSG_ENVELOPED_ENCODE_INFO; + +typedef struct _CMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO +{ + DWORD cbSize; + CMSG_SIGNED_ENCODE_INFO SignedInfo; + CMSG_ENVELOPED_ENCODE_INFO EnvelopedInfo; +} CMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO, + *PCMSG_SIGNED_AND_ENVELOPED_ENCODE_INFO; + +typedef struct _CMSG_HASHED_ENCODE_INFO +{ + DWORD cbSize; + HCRYPTPROV hCryptProv; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void *pvHashAuxInfo; +} CMSG_HASHED_ENCODE_INFO, *PCMSG_HASHED_ENCODE_INFO; + +typedef struct _CMSG_ENCRYPTED_ENCODE_INFO +{ + DWORD cbSize; + CRYPT_ALGORITHM_IDENTIFIER ContentEncryptionAlgorithm; + void *pvEncryptionAuxInfo; +} CMSG_ENCRYPTED_ENCODE_INFO, *PCMSG_ENCRYPTED_ENCODE_INFO; + +#define CMSG_BARE_CONTENT_FLAG 0x00000001 +#define CMSG_LENGTH_ONLY_FLAG 0x00000002 +#define CMSG_DETACHED_FLAG 0x00000004 +#define CMSG_AUTHENTICATED_ATTRIBUTES_FLAG 0x00000008 +#define CMSG_CONTENTS_OCTETS_FLAG 0x00000010 +#define CMSG_MAX_LENGTH_FLAG 0x00000020 + +#define CMSG_CTRL_VERIFY_SIGNATURE 1 +#define CMSG_CTRL_DECRYPT 2 +#define CMSG_CTRL_VERIFY_HASH 5 +#define CMSG_CTRL_ADD_SIGNER 6 +#define CMSG_CTRL_DEL_SIGNER 7 +#define CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR 8 +#define CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR 9 +#define CMSG_CTRL_ADD_CERT 10 +#define CMSG_CTRL_DEL_CERT 11 +#define CMSG_CTRL_ADD_CRL 12 +#define CMSG_CTRL_DEL_CRL 13 + +typedef struct _CMSG_CTRL_DECRYPT_PARA +{ + DWORD cbSize; + HCRYPTPROV hCryptProv; + DWORD dwKeySpec; + DWORD dwRecipientIndex; +} CMSG_CTRL_DECRYPT_PARA, *PCMSG_CTRL_DECRYPT_PARA; + +typedef struct _CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA +{ + DWORD cbSize; + DWORD dwSignerIndex; + CRYPT_DATA_BLOB blob; +} CMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA, + *PCMSG_CTRL_ADD_SIGNER_UNAUTH_ATTR_PARA; + +typedef struct _CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA +{ + DWORD cbSize; + DWORD dwSignerIndex; + DWORD dwUnauthAttrIndex; +} CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA, + *PCMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA; + +#define CMSG_TYPE_PARAM 1 +#define CMSG_CONTENT_PARAM 2 +#define CMSG_BARE_CONTENT_PARAM 3 +#define CMSG_INNER_CONTENT_PARAM 4 +#define CMSG_SIGNER_COUNT_PARAM 5 +#define CMSG_SIGNER_INFO_PARAM 6 +#define CMSG_SIGNER_CERT_INFO_PARAM 7 +#define CMSG_SIGNER_HASH_ALGORITHM_PARAM 8 +#define CMSG_SIGNER_AUTH_ATTR_PARAM 9 +#define CMSG_SIGNER_UNAUTH_ATTR_PARAM 10 +#define CMSG_CERT_COUNT_PARAM 11 +#define CMSG_CERT_PARAM 12 +#define CMSG_CRL_COUNT_PARAM 13 +#define CMSG_CRL_PARAM 14 +#define CMSG_ENVELOPE_ALGORITHM_PARAM 15 +#define CMSG_RECIPIENT_COUNT_PARAM 17 +#define CMSG_RECIPIENT_INDEX_PARAM 18 +#define CMSG_RECIPIENT_INFO_PARAM 19 +#define CMSG_HASH_ALGORITHM_PARAM 20 +#define CMSG_HASH_DATA_PARAM 21 +#define CMSG_COMPUTED_HASH_PARAM 22 +#define CMSG_ENCRYPT_PARAM 26 +#define CMSG_ENCRYPTED_DIGEST 27 +#define CMSG_ENCODED_SIGNER 28 +#define CMSG_ENCODED_MESSAGE 29 + /* function declarations */ /* advapi32.dll */ BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer, @@ -3509,6 +3690,49 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, LPCWSTR *ppszError); #define CertStrToName WINELIB_NAME_AW(CertStrToName) +DWORD WINAPI CryptMsgCalculateEncodedLength(DWORD dwMsgEncodingType, + DWORD dwFlags, DWORD dwMsgType, const void *pvMsgEncodeInfo, + LPSTR pszInnerContentObjID, DWORD cbData); + +BOOL WINAPI CryptMsgClose(HCRYPTMSG hCryptMsg); + +DWORD WINAPI CryptMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, + DWORD dwCtrlType, const void *pvCtrlPara); + +BOOL WINAPI CryptMsgCountersign(HCRYPTMSG hCryptMsg, DWORD dwIndex, + DWORD dwCountersigners, PCMSG_SIGNER_ENCODE_INFO rgCountersigners); + +BOOL WINAPI CryptMsgCountersignEncoded(DWORD dwEncodingType, PBYTE pbSignerInfo, + DWORD cbSignerInfo, DWORD cCountersigners, + PCMSG_SIGNER_ENCODE_INFO rgCountersigners, PBYTE pbCountersignature, + PDWORD pcbCountersignature); + +HCRYPTMSG WINAPI CryptMsgDuplicate(HCRYPTMSG hCryptMsg); + +BOOL WINAPI CryptMsgGetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData); + +HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, + DWORD dwMsgType, HCRYPTPROV hCryptProv, PCERT_INFO pRecipientInfo, + PCMSG_STREAM_INFO pStreamInfo); + +HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, + DWORD dwMsgType, const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, + PCMSG_STREAM_INFO pStreamInfo); + +HCRYPTMSG WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData, + DWORD cbData, BOOL fFinal); + +BOOL WINAPI CryptMsgVerifyCountersignatureEncoded(HCRYPTPROV hCryptProv, + DWORD dwEncodingType, PBYTE pbSignerInfo, DWORD cbSignerInfo, + PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature, + PCERT_INFO pciCountersigner); + +BOOL WINAPI CryptMsgVerifyCountersignatureEncodedEx(HCRYPTPROV hCryptProv, + DWORD dwEncodingType, PBYTE pbSignerInfo, DWORD cbSignerInfo, + PBYTE pbSignerInfoCountersignature, DWORD cbSignerInfoCountersignature, + DWORD dwSignerType, void *pvSigner, DWORD dwFlags, void *pvReserved); + BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara, BOOL fDetachedSignature, DWORD cToBeSigned, const BYTE *rgpbToBeSigned[], DWORD rgcbToBeSigned[], BYTE *pbSignedBlob, DWORD *pcbSignedBlob);

1 0

Alexandre Julliard : server: Infrastructure to return a wait handle for blocking ioctls.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: fd59e158a74dd399ecfdf95509fb3b52489e9bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd59e158a74dd399ecfdf9550… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 17:43:18 2007 +0200 server: Infrastructure to return a wait handle for blocking ioctls. --- dlls/ntdll/file.c | 11 +++++++++++ include/wine/server_protocol.h | 4 +++- server/fd.c | 12 +++++++----- server/file.h | 8 ++++---- server/named_pipe.c | 34 ++++++++++++++++------------------ server/protocol.def | 2 ++ server/trace.c | 2 ++ 7 files changed, 45 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd59e158a74dd399ecfdf…

1 0

Alexandre Julliard : server: Allocate the wait event for FSCTL_PIPE_LISTEN on the server side.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 63a2372526ff534c997d90a0933dcab834b599e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a2372526ff534c997d90a09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 17:44:05 2007 +0200 server: Allocate the wait event for FSCTL_PIPE_LISTEN on the server side. --- dlls/ntdll/file.c | 2 +- server/named_pipe.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index cb09e96..02a175b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1075,7 +1075,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!status) status = DIR_unmount_device( handle ); break; - case FSCTL_PIPE_LISTEN: case FSCTL_PIPE_WAIT: { HANDLE internal_event = 0; @@ -1173,6 +1172,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc status = STATUS_SUCCESS; break; + case FSCTL_PIPE_LISTEN: default: status = server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 9137bf6..a034436 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -570,11 +570,25 @@ static enum server_fd_type pipe_client_get_fd_type( struct fd *fd ) return FD_TYPE_PIPE; } +static obj_handle_t alloc_wait_event( struct process *process ) +{ + obj_handle_t handle = 0; + struct event *event = create_event( NULL, NULL, 0, 1, 0 ); + + if (event) + { + handle = alloc_handle( process, event, EVENT_ALL_ACCESS, 0 ); + release_object( event ); + } + return handle; +} + static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *async_data, const void *data, data_size_t size ) { struct pipe_server *server = get_fd_user( fd ); struct async *async; + obj_handle_t wait_handle = 0; switch(code) { @@ -583,12 +597,26 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a { case ps_idle_server: case ps_wait_connect: - set_server_state( server, ps_wait_open ); - if ((async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT, 0 ))) + if (!async_data->event && !async_data->apc) + { + async_data_t new_data = *async_data; + if (!(wait_handle = alloc_wait_event( current->process ))) break; + new_data.event = wait_handle; + if (!(async = fd_queue_async( server->ioctl_fd, &new_data, ASYNC_TYPE_WAIT, 0 ))) + { + close_handle( current->process, wait_handle ); + break; + } + } + else async = fd_queue_async( server->ioctl_fd, async_data, ASYNC_TYPE_WAIT, 0 ); + + if (async) { + set_server_state( server, ps_wait_open ); if (server->pipe->waiters) async_wake_up( server->pipe->waiters, STATUS_SUCCESS ); release_object( async ); set_error( STATUS_PENDING ); + return wait_handle; } break; case ps_connected_server:

1 0

Alexandre Julliard : server: Allocate the wait event for FSCTL_PIPE_WAIT on the server side.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 46fe7177c108bbb925047a7a4ec509cb323d3e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fe7177c108bbb925047a7a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 17:44:32 2007 +0200 server: Allocate the wait event for FSCTL_PIPE_WAIT on the server side. --- dlls/ntdll/file.c | 23 +---------------------- server/named_pipe.c | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 02a175b..c41d387 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1075,28 +1075,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!status) status = DIR_unmount_device( handle ); break; - case FSCTL_PIPE_WAIT: - { - HANDLE internal_event = 0; - - if(!event && !apc) - { - status = NtCreateEvent(&internal_event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); - if (status != STATUS_SUCCESS) break; - event = internal_event; - } - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); - - if (internal_event && status == STATUS_PENDING) - { - while (NtWaitForSingleObject(internal_event, TRUE, NULL) == STATUS_USER_APC) /*nothing*/ ; - status = io->u.Status; - } - if (internal_event) NtClose(internal_event); - } - break; - case FSCTL_PIPE_PEEK: { FILE_PIPE_PEEK_BUFFER *buffer = out_buffer; @@ -1173,6 +1151,7 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc break; case FSCTL_PIPE_LISTEN: + case FSCTL_PIPE_WAIT: default: status = server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); diff --git a/server/named_pipe.c b/server/named_pipe.c index a034436..6dba1f3 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -846,6 +846,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c case FSCTL_PIPE_WAIT: { const FILE_PIPE_WAIT_FOR_BUFFER *buffer = data; + obj_handle_t wait_handle = 0; struct named_pipe *pipe; struct pipe_server *server; struct unicode_str name; @@ -867,13 +868,22 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c { struct async *async; - if (!pipe->waiters && !(pipe->waiters = create_async_queue( NULL ))) + if (!pipe->waiters && !(pipe->waiters = create_async_queue( NULL ))) goto done; + + if (!async_data->event && !async_data->apc) { - release_object( pipe ); - return 0; + async_data_t new_data = *async_data; + if (!(wait_handle = alloc_wait_event( current->process ))) goto done; + new_data.event = wait_handle; + if (!(async = create_async( current, pipe->waiters, &new_data ))) + { + close_handle( current->process, wait_handle ); + wait_handle = 0; + } } + else async = create_async( current, pipe->waiters, async_data ); - if ((async = create_async( current, pipe->waiters, async_data ))) + if (async) { timeout_t when = buffer->TimeoutSpecified ? buffer->Timeout.QuadPart : pipe->timeout; async_set_timeout( async, when, STATUS_IO_TIMEOUT ); @@ -883,8 +893,9 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c } else release_object( server ); + done: release_object( pipe ); - return 0; + return wait_handle; } default:

1 0

Alexandre Julliard : Fix minor differences in the formatting of the license notices.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 69a88a9d4012bf9437758cb502562237413652b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a88a9d4012bf9437758cb50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 4 12:08:15 2007 +0200 Fix minor differences in the formatting of the license notices. --- dlls/comctl32/tests/trackbar.c | 6 +++++- dlls/cryptnet/cryptnet_main.c | 2 +- dlls/itss/chm_lib.c | 21 +++++++++++++++------ dlls/itss/chm_lib.h | 21 +++++++++++++++------ dlls/itss/lzx.c | 25 +++++++++++++++++-------- dlls/itss/lzx.h | 25 +++++++++++++++++-------- dlls/mshtml/hlink.c | 1 + dlls/msi/update.c | 2 +- dlls/rsaenh/des.c | 2 +- dlls/rsaenh/md2.c | 2 +- dlls/rsaenh/mpi.c | 2 +- dlls/rsaenh/rc2.c | 2 +- dlls/rsaenh/rc4.c | 2 +- dlls/rsaenh/rsa.c | 2 +- dlls/rsaenh/rsaenh.c | 2 +- dlls/rsaenh/tomcrypt.h | 2 +- dlls/shell32/cpanelfolder.c | 2 +- include/mapitags.h | 6 +++--- programs/oleview/details.c | 2 +- programs/oleview/pane.c | 2 +- programs/oleview/resource.h | 2 +- programs/oleview/tree.c | 2 +- tools/winedump/pdb.c | 2 +- 23 files changed, 89 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69a88a9d4012bf9437758…

1 0

Alexandre Julliard : Get rid of some empty source files, our makefiles no longer require them.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 60e122b088c55f59598c6eabe3e9336141d8eeb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e122b088c55f59598c6eabe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 4 12:27:34 2007 +0200 Get rid of some empty source files, our makefiles no longer require them. --- dlls/dplay/Makefile.in | 2 -- dlls/dplay/dplay_main.c | 1 - dlls/lz32/Makefile.in | 2 -- dlls/lz32/lzexpand_main.c | 1 - dlls/msdmo/Makefile.in | 3 +-- dlls/msdmo/msdmo_main.c | 1 - dlls/msvcrt40/Makefile.in | 2 -- dlls/msvcrt40/msvcrt40.c | 1 - dlls/shfolder/Makefile.in | 2 -- dlls/shfolder/shfolder_main.c | 1 - 10 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/dplay/Makefile.in b/dlls/dplay/Makefile.in index 50b3852..c1d0ad9 100644 --- a/dlls/dplay/Makefile.in +++ b/dlls/dplay/Makefile.in @@ -6,8 +6,6 @@ MODULE = dplay.dll IMPORTLIB = libdplay.$(IMPLIBEXT) IMPORTS = dplayx kernel32 -C_SRCS = dplay_main.c - RC_SRCS = version.rc @MAKE_DLL_RULES@ diff --git a/dlls/dplay/dplay_main.c b/dlls/dplay/dplay_main.c deleted file mode 100644 index 67a01ed..0000000 --- a/dlls/dplay/dplay_main.c +++ /dev/null @@ -1 +0,0 @@ -/* nothing here yet */ diff --git a/dlls/lz32/Makefile.in b/dlls/lz32/Makefile.in index e55d8ee..e50e8cd 100644 --- a/dlls/lz32/Makefile.in +++ b/dlls/lz32/Makefile.in @@ -6,8 +6,6 @@ MODULE = lz32.dll IMPORTLIB = liblz32.$(IMPLIBEXT) IMPORTS = kernel32 -C_SRCS = lzexpand_main.c - RC_SRCS = version.rc C_SRCS16 = lzexpand16.c diff --git a/dlls/lz32/lzexpand_main.c b/dlls/lz32/lzexpand_main.c deleted file mode 100644 index 355c97a..0000000 --- a/dlls/lz32/lzexpand_main.c +++ /dev/null @@ -1 +0,0 @@ -/* Nothing here - See lzexpand.c in kernel32 */ diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index 57addcf..a0b924e 100644 --- a/dlls/msdmo/Makefile.in +++ b/dlls/msdmo/Makefile.in @@ -9,8 +9,7 @@ EXTRALIBS = -luuid C_SRCS = \ dmoreg.c \ - dmort.c \ - msdmo_main.c + dmort.c RC_SRCS = \ rsrc.rc diff --git a/dlls/msdmo/msdmo_main.c b/dlls/msdmo/msdmo_main.c deleted file mode 100644 index 67a01ed..0000000 --- a/dlls/msdmo/msdmo_main.c +++ /dev/null @@ -1 +0,0 @@ -/* nothing here yet */ diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index 4494572..6f33b83 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -7,8 +7,6 @@ MODULE = msvcrt40.dll IMPORTLIB = libmsvcrt40.$(IMPLIBEXT) IMPORTS = msvcrt kernel32 -C_SRCS = msvcrt40.c - @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msvcrt40/msvcrt40.c b/dlls/msvcrt40/msvcrt40.c deleted file mode 100644 index 67a01ed..0000000 --- a/dlls/msvcrt40/msvcrt40.c +++ /dev/null @@ -1 +0,0 @@ -/* nothing here yet */ diff --git a/dlls/shfolder/Makefile.in b/dlls/shfolder/Makefile.in index db0da14..826157d 100644 --- a/dlls/shfolder/Makefile.in +++ b/dlls/shfolder/Makefile.in @@ -6,8 +6,6 @@ MODULE = shfolder.dll IMPORTLIB = libshfolder.$(IMPLIBEXT) IMPORTS = shell32 kernel32 -C_SRCS = shfolder_main.c - RC_SRCS = version.rc @MAKE_DLL_RULES@ diff --git a/dlls/shfolder/shfolder_main.c b/dlls/shfolder/shfolder_main.c deleted file mode 100644 index 67a01ed..0000000 --- a/dlls/shfolder/shfolder_main.c +++ /dev/null @@ -1 +0,0 @@ -/* nothing here yet */

1 0

Konstantin Kondratyuk : ntdll: Correct a copy/paste mistake in NtWriteFile.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: e84d2702524659094adce591d94a4eb87c3cffdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84d2702524659094adce591d… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Thu May 3 15:14:25 2007 +0400 ntdll: Correct a copy/paste mistake in NtWriteFile. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c41d387..6912350 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -881,7 +881,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, timeout = get_next_io_timeout( &timeouts, total ); pfd.fd = unix_handle; - pfd.events = POLLIN; + pfd.events = POLLOUT; if (!timeout || !(ret = poll( &pfd, 1, timeout ))) {

1 0

Alexandre Julliard : server: Store valid file options in pseudo file descriptors.
by Alexandre Julliard 04 May '07

04 May '07

Module: wine Branch: master Commit: 017480d4e29228dd169f14c31815daee991e3e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=017480d4e29228dd169f14c31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 16:07:30 2007 +0200 server: Store valid file options in pseudo file descriptors. --- server/fd.c | 3 ++- server/file.h | 3 ++- server/mailslot.c | 2 +- server/named_pipe.c | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/fd.c b/server/fd.c index 4ad4da5..c4a0288 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1409,7 +1409,7 @@ static struct fd *alloc_fd_object(void) } /* allocate a pseudo fd object, for objects that need to behave like files but don't have a unix fd */ -struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user ) +struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user, unsigned int options ) { struct fd *fd = alloc_object( &fd_ops ); @@ -1420,6 +1420,7 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use fd->inode = NULL; fd->closed = NULL; fd->access = 0; + fd->options = options; fd->sharing = 0; fd->unix_fd = -1; fd->signaled = 0; diff --git a/server/file.h b/server/file.h index 09c90c3..df5988d 100644 --- a/server/file.h +++ b/server/file.h @@ -52,7 +52,8 @@ struct fd_ops /* file descriptor functions */ -extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user ); +extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user, + unsigned int options ); extern void set_no_fd_status( struct fd *fd, unsigned int status ); extern struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int access, unsigned int sharing, unsigned int options ); diff --git a/server/mailslot.c b/server/mailslot.c index 8bcb723..fd50080 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -359,7 +359,7 @@ void create_mailslot_device( struct directory *root, const struct unicode_str *n get_error() != STATUS_OBJECT_NAME_EXISTS) { dev->mailslots = NULL; - if (!(dev->fd = alloc_pseudo_fd( &mailslot_device_fd_ops, &dev->obj )) || + if (!(dev->fd = alloc_pseudo_fd( &mailslot_device_fd_ops, &dev->obj, 0 )) || !(dev->mailslots = create_namespace( 7 ))) { release_object( dev ); diff --git a/server/named_pipe.c b/server/named_pipe.c index f2c7947..801b4d7 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -480,7 +480,7 @@ void create_named_pipe_device( struct directory *root, const struct unicode_str get_error() != STATUS_OBJECT_NAME_EXISTS) { dev->pipes = NULL; - if (!(dev->fd = alloc_pseudo_fd( &named_pipe_device_fd_ops, &dev->obj )) || + if (!(dev->fd = alloc_pseudo_fd( &named_pipe_device_fd_ops, &dev->obj, 0 )) || !(dev->pipes = create_namespace( 7 ))) { release_object( dev ); @@ -709,7 +709,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned list_add_head( &pipe->servers, &server->entry ); grab_object( pipe ); - if (!(server->ioctl_fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->obj ))) + if (!(server->ioctl_fd = alloc_pseudo_fd( &pipe_server_fd_ops, &server->obj, options ))) { release_object( server ); server = NULL;

1 0

Andrey Turkin : hhctrl.ocx: Recognize and use topic specification in url or in data.
by Alexandre Julliard 03 May '07

03 May '07

Module: wine Branch: master Commit: 8ecd3465d9ee23d1be04ea3ce5d010f51500df90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ecd3465d9ee23d1be04ea3ce… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed May 2 20:16:59 2007 +0400 hhctrl.ocx: Recognize and use topic specification in url or in data. --- dlls/hhctrl.ocx/hhctrl.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 958edf9..b687a83 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -100,16 +100,34 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: case HH_DISPLAY_SEARCH:{ + static const WCHAR delimW[] = {':',':',0}; HHInfo *info; BOOL res; + WCHAR chm_file[MAX_PATH]; + const WCHAR *index; FIXME("Not all HH cases handled correctly\n"); + index = strstrW(filename, delimW); + if (index) + { + memcpy(chm_file, filename, (index-filename)*sizeof(WCHAR)); + chm_file[index-filename] = 0; + filename = chm_file; + } + else + { + if (command!=HH_DISPLAY_SEARCH) /* FIXME - use HH_FTS_QUERYW structure in data */ + index = (const WCHAR*)data; + } + info = CreateHelpViewer(filename); if (info) { - res = NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszFile); + if (!index) + index = info->WinType.pszFile; + res = NavigateToChm(info, info->pCHMInfo->szFile, index); if(!res) ReleaseHelpViewer(info); }

1 0