wine-commits September 2007

wine-commits@winehq.org

7 participants
787 discussions

Juan Lang : crypt32: Correct an optimization.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 09447fb605d9ea302bb6cdd1bc7fef7d9791a58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09447fb605d9ea302bb6cdd1b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:01:52 2007 -0700 crypt32: Correct an optimization. --- dlls/crypt32/decode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index ef95a34..8ce5d43 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -550,7 +550,7 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, if (itemSizes != &itemSize) itemSizes = CryptMemRealloc(itemSizes, cItems * sizeof(struct AsnArrayItemSize)); - else + else if (cItems > 1) { itemSizes = CryptMemAlloc(

1 0

Juan Lang : crypt32: Correct GET_LEN_BYTES for the indefinite-length form.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: e747f706b1d7f87d12c48ed49d2f465e1b2f1537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e747f706b1d7f87d12c48ed49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:01:29 2007 -0700 crypt32: Correct GET_LEN_BYTES for the indefinite-length form. --- dlls/crypt32/decode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 9d4c5c8..ef95a34 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -124,7 +124,7 @@ static BOOL WINAPI CRYPT_AsnDecodeUnsignedIntegerInternal( void *pvStructInfo, DWORD *pcbStructInfo); /* Gets the number of length bytes from the given (leading) length byte */ -#define GET_LEN_BYTES(b) ((b) <= 0x7f ? 1 : 1 + ((b) & 0x7f)) +#define GET_LEN_BYTES(b) ((b) <= 0x80 ? 1 : 1 + ((b) & 0x7f)) /* Helper function to get the encoded length of the data starting at pbEncoded, * where pbEncoded[0] is the tag. If the data are too short to contain a

1 0

Juan Lang : crypt32: Add a test of an indefinite-length sequence.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 15b19f1d1637dce7f56c3e1a71e11811cd0013de URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b19f1d1637dce7f56c3e1a7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:00:58 2007 -0700 crypt32: Add a test of an indefinite-length sequence. --- dlls/crypt32/tests/encode.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 7b3e562..37046b0 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -979,6 +979,7 @@ static void compareNames(const CERT_NAME_INFO *expected, } } +static const BYTE emptyIndefiniteSequence[] = { 0x30,0x80,0x00,0x00 }; static const BYTE twoRDNsExtraBytes[] = { 0x30,0x23,0x31,0x21,0x30,0x0c,0x06,0x03,0x55,0x04,0x04, 0x13,0x05,0x4c,0x61,0x6e,0x67,0x00,0x30,0x11,0x06,0x03,0x55,0x04,0x03, @@ -1010,6 +1011,20 @@ static void test_decodeName(DWORD dwEncoding) ((CERT_NAME_INFO *)buf)->cRDN); LocalFree(buf); } + /* test empty name with indefinite-length encoding */ + ret = CryptDecodeObjectEx(dwEncoding, X509_NAME, emptyIndefiniteSequence, + sizeof(emptyIndefiniteSequence), CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&buf, &bufSize); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(bufSize == sizeof(CERT_NAME_INFO), "Wrong bufSize %d\n", bufSize); + ok(((CERT_NAME_INFO *)buf)->cRDN == 0, + "Expected 0 RDNs in empty info, got %d\n", + ((CERT_NAME_INFO *)buf)->cRDN); + LocalFree(buf); + } /* test empty RDN */ bufSize = 0; ret = CryptDecodeObjectEx(dwEncoding, X509_NAME, emptyRDNs,

1 0

Juan Lang : crypt32: Update comments.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 716a7405e47c1f4019a6286d723e5611e00d5a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=716a7405e47c1f4019a6286d7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 17 15:00:30 2007 -0700 crypt32: Update comments. --- dlls/crypt32/decode.c | 9 ++++----- dlls/crypt32/encode.c | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 7349f5e..9d4c5c8 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Juan Lang + * Copyright 2005-2007 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,8 +17,8 @@ * * This file implements ASN.1 DER decoding of a limited set of types. * It isn't a full ASN.1 implementation. Microsoft implements BER - * encoding of many of the basic types in msasn1.dll, but that interface is - * undocumented, so I implement them here. + * encoding of many of the basic types in msasn1.dll, but that interface isn't + * implemented, so I implement them here. * * References: * "A Layman's Guide to a Subset of ASN.1, BER, and DER", by Burton Kaliski @@ -27,8 +27,7 @@ * * RFC3280, http://www.faqs.org/rfcs/rfc3280.html * - * MSDN, especially: - * http://msdn.microsoft.com/library/en-us/seccrypto/security/constants_for_cr… + * MSDN, especially "Constants for CryptEncodeObject and CryptDecodeObject" */ #include <assert.h> diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 05c52e6..1963eb7 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1,5 +1,5 @@ /* - * Copyright 2005 Juan Lang + * Copyright 2005-2007 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,8 +17,8 @@ * * This file implements ASN.1 DER encoding of a limited set of types. * It isn't a full ASN.1 implementation. Microsoft implements BER - * encoding of many of the basic types in msasn1.dll, but that interface is - * undocumented, so I implement them here. + * encoding of many of the basic types in msasn1.dll, but that interface isn't + * implemented, so I implement them here. * * References: * "A Layman's Guide to a Subset of ASN.1, BER, and DER", by Burton Kaliski @@ -27,8 +27,7 @@ * * RFC3280, http://www.faqs.org/rfcs/rfc3280.html * - * MSDN, especially: - * http://msdn.microsoft.com/library/en-us/seccrypto/security/constants_for_cr… + * MSDN, especially "Constants for CryptEncodeObject and CryptDecodeObject" */ #include <assert.h>

1 0

Francois Gouget : dbghelp: Fix the PENUMLOADED_MODULES_CALLBACK() prototype .
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: a399e3bcc4cdd0a48a7bca69db080ddd8e0faa15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a399e3bcc4cdd0a48a7bca69d… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 18 00:40:06 2007 +0200 dbghelp: Fix the PENUMLOADED_MODULES_CALLBACK() prototype. --- dlls/dbghelp/dbghelp.c | 2 +- include/dbghelp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 40b1f30..7ecc3c9 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -211,7 +211,7 @@ BOOL WINAPI SymGetSearchPath(HANDLE hProcess, PSTR szSearchPath, * SymInitialize helper: loads in dbghelp all known (and loaded modules) * this assumes that hProcess is a handle on a valid process */ -static BOOL WINAPI process_invade_cb(char* name, DWORD base, DWORD size, void* user) +static BOOL WINAPI process_invade_cb(PCSTR name, ULONG base, ULONG size, PVOID user) { char tmp[MAX_PATH]; HANDLE hProcess = (HANDLE)user; diff --git a/include/dbghelp.h b/include/dbghelp.h index a5ed500..a67daf3 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -792,7 +792,7 @@ BOOL WINAPI MiniDumpReadDumpStream(PVOID, ULONG, PMINIDUMP_DIRECTORY*, PVOID*, #define SLMFLAG_VIRTUAL 0x1 #define SLMFLAG_NO_SYMBOLS 0x4 -typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK)(PSTR, ULONG, ULONG, PVOID); +typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK)(PCSTR, ULONG, ULONG, PVOID); BOOL WINAPI EnumerateLoadedModules(HANDLE, PENUMLOADED_MODULES_CALLBACK, PVOID); typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK64)(PCSTR, DWORD64, ULONG, PVOID); BOOL WINAPI EnumerateLoadedModules64(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID);

1 0

Francois Gouget : dnsapi: Fix the DnsQueryConfig() prototype.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 4040ecee2bc4f778822336b2a46c208e01a1081b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4040ecee2bc4f778822336b2a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 18 00:39:58 2007 +0200 dnsapi: Fix the DnsQueryConfig() prototype. --- dlls/dnsapi/query.c | 2 +- include/windns.h | 2 +- tools/winapi/win32.api | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 0cf2928..8fe7714 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -810,7 +810,7 @@ static DNS_STATUS dns_get_hostname_w( COMPUTER_NAME_FORMAT format, * DnsQueryConfig [DNSAPI.@] * */ -DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PWSTR adapter, +DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PCWSTR adapter, PVOID reserved, PVOID buffer, PDWORD len ) { DNS_STATUS ret = ERROR_INVALID_PARAMETER; diff --git a/include/windns.h b/include/windns.h index 7c02a5c..c55d013 100644 --- a/include/windns.h +++ b/include/windns.h @@ -630,7 +630,7 @@ DNS_STATUS WINAPI DnsQuery_A(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); DNS_STATUS WINAPI DnsQuery_W(PCWSTR,WORD,DWORD,PVOID,PDNS_RECORDW*,PVOID*); DNS_STATUS WINAPI DnsQuery_UTF8(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); #define DnsQuery WINELIB_NAME_AW(DnsQuery_) -DNS_STATUS WINAPI DnsQueryConfig(DNS_CONFIG_TYPE,DWORD,PWSTR,PVOID,PVOID,PDWORD); +DNS_STATUS WINAPI DnsQueryConfig(DNS_CONFIG_TYPE,DWORD,PCWSTR,PVOID,PVOID,PDWORD); BOOL WINAPI DnsRecordCompare(PDNS_RECORD,PDNS_RECORD); PDNS_RECORD WINAPI DnsRecordCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET); VOID WINAPI DnsRecordListFree(PDNS_RECORD,DNS_FREE_TYPE); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 73480ed..f54038f 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1230,7 +1230,6 @@ PCSTR %wstr PCWSTR -PWSTR %void

1 0

Francois Gouget : wordpad: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 03d7f2d4ade297935d9184e2f333132dfc82541e URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d7f2d4ade297935d9184e2f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 18 00:39:11 2007 +0200 wordpad: Fix compilation on systems that don't support nameless unions. --- programs/wordpad/wordpad.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 431e9d7..5e1d0dc 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -40,6 +40,16 @@ #include "resource.h" +#ifdef NONAMELESSUNION +# define U(x) (x).u +# define U2(x) (x).u2 +# define U3(x) (x).u3 +#else +# define U(x) (x) +# define U2(x) (x) +# define U3(x) (x) +#endif + /* use LoadString */ static const WCHAR xszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a','d',0}; static const WCHAR xszMainMenu[] = {'M','A','I','N','M','E','N','U',0}; @@ -1773,7 +1783,7 @@ static void dialog_viewproperties(void) psp[0].dwSize = sizeof(PROPSHEETPAGEW); psp[0].dwFlags = PSP_USETITLE; - psp[0].pszTemplate = MAKEINTRESOURCEW(IDD_FORMATOPTS); + U(psp[0]).pszTemplate = MAKEINTRESOURCEW(IDD_FORMATOPTS); psp[0].pfnDlgProc = formatopts_proc; psp[0].hInstance = hInstance; psp[0].lParam = reg_formatindex(SF_TEXT); @@ -1783,7 +1793,7 @@ static void dialog_viewproperties(void) { psp[i].dwSize = psp[0].dwSize; psp[i].dwFlags = psp[0].dwFlags; - psp[i].pszTemplate = psp[0].pszTemplate; + U(psp[i]).pszTemplate = U(psp[0]).pszTemplate; psp[i].pfnDlgProc = psp[0].pfnDlgProc; psp[i].hInstance = psp[0].hInstance; psp[i].lParam = reg_formatindex(SF_RTF); @@ -1797,13 +1807,13 @@ static void dialog_viewproperties(void) psh.hInstance = hInstance; psh.pszCaption = MAKEINTRESOURCEW(STRING_VIEWPROPS_TITLE); psh.nPages = sizeof(psp)/sizeof(psp[0]); - psh.ppsp = ppsp; - psh.pszIcon = MAKEINTRESOURCEW(IDI_WORDPAD); + U3(psh).ppsp = ppsp; + U(psh).pszIcon = MAKEINTRESOURCEW(IDI_WORDPAD); if(fileFormat & SF_RTF) - psh.nStartPage = 1; + U2(psh).nStartPage = 1; else - psh.nStartPage = 0; + U2(psh).nStartPage = 0; PropertySheetW(&psh); set_bar_states(); target_device();

1 0

Francois Gouget : imagehlp: Add SYMBOL_INFO_PACKAGE and SymSetSearchPathW() .
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: 4035b22bf75eb94a2b9a0f535574da09891f8cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4035b22bf75eb94a2b9a0f535… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 18 00:40:42 2007 +0200 imagehlp: Add SYMBOL_INFO_PACKAGE and SymSetSearchPathW(). --- include/imagehlp.h | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/imagehlp.h b/include/imagehlp.h index 1e33df4..f72f1ce 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -540,6 +540,8 @@ typedef struct _IMAGEHLP_GET_TYPE_INFO_PARAMS #define IMAGEHLP_SYMBOL_INFO_CONSTANT SYMF_CONSTANT #define IMAGEHLP_SYMBOL_FUNCTION SYMF_FUNCTION +#define MAX_SYM_NAME 2000 + typedef struct _SYMBOL_INFO { ULONG SizeOfStruct; ULONG TypeIndex; @@ -577,6 +579,18 @@ typedef struct _SYMBOL_INFOW WCHAR Name[1]; } SYMBOL_INFOW, *PSYMBOL_INFOW; +typedef struct _SYMBOL_INFO_PACKAGE +{ + SYMBOL_INFO si; + CHAR name[MAX_SYM_NAME+1]; +} SYMBOL_INFO_PACKAGE, *PSYMBOL_INFO_PACKAGE; + +typedef struct _SYMBOL_INFO_PACKAGEW +{ + SYMBOL_INFOW si; + WCHAR name[MAX_SYM_NAME+1]; +} SYMBOL_INFO_PACKAGEW, *PSYMBOL_INFO_PACKAGEW; + #define DBHHEADER_DEBUGDIRS 0x1 typedef struct _MODLOAD_DATA { @@ -1281,6 +1295,9 @@ BOOL WINAPI SymSetParentWindow( BOOL WINAPI SymSetSearchPath( HANDLE hProcess, PCSTR szSearchPath ); +BOOL WINAPI SymSetSearchPathW( + HANDLE hProcess, PCWSTR szSearchPath +); BOOL WINAPI SymUnDName( PIMAGEHLP_SYMBOL sym, PSTR UnDecName, DWORD UnDecNameLength );

1 0

Francois Gouget : advapi32: Add and use LSTATUS.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: af183df6086626c4e499f1c778ff6a2a256595dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=af183df6086626c4e499f1c77… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 18 00:40:48 2007 +0200 advapi32: Add and use LSTATUS. --- dlls/advapi32/registry.c | 112 ++++++++++++++++++++++---------------------- include/winreg.h | 117 +++++++++++++++++++++++----------------------- tools/winapi/win32.api | 2 +- 3 files changed, 116 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af183df6086626c4e499f…

1 0

Francois Gouget : shell32: CSIDL_MYDOCUMENTS is now a synonym for CSIDL_PERSONAL.
by Alexandre Julliard 18 Sep '07

18 Sep '07

Module: wine Branch: master Commit: a9f9676046a69907fe00c5ead51d98a3cca48521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f9676046a69907fe00c5ead… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 18 00:40:56 2007 +0200 shell32: CSIDL_MYDOCUMENTS is now a synonym for CSIDL_PERSONAL. --- dlls/shell32/tests/shellpath.c | 12 ++++++------ include/shlobj.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 2821b4f..8c237df 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -35,6 +35,11 @@ #include "shlwapi.h" #include "wine/test.h" +/* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want + * here is its original value. + */ +#define OLD_CSIDL_MYDOCUMENTS 0x000c + #ifndef ARRAY_SIZE #define ARRAY_SIZE(x) ( sizeof(x) / sizeof((x)[0]) ) #endif @@ -129,7 +134,7 @@ static const struct shellExpectedValues optionalShellValues[] = { { CSIDL_ADMINTOOLS, PT_FOLDER }, { CSIDL_COMMON_APPDATA, PT_FOLDER }, { CSIDL_LOCAL_APPDATA, PT_FOLDER }, - { CSIDL_MYDOCUMENTS, PT_FOLDER }, + { OLD_CSIDL_MYDOCUMENTS, PT_FOLDER }, { CSIDL_MYMUSIC, PT_FOLDER }, { CSIDL_MYPICTURES, PT_FOLDER }, { CSIDL_MYVIDEO, PT_FOLDER }, @@ -194,11 +199,6 @@ static void loadShell32(void) #define CSIDL_PROFILES 0x003e #endif -/* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want - * here is its original value. - */ -#define OLD_CSIDL_MYDOCUMENTS 0x000c - /* A couple utility printing functions */ static const char *getFolderName(int folder) { diff --git a/include/shlobj.h b/include/shlobj.h index 5e88bb4..77e09cc 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1076,7 +1076,7 @@ HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwF #define CSIDL_SENDTO 0x0009 #define CSIDL_BITBUCKET 0x000a #define CSIDL_STARTMENU 0x000b -#define CSIDL_MYDOCUMENTS 0x000c +#define CSIDL_MYDOCUMENTS CSIDL_PERSONAL #define CSIDL_MYMUSIC 0x000d #define CSIDL_MYVIDEO 0x000e #define CSIDL_DESKTOPDIRECTORY 0x0010

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
79
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 2007