wine-commits November 2007

wine-commits@winehq.org

3 participants
757 discussions

Vijay Kiran Kamuju : include: Add missing definitions for DSS in wincrypt.h .
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: c2f069776352599d4dc088a5a85dc3e71090bd05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f069776352599d4dc088a5a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Nov 21 15:19:41 2007 -0600 include: Add missing definitions for DSS in wincrypt.h. --- include/wincrypt.h | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index aa6ae2e..e7ea279 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1,6 +1,7 @@ /* * Copyright (C) 2002 Travis Michielsen * Copyright (C) 2004-2005 Juan Lang + * Copyright (C) 2007 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -134,6 +135,53 @@ typedef struct _RSAPUBKEY { DWORD pubexp; } RSAPUBKEY; +typedef struct _PUBKEY { + DWORD magic; + DWORD bitlen; +} DHPUBKEY, DSSPUBKEY, KEAPUBKEY, TEKPUBKEY; + +typedef struct _DSSSEED { + DWORD counter; + BYTE seed[20]; +} DSSSEED; + +typedef struct _PUBKEYVER3 { + DWORD magic; + DWORD bitlenP; + DWORD bitlenQ; + DWORD bitlenJ; + DSSSEED DSSSeed; +} DHPUBKEY_VER3, DSSPUBKEY_VER3; + +typedef struct _PRIVKEYVER3 { + DWORD magic; + DWORD bitlenP; + DWORD bitlenQ; + DWORD bitlenJ; + DWORD bitlenX; + DSSSEED DSSSeed; +} DHPRIVKEY_VER3, DSSPRIVKEY_VER3; + +typedef struct _KEY_TYPE_SUBTYPE { + DWORD dwKeySpec; + GUID Type; + GUID SubType; +} KEY_TYPE_SUBTYPE, *PKEY_TYPE_SUBTYPE; + +typedef struct _CERT_FORTEZZA_DATA_PROP { + unsigned char SerialNumber[8]; + int CertIndex; + unsigned char CertLabel[36]; +} CERT_FORTEZZA_DATA_PROP; + +typedef struct _CMS_DH_KEY_INFO { + DWORD dwVersion; + ALG_ID Algid; + LPSTR pszContentEncObjId; + CRYPT_DATA_BLOB PubInfo; + void *pReserved; +} CMS_DH_KEY_INFO, *PCMS_DH_KEY_INFO; + typedef struct _CRYPT_BIT_BLOB { DWORD cbData; BYTE *pbData; @@ -561,6 +609,75 @@ typedef struct _CRL_CONTEXT { } CRL_CONTEXT, *PCRL_CONTEXT; typedef const CRL_CONTEXT *PCCRL_CONTEXT; +#define SORTED_CTL_EXT_FLAGS_OFFSET (0*4) +#define SORTED_CTL_EXT_COUNT_OFFSET (1*4) +#define SORTED_CTL_EXT_MAX_COLLISION_OFFSET (2*4) +#define SORTED_CTL_EXT_HASH_BUCKET_OFFSET (3*4) + +#define SORTED_CTL_EXT_HASHED_SUBJECT_IDENTIFIER_FLAG 0x1 + +typedef struct _CERT_DSS_PARAMETERS { + CRYPT_UINT_BLOB p; + CRYPT_UINT_BLOB q; + CRYPT_UINT_BLOB g; +} CERT_DSS_PARAMETERS, *PCERT_DSS_PARAMETERS; + +#define CERT_DSS_R_LEN 20 +#define CERT_DSS_S_LEN 20 +#define CERT_DSS_SIGNATURE_LEN (CERT_DSS_R_LEN + CERT_DSS_S_LEN) + +#define CERT_MAX_ENCODED_DSS_SIGNATURE_LEN (2 + 2*(2 + 20 +1)) + +typedef struct _CERT_DH_PARAMETERS { + CRYPT_UINT_BLOB p; + CRYPT_UINT_BLOB g; +} CERT_DH_PARAMETERS, *PCERT_DH_PARAMETERS; + +typedef struct _CERT_X942_DH_VALIDATION_PARAMS { + CRYPT_BIT_BLOB seed; + DWORD pgenCounter; +} CERT_X942_DH_VALIDATION_PARAMS, *PCERT_X942_DH_VALIDATION_PARAMS; + +typedef struct _CERT_X942_DH_PARAMETERS { + CRYPT_UINT_BLOB p; + CRYPT_UINT_BLOB g; + CRYPT_UINT_BLOB q; + CRYPT_UINT_BLOB j; + PCERT_X942_DH_VALIDATION_PARAMS pValidationParams; +} CERT_X942_DH_PARAMETERS, *PCERT_X942_DH_PARAMETERS; + +#define CRYPT_X942_COUNTER_BYTE_LENGTH 4 +#define CRYPT_X942_KEY_LENGTH_BYTE_LENGTH 4 +#define CRYPT_X942_PUB_INFO_BYTE_LENGTH (512/8) + +typedef struct _CRYPT_X942_OTHER_INFO { + LPSTR pszContentEncryptionObjId; + BYTE rgbCounter[CRYPT_X942_COUNTER_BYTE_LENGTH]; + BYTE rgbKeyLength[CRYPT_X942_KEY_LENGTH_BYTE_LENGTH]; + CRYPT_DATA_BLOB PubInfo; +} CRYPT_X942_OTHER_INFO, *PCRYPT_X942_OTHER_INFO; + +typedef struct _CRYPT_RC2_CBC_PARAMETERS { + DWORD dwVersion; + BOOL fIV; + BYTE rgbIV[4]; +} CRYPT_RC2_CBC_PARAMETERS, *PCRYPT_RC2_CBC_PARAMETERS; + +#define CRYPT_RC2_40BIT_VERSION 160 +#define CRYPT_RC2_56BIT_VERSION 52 +#define CRYPT_RC2_64BIT_VERSION 120 +#define CRYPT_RC2_128BIT_VERSION 58 + +typedef struct _CRYPT_SMIME_CAPABILITY { + LPSTR pszObjId; + CRYPT_OBJID_BLOB Parameters; +} CRYPT_SMIME_CAPABILITY, *PCRYPT_SMIME_CAPABILITY; + +typedef struct _CRYPT_SMIME_CAPABILITIES { + DWORD cCapability; + CRYPT_SMIME_CAPABILITY rgCapability; +} CRYPT_SMIME_CAPABILITIES, *PCRYPT_SMIME_CAPABILITIES; + typedef struct _VTableProvStruc { DWORD Version; FARPROC pFuncVerifyImage; @@ -1804,6 +1921,14 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s' #define KP_KEYEXCHANGE_PIN 32 #define KP_SIGNATURE_PIN 33 #define KP_PREHASH 34 +#define KP_ROUNDS 35 +#define KP_OAEP_PARAMS 36 +#define KP_CMS_KEY_INFO 37 +#define KP_CMS_DH_KEY_INFO 38 +#define KP_PUB_PARAMS 39 +#define KP_VERIFY_PARAMS 40 +#define KP_HIGHEST_VERSION 41 +#define KP_GET_USE_COUNT 42 /* CryptSignHash/CryptVerifySignature */ #define CRYPT_NOHASHOID 0x00000001

1 0

Marcus Meissner : shell32: GetModuleFileNameW gets number of WCHARs not bytes.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 08aa50ec2b5042c7d99fbf7fa33e312d199b50dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=08aa50ec2b5042c7d99fbf7fa… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Nov 22 08:24:17 2007 +0100 shell32: GetModuleFileNameW gets number of WCHARs not bytes. --- dlls/shell32/shell32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 63f81f3..0b7a8f3 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -101,7 +101,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) argv=GlobalLock(hargv); for (;;) { - len = GetModuleFileNameW(0, (LPWSTR)(argv+1), size-sizeof(LPWSTR)); + len = GetModuleFileNameW(0, (LPWSTR)(argv+1), (size-sizeof(LPWSTR))/sizeof(WCHAR)); if (!len) { GlobalFree(hargv);

1 0

Gerald Pfeifer : ntdll: Fix computation in enumerate_key().
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 15f8b80ba7ac0fba9fe94b46c1c4f63308ab75e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f8b80ba7ac0fba9fe94b46c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 22 21:41:29 2007 +0100 ntdll: Fix computation in enumerate_key(). --- dlls/ntdll/reg.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 85297e3..8b724ec 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -271,8 +271,16 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i fixed_size = (char *)keyinfo.Name - (char *)&keyinfo; keyinfo.LastWriteTime = modif; keyinfo.TitleIndex = 0; - keyinfo.ClassLength = max( 0, wine_server_reply_size(reply) - reply->namelen ); - keyinfo.ClassOffset = keyinfo.ClassLength ? fixed_size + reply->namelen : -1; + if (reply->namelen < wine_server_reply_size(reply)) + { + keyinfo.ClassLength = wine_server_reply_size(reply) - reply->namelen; + keyinfo.ClassOffset = fixed_size + reply->namelen; + } + else + { + keyinfo.ClassLength = 0; + keyinfo.ClassOffset = -1; + } keyinfo.NameLength = reply->namelen; memcpy( info, &keyinfo, min( length, fixed_size ) ); }

1 0

Gerald Pfeifer : inetcomm: Fix error check in InternetTransport_Connect().
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 173a8bb22431bf9340b7419de9b8b6615e8e180d URL: http://source.winehq.org/git/wine.git/?a=commit;h=173a8bb22431bf9340b7419de… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Nov 23 20:57:58 2007 +0100 inetcomm: Fix error check in InternetTransport_Connect(). --- dlls/inetcomm/internettransport.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/internettransport.c b/dlls/inetcomm/internettransport.c index a056201..19fed54 100644 --- a/dlls/inetcomm/internettransport.c +++ b/dlls/inetcomm/internettransport.c @@ -110,6 +110,8 @@ HRESULT InternetTransport_Connect(InternetTransport *This, for (ai_cur = ai; ai_cur; ai_cur = ai->ai_next) { + int so; + if (TRACE_ON(inetcomm)) { char host[256]; @@ -122,12 +124,13 @@ HRESULT InternetTransport_Connect(InternetTransport *This, InternetTransport_ChangeStatus(This, IXP_CONNECTING); - This->Socket = socket(ai_cur->ai_family, ai_cur->ai_socktype, ai_cur->ai_protocol); - if (This->Socket < 0) + so = socket(ai_cur->ai_family, ai_cur->ai_socktype, ai_cur->ai_protocol); + if (so == -1) { WARN("socket() failed\n"); continue; } + This->Socket = so; /* FIXME: set to async */

1 0

Gerald Pfeifer : wined3d: Rewrite condition in vshader_program_add_param() to actually distinguish between two cases.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 7670393508c6bd1c907cdda43419b4cf3dac7838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7670393508c6bd1c907cdda43… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 22 22:42:51 2007 +0100 wined3d: Rewrite condition in vshader_program_add_param() to actually distinguish between two cases. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4a08f70..b044f31 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -468,7 +468,7 @@ static void vshader_program_add_param(SHADER_OPCODE_ARG *arg, const DWORD param, break; case WINED3DSPR_CONST: if(param & WINED3DSHADER_ADDRMODE_RELATIVE) { - if(reg - This->rel_offset >= 0) { + if(reg >= This->rel_offset) { sprintf(tmpReg, "C[A0.x + %u]", reg - This->rel_offset); } else { sprintf(tmpReg, "C[A0.x - %u]", -reg + This->rel_offset);

1 0

Gerald Pfeifer : itss: Avoid checking an unsigned value for < 0.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: b1c951b60d0f647625b772005dfd132834581276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c951b60d0f647625b772005… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 22 22:36:13 2007 +0100 itss: Avoid checking an unsigned value for < 0. --- dlls/itss/chm_lib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index 67954ac..c41c423 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -1326,7 +1326,7 @@ LONGINT64 chm_retrieve_object(struct chmFile *h, return (Int64)0; /* starting address must be in correct range */ - if (addr < 0 || addr >= ui->length) + if (addr >= ui->length) return (Int64)0; /* clip length */

1 0

Gerald Pfeifer : winedos: Use DWORD instead of long for return values of SetFilePointer.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 6b7957f4db1cd9557c5046ca4c94aacbce21b598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b7957f4db1cd9557c5046ca4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 22 16:48:12 2007 +0100 winedos: Use DWORD instead of long for return values of SetFilePointer. Adjust type of loop variable in INT21_Ioctl_Char(). --- dlls/winedos/int21.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 7e080e0..75aeb1c 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -1385,7 +1385,7 @@ static void INT21_SequentialReadFromFCB( CONTEXT86 *context ) struct XFCB *xfcb; HANDLE handle; DWORD record_number; - long position; + DWORD position; BYTE *disk_transfer_area; UINT bytes_read; BYTE AL_result; @@ -1405,7 +1405,7 @@ static void INT21_SequentialReadFromFCB( CONTEXT86 *context ) record_number = 128 * fcb->current_block_number + fcb->record_within_current_block; position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0); if (position != record_number * fcb->logical_record_size) { - TRACE("seek(%d, %d, 0) failed with %ld\n", + TRACE("seek(%d, %d, 0) failed with %u\n", fcb->file_number, record_number * fcb->logical_record_size, position); AL_result = 0x01; /* end of file, no data read */ } else { @@ -1421,7 +1421,7 @@ static void INT21_SequentialReadFromFCB( CONTEXT86 *context ) AL_result = 0x03; /* end of file, partial record read */ } /* if */ } else { - TRACE("successful read %d bytes from record %d (position %ld) of file %d (handle %p)\n", + TRACE("successful read %d bytes from record %d (position %u) of file %d (handle %p)\n", bytes_read, record_number, position, fcb->file_number, handle); AL_result = 0x00; /* successful */ } /* if */ @@ -1465,7 +1465,7 @@ static void INT21_SequentialWriteToFCB( CONTEXT86 *context ) struct XFCB *xfcb; HANDLE handle; DWORD record_number; - long position; + DWORD position; BYTE *disk_transfer_area; UINT bytes_written; BYTE AL_result; @@ -1485,7 +1485,7 @@ static void INT21_SequentialWriteToFCB( CONTEXT86 *context ) record_number = 128 * fcb->current_block_number + fcb->record_within_current_block; position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0); if (position != record_number * fcb->logical_record_size) { - TRACE("seek(%d, %d, 0) failed with %ld\n", + TRACE("seek(%d, %d, 0) failed with %u\n", fcb->file_number, record_number * fcb->logical_record_size, position); AL_result = 0x01; /* disk full */ } else { @@ -1496,7 +1496,7 @@ static void INT21_SequentialWriteToFCB( CONTEXT86 *context ) fcb->file_number, disk_transfer_area, fcb->logical_record_size, bytes_written); AL_result = 0x01; /* disk full */ } else { - TRACE("successful written %d bytes from record %d (position %ld) of file %d (handle %p)\n", + TRACE("successful written %d bytes from record %d (position %u) of file %d (handle %p)\n", bytes_written, record_number, position, fcb->file_number, handle); AL_result = 0x00; /* successful */ } /* if */ @@ -1541,7 +1541,7 @@ static void INT21_ReadRandomRecordFromFCB( CONTEXT86 *context ) struct XFCB *xfcb; HANDLE handle; DWORD record_number; - long position; + DWORD position; BYTE *disk_transfer_area; UINT bytes_read; BYTE AL_result; @@ -1561,7 +1561,7 @@ static void INT21_ReadRandomRecordFromFCB( CONTEXT86 *context ) } else { position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0); if (position != record_number * fcb->logical_record_size) { - TRACE("seek(%d, %d, 0) failed with %ld\n", + TRACE("seek(%d, %d, 0) failed with %u\n", fcb->file_number, record_number * fcb->logical_record_size, position); AL_result = 0x01; /* end of file, no data read */ } else { @@ -1577,7 +1577,7 @@ static void INT21_ReadRandomRecordFromFCB( CONTEXT86 *context ) AL_result = 0x03; /* end of file, partial record read */ } /* if */ } else { - TRACE("successful read %d bytes from record %d (position %ld) of file %d (handle %p)\n", + TRACE("successful read %d bytes from record %d (position %u) of file %d (handle %p)\n", bytes_read, record_number, position, fcb->file_number, handle); AL_result = 0x00; /* successful */ } /* if */ @@ -1614,7 +1614,7 @@ static void INT21_WriteRandomRecordToFCB( CONTEXT86 *context ) struct XFCB *xfcb; HANDLE handle; DWORD record_number; - long position; + DWORD position; BYTE *disk_transfer_area; UINT bytes_written; BYTE AL_result; @@ -1634,7 +1634,7 @@ static void INT21_WriteRandomRecordToFCB( CONTEXT86 *context ) } else { position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0); if (position != record_number * fcb->logical_record_size) { - TRACE("seek(%d, %d, 0) failed with %ld\n", + TRACE("seek(%d, %d, 0) failed with %u\n", fcb->file_number, record_number * fcb->logical_record_size, position); AL_result = 0x01; /* disk full */ } else { @@ -1645,7 +1645,7 @@ static void INT21_WriteRandomRecordToFCB( CONTEXT86 *context ) fcb->file_number, disk_transfer_area, fcb->logical_record_size, bytes_written); AL_result = 0x01; /* disk full */ } else { - TRACE("successful written %d bytes from record %d (position %ld) of file %d (handle %p)\n", + TRACE("successful written %d bytes from record %d (position %u) of file %d (handle %p)\n", bytes_written, record_number, position, fcb->file_number, handle); AL_result = 0x00; /* successful */ } /* if */ @@ -1689,7 +1689,7 @@ static void INT21_RandomBlockReadFromFCB( CONTEXT86 *context ) struct XFCB *xfcb; HANDLE handle; DWORD record_number; - long position; + DWORD position; BYTE *disk_transfer_area; UINT records_requested; UINT bytes_requested; @@ -1713,7 +1713,7 @@ static void INT21_RandomBlockReadFromFCB( CONTEXT86 *context ) } else { position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0); if (position != record_number * fcb->logical_record_size) { - TRACE("seek(%d, %d, 0) failed with %ld\n", + TRACE("seek(%d, %d, 0) failed with %u\n", fcb->file_number, record_number * fcb->logical_record_size, position); records_read = 0; AL_result = 0x01; /* end of file, no data read */ @@ -1734,7 +1734,7 @@ static void INT21_RandomBlockReadFromFCB( CONTEXT86 *context ) AL_result = 0x03; /* end of file, partial record read */ } /* if */ } else { - TRACE("successful read %d bytes from record %d (position %ld) of file %d (handle %p)\n", + TRACE("successful read %d bytes from record %d (position %u) of file %d (handle %p)\n", bytes_read, record_number, position, fcb->file_number, handle); records_read = records_requested; AL_result = 0x00; /* successful */ @@ -1780,7 +1780,7 @@ static void INT21_RandomBlockWriteToFCB( CONTEXT86 *context ) struct XFCB *xfcb; HANDLE handle; DWORD record_number; - long position; + DWORD position; BYTE *disk_transfer_area; UINT records_requested; UINT bytes_requested; @@ -1804,7 +1804,7 @@ static void INT21_RandomBlockWriteToFCB( CONTEXT86 *context ) } else { position = SetFilePointer(handle, record_number * fcb->logical_record_size, NULL, 0); if (position != record_number * fcb->logical_record_size) { - TRACE("seek(%d, %d, 0) failed with %ld\n", + TRACE("seek(%d, %d, 0) failed with %u\n", fcb->file_number, record_number * fcb->logical_record_size, position); records_written = 0; AL_result = 0x01; /* disk full */ @@ -1819,7 +1819,7 @@ static void INT21_RandomBlockWriteToFCB( CONTEXT86 *context ) records_written = bytes_written / fcb->logical_record_size; AL_result = 0x01; /* disk full */ } else { - TRACE("successful write %d bytes from record %d (position %ld) of file %d (handle %p)\n", + TRACE("successful write %d bytes from record %d (position %u) of file %d (handle %p)\n", bytes_written, record_number, position, fcb->file_number, handle); records_written = records_requested; AL_result = 0x00; /* successful */ @@ -2733,7 +2733,7 @@ static void INT21_IoctlHPScanHandler( CONTEXT86 *context ) */ static void INT21_Ioctl_Char( CONTEXT86 *context ) { - int status, i; + int status; int IsConsoleIOHandle = 0; IO_STATUS_BLOCK io; FILE_INTERNAL_INFORMATION info; @@ -2750,6 +2750,7 @@ static void INT21_Ioctl_Char( CONTEXT86 *context ) return; } } else { + UINT i; for (i = 0; i < NB_MAGIC_DEVICES; i++) { if (!magic_devices[i].handle) continue;

1 0

Gerald Pfeifer : netapi32: Remove one tests and simplify another based on the limited range of unsigned .
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 7b80410646ae5eec1d3346bd1bca1cb94becd80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b80410646ae5eec1d3346bd1… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 22 01:10:33 2007 +0100 netapi32: Remove one tests and simplify another based on the limited range of unsigned. --- dlls/netapi32/tests/apibuf.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c index 751081e..920be6a 100644 --- a/dlls/netapi32/tests/apibuf.c +++ b/dlls/netapi32/tests/apibuf.c @@ -58,7 +58,6 @@ static void run_apibuf_tests(void) ok(pNetApiBufferFree(p) == NERR_Success, "Freed\n"); ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n"); - ok(dwSize >= 0, "The size\n"); ok(pNetApiBufferSize(NULL, &dwSize) == ERROR_INVALID_PARAMETER, "Error for NULL pointer\n"); /* border reallocate cases */ @@ -72,7 +71,7 @@ static void run_apibuf_tests(void) ok(pNetApiBufferAllocate(0, (LPVOID *)&p) == NERR_Success, "Reserved memory\n"); ok(pNetApiBufferSize(p, &dwSize) == NERR_Success, "Got size\n"); - ok((dwSize >= 0) && (dwSize < 0xFFFFFFFF),"The size of the 0-length buffer\n"); + ok(dwSize < 0xFFFFFFFF, "The size of the 0-length buffer\n"); ok(pNetApiBufferFree(p) == NERR_Success, "Freed\n"); /* NULL-Pointer */

1 0

Gerald Pfeifer : ntdll: Simplify condition in RtlGetAce() based on variable (un)signedness.
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 3cf116d4e91b3f09acffb0efe3fd944dee184192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf116d4e91b3f09acffb0efe… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 22 01:07:29 2007 +0100 ntdll: Simplify condition in RtlGetAce() based on variable (un)signedness. --- dlls/ntdll/sec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 2815838..fd5ed7a 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1341,7 +1341,7 @@ NTSTATUS WINAPI RtlGetAce(PACL pAcl,DWORD dwAceIndex,LPVOID *pAce ) TRACE("(%p,%d,%p)\n",pAcl,dwAceIndex,pAce); - if ((dwAceIndex < 0) || (dwAceIndex > pAcl->AceCount)) + if (dwAceIndex > pAcl->AceCount) return STATUS_INVALID_PARAMETER; ace = (PACE_HEADER)(pAcl + 1);

1 0

Gerald Pfeifer : oleaut32: Simplify two conditions based on the fact that unsigned variables cannot be negative .
by Alexandre Julliard 26 Nov '07

26 Nov '07

Module: wine Branch: master Commit: 48d839822b072438ad35fd20825fc018f3067d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d839822b072438ad35fd208… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 22 21:49:37 2007 +0100 oleaut32: Simplify two conditions based on the fact that unsigned variables cannot be negative. --- dlls/oleaut32/typelib.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 62fe557..8e37de0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3758,7 +3758,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoType( int i; ITypeInfoImpl *pTInfo = This->pTypeInfo; - if ((ITypeLib2_fnGetTypeInfoCount(iface) < index + 1) || (index < 0)) + if (ITypeLib2_fnGetTypeInfoCount(iface) < index + 1) return TYPE_E_ELEMENTNOTFOUND; TRACE("(%p) index %d\n", This, index); @@ -6647,7 +6647,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetParamCustData( for(i=0, pFDesc=This->funclist; i!=indexFunc && pFDesc; i++,pFDesc=pFDesc->next); - if(pFDesc && indexParam >=0 && indexParam<pFDesc->funcdesc.cParams) + if(pFDesc && indexParam<pFDesc->funcdesc.cParams) for(pCData=pFDesc->pParamDesc[indexParam].pCustData; pCData; pCData = pCData->next) if( IsEqualIID(guid, &pCData->guid)) break; @@ -6880,7 +6880,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllParamCustData( ITypeInfo2 * iface, for(i=0, pFDesc=This->funclist; i!=indexFunc && pFDesc; i++, pFDesc=pFDesc->next) ; - if(pFDesc && indexParam >=0 && indexParam<pFDesc->funcdesc.cParams){ + if(pFDesc && indexParam<pFDesc->funcdesc.cParams){ pCustData->prgCustData = TLB_Alloc(pFDesc->pParamDesc[indexParam].ctCustData * sizeof(CUSTDATAITEM));

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
76
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 November 2007