February 2009 - Wine-Commits

Alexandre Julliard : setupapi: Don't use 'interface' as variable name, since it can be defined to a keyword.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 72fdb74326ae458180f29cd711577e4f3e14d469 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72fdb74326ae458180f29cd71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 9 13:04:55 2009 +0100 setupapi: Don't use 'interface' as variable name, since it can be defined to a keyword. --- dlls/setupapi/devinst.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 1adf818..8a18138 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -36,7 +36,6 @@ #include "wine/list.h" #include "wine/unicode.h" #include "cfgmgr32.h" -#include "initguid.h" #include "winioctl.h" #include "rpc.h" #include "rpcdce.h" @@ -181,7 +180,7 @@ static void SETUPDI_FreeInterfaceInstances(struct InterfaceInstances *instances) * Returns FALSE if not found. */ static BOOL SETUPDI_FindInterface(const struct DeviceInfo *devInfo, - const GUID *InterfaceClassGuid, struct InterfaceInstances **interface) + const GUID *InterfaceClassGuid, struct InterfaceInstances **iface_ret) { BOOL found = FALSE; struct InterfaceInstances *iface; @@ -193,12 +192,12 @@ static BOOL SETUPDI_FindInterface(const struct DeviceInfo *devInfo, { if (IsEqualGUID(&iface->guid, InterfaceClassGuid)) { - *interface = iface; + *iface_ret = iface; found = TRUE; break; } } - TRACE("returning %d (%p)\n", found, found ? *interface : NULL); + TRACE("returning %d (%p)\n", found, found ? *iface_ret : NULL); return found; } @@ -1985,7 +1984,7 @@ end: } static void SETUPDI_AddDeviceInterfaces(SP_DEVINFO_DATA *dev, HKEY key, - const GUID *interface) + const GUID *guid) { DWORD i, len; WCHAR subKeyName[MAX_PATH]; @@ -2003,8 +2002,7 @@ static void SETUPDI_AddDeviceInterfaces(SP_DEVINFO_DATA *dev, HKEY key, if (*subKeyName == '#') { /* The subkey name is the reference string, with a '#' prepended */ - SETUPDI_AddInterfaceInstance(dev, interface, subKeyName + 1, - &iface); + SETUPDI_AddInterfaceInstance(dev, guid, subKeyName + 1, &iface); l = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey); if (!l) { @@ -2027,7 +2025,7 @@ static void SETUPDI_AddDeviceInterfaces(SP_DEVINFO_DATA *dev, HKEY key, } static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet, - HKEY key, const GUID *interface, LPCWSTR enumstr) + HKEY key, const GUID *guid, LPCWSTR enumstr) { struct DeviceInfoSet *set = DeviceInfoSet; DWORD i, len; @@ -2085,8 +2083,7 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet, if (SETUPDI_AddDeviceToSet(set, &deviceClass, 0 /* FIXME: DevInst */, deviceInst, FALSE, &dev)) - SETUPDI_AddDeviceInterfaces(dev, subKey, - interface); + SETUPDI_AddDeviceInterfaces(dev, subKey, guid); } RegCloseKey(deviceKey); } @@ -2103,12 +2100,12 @@ static void SETUPDI_EnumerateMatchingInterfaces(HDEVINFO DeviceInfoSet, } static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet, - const GUID *interface, LPCWSTR enumstr, DWORD flags) + const GUID *guid, LPCWSTR enumstr, DWORD flags) { - HKEY interfacesKey = SetupDiOpenClassRegKeyExW(interface, KEY_READ, + HKEY interfacesKey = SetupDiOpenClassRegKeyExW(guid, KEY_READ, DIOCR_INTERFACE, NULL, NULL); - TRACE("%p, %s, %s, %08x\n", DeviceInfoSet, debugstr_guid(interface), + TRACE("%p, %s, %s, %08x\n", DeviceInfoSet, debugstr_guid(guid), debugstr_w(enumstr), flags); if (interfacesKey != INVALID_HANDLE_VALUE) @@ -2152,7 +2149,7 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet, * interface's key, so just pass that long */ SETUPDI_EnumerateMatchingInterfaces(DeviceInfoSet, - interfacesKey, interface, enumstr); + interfacesKey, guid, enumstr); } RegCloseKey(interfacesKey); }

1 0

Dylan Smith : richedit: Wrap even when message says not to repaint.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: c2c2c1117e2a78830a52a8fd8091a7ce1451b54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c2c1117e2a78830a52a8fd8… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 7 13:20:23 2009 -0500 richedit: Wrap even when message says not to repaint. Wrapping is needed to be done even when repainting isn't done since later messages expect line breaks to reflect the current text. Some message can specify not to paint the sceen, but this should prevent wrapping from being done. --- dlls/riched20/editor.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2721745..032e99c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3431,7 +3431,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, CHARFORMAT2W fmt; HDC hDC; BOOL bRepaint = LOWORD(lParam); - + if (!wParam) wParam = (WPARAM)GetStockObject(SYSTEM_FONT); GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf); @@ -3442,8 +3442,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetDefaultCharFormat(editor, &fmt); ME_CommitUndo(editor); + ME_MarkAllForWrapping(editor); + ME_WrapMarkedParagraphs(editor); + ME_UpdateScrollBar(editor); if (bRepaint) - ME_RewrapRepaint(editor); + ME_Repaint(editor); return 0; } case WM_SETTEXT: @@ -4139,8 +4142,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetDefaultFormatRect(editor); editor->bDefaultFormatRect = TRUE; } + ME_MarkAllForWrapping(editor); + ME_WrapMarkedParagraphs(editor); + ME_UpdateScrollBar(editor); if (msg != EM_SETRECTNP) - ME_RewrapRepaint(editor); + ME_Repaint(editor); return 0; } case EM_REQUESTRESIZE:

1 0

Alexandre Julliard : include: Moved VWIN32 ioctl definitions out of winioctl.h.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 6ae7b1f3e0e1f0d12a7a7c45df6c79daf11506dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae7b1f3e0e1f0d12a7a7c45d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 9 12:57:39 2009 +0100 include: Moved VWIN32 ioctl definitions out of winioctl.h. --- dlls/vwin32.vxd/vwin32.c | 26 ++++++++++++++++++++++++++ include/winioctl.h | 36 ------------------------------------ 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/dlls/vwin32.vxd/vwin32.c b/dlls/vwin32.vxd/vwin32.c index fdd5998..0ac3e26 100644 --- a/dlls/vwin32.vxd/vwin32.c +++ b/dlls/vwin32.vxd/vwin32.c @@ -29,6 +29,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(vxd); +typedef struct tagDIOCRegs { + DWORD reg_EBX; + DWORD reg_EDX; + DWORD reg_ECX; + DWORD reg_EAX; + DWORD reg_EDI; + DWORD reg_ESI; + DWORD reg_Flags; +} DIOC_REGISTERS, *PDIOC_REGISTERS; + +#define VWIN32_DIOC_DOS_IOCTL 1 /* This is the specified MS-DOS device I/O ctl - Interrupt 21h Function 4400h - 4411h */ +#define VWIN32_DIOC_DOS_INT25 2 /* This is the Absolute Disk Read command - Interrupt 25h */ +#define VWIN32_DIOC_DOS_INT26 3 /* This is the Absolute Disk Write command - Interrupt 25h */ +#define VWIN32_DIOC_DOS_INT13 4 /* This is Interrupt 13h commands */ +#define VWIN32_DIOC_SIMCTRLC 5 /* Simulate Ctrl-C */ +#define VWIN32_DIOC_DOS_DRIVEINFO 6 /* This is Interrupt 21h Function 730X commands */ + +#include <pshpack1.h> +typedef struct tagMID { + WORD midInfoLevel; + DWORD midSerialNum; + BYTE midVolLabel[11]; + BYTE midFileSysType[8]; +} MID, *PMID; +#include <poppack.h> + extern void WINAPI CallBuiltinHandler( CONTEXT86 *context, BYTE intnum ); /* from winedos */ /* Pop a DWORD from the 32-bit stack */ diff --git a/include/winioctl.h b/include/winioctl.h index 8b99f10..8765cdf 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -378,42 +378,6 @@ typedef struct _VOLUME_DISK_EXTENTS { /* End: _WIN32_WINNT >= 0x0400 */ -/* Device Io Stuff - Most VxD support. - * NOTE: All VxD messages seem to start with a hiword or 0 - */ -typedef struct tagDIOCRegs { - DWORD reg_EBX; - DWORD reg_EDX; - DWORD reg_ECX; - DWORD reg_EAX; - DWORD reg_EDI; - DWORD reg_ESI; - DWORD reg_Flags; -} DIOC_REGISTERS, *PDIOC_REGISTERS; - -/* Start VWIN32 information: - * VWIN32 is a VxD which supports the MSDOS Io routines. - */ -#define VWIN32_DIOC_DOS_IOCTL 1 /* This is the specified MS-DOS device I/O ctl - Interrupt 21h Function 4400h - 4411h */ -#define VWIN32_DIOC_DOS_INT25 2 /* This is the Absolute Disk Read command - Interrupt 25h */ -#define VWIN32_DIOC_DOS_INT26 3 /* This is the Absolute Disk Write command - Interrupt 25h */ -#define VWIN32_DIOC_DOS_INT13 4 /* This is Interrupt 13h commands */ -#define VWIN32_DIOC_SIMCTRLC 5 /* Simulate Ctrl-C */ -#define VWIN32_DIOC_DOS_DRIVEINFO 6 /* This is Interrupt 21h Function 730X commands */ - -/* Important: All MS_DOS data structures must be packed on a one-byte boundary - good old 16 bit. */ - -#include <pshpack1.h> -typedef struct tagMID { - WORD midInfoLevel; - DWORD midSerialNum; - BYTE midVolLabel[11]; - BYTE midFileSysType[8]; -} MID, *PMID; -#include <poppack.h> - -/* End VWIN32 information */ - /* * NT I/O-Manager */

1 0

Alexandre Julliard : include: Undefine a few Unicode macros that conflict with interface functions.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 8bb21b710ead4f2d8a83b070c5f19c11d52a3808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb21b710ead4f2d8a83b070c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 9 12:41:45 2009 +0100 include: Undefine a few Unicode macros that conflict with interface functions. --- dlls/mshtml/nsiface.idl | 5 +++++ include/bits.idl | 4 ++++ include/mshtml.idl | 4 ++++ include/tom.idl | 4 ++++ 4 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index ef64145..894bb41 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -28,6 +28,11 @@ cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl"; +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef GetForm") +cpp_quote("#undef SetPort") +cpp_quote("#endif") + typedef HRESULT nsresult; typedef ULONG nsrefcnt; diff --git a/include/bits.idl b/include/bits.idl index 386d6c0..89b916d 100644 --- a/include/bits.idl +++ b/include/bits.idl @@ -30,6 +30,10 @@ cpp_quote("#define BG_NOTIFY_JOB_ERROR 0x0002") cpp_quote("#define BG_NOTIFY_DISABLE 0x0004") cpp_quote("#define BG_NOTIFY_JOB_MODIFICATION 0x0008") +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef EnumJobs") +cpp_quote("#undef GetJob") +cpp_quote("#endif") #define BG_ENUM_SIZEIS(maxcount) maxcount #define BG_ENUM_LENGTHIS(maxcount,lengthptr) lengthptr ? *lengthptr : maxcount diff --git a/include/mshtml.idl b/include/mshtml.idl index acbdde2..929139a 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -33,6 +33,10 @@ cpp_quote("DEFINE_GUID(SID_SHTMLEditServices, 0x3050f7f9,0x98b5,0x11cf,0xbb,0x cpp_quote("#define SID_SHTMLWindow IID_IHTMLWindow2") cpp_quote("#define SID_SElementBehaviorFactory IID_IElementBehaviorFactory") +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef FindText") +cpp_quote("#endif") + typedef enum { POINTER_GRAVITY_Left, POINTER_GRAVITY_Right, diff --git a/include/tom.idl b/include/tom.idl index 669fbcf..f86c885 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -18,6 +18,10 @@ import "oaidl.idl"; +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef FindText") +cpp_quote("#endif") + typedef enum tagTomConstants { tomFalse = 0,

1 0

Alexandre Julliard : jscript: Rename the GetObjectW variable to avoid conflict with the function of the same name .
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 0a81b7887f3373422b65e40cdf625ed137349aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a81b7887f3373422b65e40cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 9 13:03:59 2009 +0100 jscript: Rename the GetObjectW variable to avoid conflict with the function of the same name. --- dlls/jscript/global.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index ae9cc5b..d98b7b4 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -48,7 +48,7 @@ static const WCHAR isFiniteW[] = {'i','s','F','i','n','i','t','e',0}; static const WCHAR parseIntW[] = {'p','a','r','s','e','I','n','t',0}; static const WCHAR parseFloatW[] = {'p','a','r','s','e','F','l','o','a','t',0}; static const WCHAR unescapeW[] = {'u','n','e','s','c','a','p','e',0}; -static const WCHAR GetObjectW[] = {'G','e','t','O','b','j','e','c','t',0}; +static const WCHAR _GetObjectW[] = {'G','e','t','O','b','j','e','c','t',0}; static const WCHAR ScriptEngineW[] = {'S','c','r','i','p','t','E','n','g','i','n','e',0}; static const WCHAR ScriptEngineMajorVersionW[] = {'S','c','r','i','p','t','E','n','g','i','n','e','M','a','j','o','r','V','e','r','s','i','o','n',0}; @@ -542,7 +542,7 @@ static const builtin_prop_t JSGlobal_props[] = { {DateW, JSGlobal_Date, PROPF_CONSTR}, {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD}, {FunctionW, JSGlobal_Function, PROPF_CONSTR}, - {GetObjectW, JSGlobal_GetObject, PROPF_METHOD}, + {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD}, {InfinityW, JSGlobal_Infinity, 0}, /* {MathW, JSGlobal_Math, 0}, */ {NaNW, JSGlobal_NaN, 0},

1 0

Alexandre Julliard : rsaenh: Rename the HANDLETABLE structure to avoid conflicts with wingdi.h.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 7682bc6f8805a0f890e38e7f2bae563d21f06914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7682bc6f8805a0f890e38e7f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 9 13:03:35 2009 +0100 rsaenh: Rename the HANDLETABLE structure to avoid conflicts with wingdi.h. --- dlls/rsaenh/handle.c | 24 ++++++++++++------------ dlls/rsaenh/handle.h | 24 ++++++++++++------------ dlls/rsaenh/rsaenh.c | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index 672c296..43b61a5 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(handle); * You have to call destroy_handle_table when you don't need the table * any more. */ -void init_handle_table(HANDLETABLE *lpTable) +void init_handle_table(struct handle_table *lpTable) { TRACE("(lpTable=%p)\n", lpTable); @@ -66,7 +66,7 @@ void init_handle_table(HANDLETABLE *lpTable) * PARAMS * lpTable [I] Pointer to the handle table, which is to be destroyed. */ -void destroy_handle_table(HANDLETABLE *lpTable) +void destroy_handle_table(struct handle_table *lpTable) { TRACE("(lpTable=%p)\n", lpTable); @@ -90,7 +90,7 @@ void destroy_handle_table(HANDLETABLE *lpTable) * non zero, if handle is valid. * zero, if handle is not valid. */ -int is_valid_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType) +int is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) { unsigned int index = HANDLE2INDEX(handle); int ret = 0; @@ -132,20 +132,20 @@ exit: * NOTES * This is a support function for alloc_handle. Do not call! */ -static int grow_handle_table(HANDLETABLE *lpTable) +static int grow_handle_table(struct handle_table *lpTable) { - HANDLETABLEENTRY *newEntries; + struct handle_table_entry *newEntries; unsigned int i, newIEntries; newIEntries = lpTable->iEntries + TABLE_SIZE_INCREMENT; - newEntries = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLETABLEENTRY)*newIEntries); + newEntries = HeapAlloc(GetProcessHeap(), 0, sizeof(struct handle_table_entry)*newIEntries); if (!newEntries) return 0; if (lpTable->paEntries) { - memcpy(newEntries, lpTable->paEntries, sizeof(HANDLETABLEENTRY)*lpTable->iEntries); + memcpy(newEntries, lpTable->paEntries, sizeof(struct handle_table_entry)*lpTable->iEntries); HeapFree(GetProcessHeap(), 0, lpTable->paEntries); } @@ -177,7 +177,7 @@ static int grow_handle_table(HANDLETABLE *lpTable) * non zero, if successful * zero, if not successful (no free handle) */ -static int alloc_handle(HANDLETABLE *lpTable, OBJECTHDR *lpObject, HCRYPTKEY *lpHandle) +static int alloc_handle(struct handle_table *lpTable, OBJECTHDR *lpObject, HCRYPTKEY *lpHandle) { int ret = 0; @@ -224,7 +224,7 @@ exit: * non zero, if successful * zero, if not successful (invalid handle) */ -int release_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType) +int release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) { unsigned int index = HANDLE2INDEX(handle); OBJECTHDR *pObject; @@ -269,7 +269,7 @@ exit: * non zero, if successful * zero, if not successful (invalid handle) */ -int lookup_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) +int lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) { int ret = 0; @@ -304,7 +304,7 @@ exit: * non zero, if successful * zero, if not successful (invalid handle or out of memory) */ -int copy_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) +int copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) { OBJECTHDR *pObject; int ret; @@ -347,7 +347,7 @@ int copy_handle(HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY * INVALID_HANDLE_VALUE, if something went wrong. * a handle to the new object, if successful. */ -HCRYPTKEY new_object(HANDLETABLE *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, +HCRYPTKEY new_object(struct handle_table *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, OBJECTHDR **ppObject) { OBJECTHDR *pObject; diff --git a/dlls/rsaenh/handle.h b/dlls/rsaenh/handle.h index 1d7b927..40611da 100644 --- a/dlls/rsaenh/handle.h +++ b/dlls/rsaenh/handle.h @@ -42,28 +42,28 @@ struct tagOBJECTHDR DESTRUCTOR destructor; }; -typedef struct tagHANDLETABLEENTRY +struct handle_table_entry { OBJECTHDR *pObject; unsigned int iNextFree; -} HANDLETABLEENTRY; +}; -typedef struct tagHANDLETABLE +struct handle_table { unsigned int iEntries; unsigned int iFirstFree; - HANDLETABLEENTRY *paEntries; + struct handle_table_entry *paEntries; CRITICAL_SECTION mutex; -} HANDLETABLE; +}; -void init_handle_table (HANDLETABLE *lpTable); -void destroy_handle_table(HANDLETABLE *lpTable); -int release_handle (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType); -int copy_handle (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy); -int lookup_handle (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject); -int is_valid_handle (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType); +void init_handle_table (struct handle_table *lpTable); +void destroy_handle_table(struct handle_table *lpTable); +int release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType); +int copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy); +int lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject); +int is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType); -HCRYPTKEY new_object (HANDLETABLE *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, +HCRYPTKEY new_object (struct handle_table *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, OBJECTHDR **ppObject); #ifdef __cplusplus diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index e382e43..f44db39 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -343,7 +343,7 @@ RSAENH_CPHashData( /****************************************************************************** * CSP's handle table (used by all acquired key containers) */ -static HANDLETABLE handle_table; +static struct handle_table handle_table; /****************************************************************************** * DllMain (RSAENH.@)

1 0

Andrew Talbot : qcap: Remove an unused function.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: e3c522535347ff5420d7c69e84e5b0e1f2628b49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3c522535347ff5420d7c69e8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 7 14:32:54 2009 +0000 qcap: Remove an unused function. --- dlls/qcap/pin.c | 9 --------- dlls/qcap/pin.h | 1 - 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/qcap/pin.c b/dlls/qcap/pin.c index 44ce5e8..d4ba451 100644 --- a/dlls/qcap/pin.c +++ b/dlls/qcap/pin.c @@ -151,15 +151,6 @@ HRESULT WINAPI IPinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) return (This->fnQueryAccept(This->pUserData, pmt) == S_OK ? S_OK : S_FALSE); } -HRESULT WINAPI IPinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) -{ - IPinImpl *This = (IPinImpl *)iface; - - TRACE("(%p/%p)->(%p, %p)\n", This, iface, apPin, cPin); - - return E_NOTIMPL; /* to tell caller that all input pins connected to all output pins */ -} - /* Function called as a helper to IPin_Connect */ /* specific AM_MEDIA_TYPE - it cannot be NULL */ /* NOTE: not part of standard interface */ diff --git a/dlls/qcap/pin.h b/dlls/qcap/pin.h index 316d3d6..68d3e28 100644 --- a/dlls/qcap/pin.h +++ b/dlls/qcap/pin.h @@ -71,7 +71,6 @@ HRESULT WINAPI IPinImpl_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir); HRESULT WINAPI IPinImpl_QueryId(IPin * iface, LPWSTR * Id); HRESULT WINAPI IPinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI IPinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum); -HRESULT WINAPI IPinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin); /* Output Pin */ HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt);

1 0

Andrew Talbot : cabinet: Declare a function static.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 9a079a64e63e50304efe2873bdc4ab3406a06e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a079a64e63e50304efe2873b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 7 14:32:50 2009 +0000 cabinet: Declare a function static. --- dlls/cabinet/cabinet.h | 3 --- dlls/cabinet/fdi.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index 3423a73..cd82d14 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -653,7 +653,4 @@ typedef struct { struct FILELIST *FilterList; } SESSION; -/* from fdi.c */ -int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table); - #endif /* __WINE_CABINET_H */ diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index bdf64b6..c7749eb 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -220,7 +220,8 @@ static void QTMupdatemodel(struct QTMmodel *model, int sym) { * OK: 0 * error: 1 */ -int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table) { +static int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, + const cab_UBYTE *length, cab_UWORD *table) { register cab_UWORD sym; register cab_ULONG leaf; register cab_UBYTE bit_num = 1;

1 0

Juan Lang : rpcrt4: Don' t abort reading from a pipe if a single read is short.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: 76f4b9b053bbf68676a53046937ffefebaa9dfd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76f4b9b053bbf68676a530469… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 6 15:28:55 2009 -0800 rpcrt4: Don't abort reading from a pipe if a single read is short. --- dlls/rpcrt4/rpc_transport.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 1e759a6..367ca35 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -382,6 +382,8 @@ static int rpcrt4_conn_np_read(RpcConnection *Connection, { DWORD bytes_read; ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, NULL); + if (!ret && GetLastError() == ERROR_MORE_DATA) + ret = TRUE; if (!ret || !bytes_read) break; bytes_left -= bytes_read;

1 0

Juan Lang : cryptui: Delete the private keys if requested when they' re successfully exported.
by Alexandre Julliard Feb. 9, 2009

Feb. 9, 2009

Module: wine Branch: master Commit: c7d65aa7e1a8af75b3efdc5a5a6c4c70291c4650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d65aa7e1a8af75b3efdc5a5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 6 12:35:52 2009 -0800 cryptui: Delete the private keys if requested when they're successfully exported. --- dlls/cryptui/main.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 5cd38e7..af86408 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5519,6 +5519,7 @@ struct ExportWizData CRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO contextInfo; BOOL freePassword; PCRYPT_KEY_PROV_INFO keyProvInfo; + BOOL deleteKeys; LPWSTR fileName; HANDLE file; BOOL success; @@ -5814,7 +5815,7 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, if (IsDlgButtonChecked(hwnd, IDC_EXPORT_PFX_STRONG_ENCRYPTION)) data->contextInfo.fStrongEncryption = TRUE; if (IsDlgButtonChecked(hwnd, IDC_EXPORT_PFX_DELETE_PRIVATE_KEY)) - data->contextInfo.fExportPrivateKeys = TRUE; + data->deleteKeys = TRUE; skipPasswordPage = FALSE; } SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, @@ -6500,7 +6501,7 @@ static BOOL save_serialized_store(HANDLE file, HCERTSTORE store) static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO pContextInfo, - PCRYPT_KEY_PROV_INFO keyProvInfo) + PCRYPT_KEY_PROV_INFO keyProvInfo, BOOL deleteKeys) { HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -6510,6 +6511,7 @@ static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, { CRYPT_DATA_BLOB pfxBlob = { 0, NULL }; PCCERT_CONTEXT cert = NULL; + BOOL freeKeyProvInfo = FALSE; if (pContextInfo->fExportChain) { @@ -6579,7 +6581,7 @@ static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, { ret = CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, keyProvInfo); - HeapFree(GetProcessHeap(), 0, keyProvInfo); + freeKeyProvInfo = TRUE; } } } @@ -6612,6 +6614,16 @@ static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, } } } + if (ret && deleteKeys) + { + HCRYPTPROV prov; + + CryptAcquireContextW(&prov, keyProvInfo->pwszContainerName, + keyProvInfo->pwszProvName, keyProvInfo->dwProvType, + CRYPT_DELETEKEYSET); + } + if (freeKeyProvInfo) + HeapFree(GetProcessHeap(), 0, keyProvInfo); CertFreeCertificateContext(cert); CertCloseStore(store, 0); } @@ -6620,7 +6632,7 @@ static BOOL save_pfx(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO pContextInfo, - PCRYPT_KEY_PROV_INFO keyProvInfo) + PCRYPT_KEY_PROV_INFO keyProvInfo, BOOL deleteKeys) { BOOL ret; @@ -6664,7 +6676,8 @@ static BOOL do_export(HANDLE file, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, pContextInfo->fExportChain); break; case CRYPTUI_WIZ_EXPORT_FORMAT_PFX: - ret = save_pfx(file, pExportInfo, pContextInfo, keyProvInfo); + ret = save_pfx(file, pExportInfo, pContextInfo, keyProvInfo, + deleteKeys); break; default: SetLastError(E_FAIL); @@ -6728,7 +6741,7 @@ static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data = (struct ExportWizData *)GetWindowLongPtrW(hwnd, DWLP_USER); if ((data->success = do_export(data->file, &data->exportInfo, - &data->contextInfo, data->keyProvInfo))) + &data->contextInfo, data->keyProvInfo, data->deleteKeys))) { messageID = IDS_EXPORT_SUCCEEDED; mbFlags = MB_OK; @@ -6788,6 +6801,7 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, min(((PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO)pvoid)->dwSize, sizeof(data.contextInfo))); data.keyProvInfo = NULL; + data.deleteKeys = FALSE; data.fileName = NULL; data.file = INVALID_HANDLE_VALUE; data.success = FALSE; @@ -6933,7 +6947,7 @@ BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent, if (file != INVALID_HANDLE_VALUE) { - ret = do_export(file, pExportInfo, pvoid, NULL); + ret = do_export(file, pExportInfo, pvoid, NULL, FALSE); CloseHandle(file); } else

1 0