November 2007 - Wine-Commits

Michael Stefaniuc : urlmon: Rename the wrappers around HeapAlloc() &Co to use the new standard naming.
by Alexandre Julliard Nov. 30, 2007

Nov. 30, 2007

Module: wine Branch: master Commit: 2ad6cc19b71c2ff9f2a67476a9b8ca0e8a3587b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad6cc19b71c2ff9f2a67476a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 29 22:12:34 2007 +0100 urlmon: Rename the wrappers around HeapAlloc() &Co to use the new standard naming. --- dlls/urlmon/bindctx.c | 8 +++--- dlls/urlmon/binding.c | 36 ++++++++++++++++---------------- dlls/urlmon/bindprot.c | 4 +- dlls/urlmon/file.c | 12 +++++----- dlls/urlmon/format.c | 8 +++--- dlls/urlmon/ftp.c | 4 +- dlls/urlmon/http.c | 34 +++++++++++++++--------------- dlls/urlmon/mk.c | 12 +++++----- dlls/urlmon/regsvr.c | 4 +- dlls/urlmon/sec_mgr.c | 22 +++++++++--------- dlls/urlmon/session.c | 12 +++++----- dlls/urlmon/umon.c | 50 ++++++++++++++++++++++---------------------- dlls/urlmon/umstream.c | 28 ++++++++++++------------ dlls/urlmon/urlmon_main.h | 8 +++--- 14 files changed, 121 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ad6cc19b71c2ff9f2a67…

1 0

Stefan Leichter : kernel32: Added stub for FindVolumeClose.
by Alexandre Julliard Nov. 30, 2007

Nov. 30, 2007

Module: wine Branch: master Commit: db24d3af9a6e56c3036ba0a3e5d62dae4f2676d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db24d3af9a6e56c3036ba0a3e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Nov 29 23:41:41 2007 +0100 kernel32: Added stub for FindVolumeClose. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/volume.c | 124 ++++++++++++++++++++++++++---------------- 2 files changed, 78 insertions(+), 48 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bc3ba3a..7bc5db3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -386,7 +386,7 @@ @ stdcall FindResourceExA(long str str long) @ stdcall FindResourceExW(long wstr wstr long) @ stdcall FindResourceW(long wstr wstr) -@ stub FindVolumeClose +@ stdcall FindVolumeClose(ptr) @ stdcall FindVolumeMountPointClose(ptr) @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 5ebe91f..655fda1 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -58,11 +58,14 @@ enum fs_type { FS_ERROR, /* error accessing the device */ FS_UNKNOWN, /* unknown file system */ + FS_PLACEHOLDER, /* Wine placeholder for drive device */ FS_FAT1216, FS_FAT32, FS_ISO9660 }; +static const char wine_placeholder[] = "Wine device placeholder"; + static const WCHAR drive_types[][8] = { { 0 }, /* DRIVE_UNKNOWN */ @@ -161,6 +164,52 @@ static BOOL open_device_root( LPCWSTR root, HANDLE *handle ) return TRUE; } +/* get the label by reading it from a file at the root of the filesystem */ +static void get_filesystem_label( const WCHAR *device, WCHAR *label, DWORD len ) +{ + HANDLE handle; + WCHAR labelW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; + + labelW[0] = device[4]; + handle = CreateFileW( labelW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + char buffer[256], *p; + DWORD size; + + if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; + CloseHandle( handle ); + p = buffer + size; + while (p > buffer && (p[-1] == ' ' || p[-1] == '\r' || p[-1] == '\n')) p--; + *p = 0; + if (!MultiByteToWideChar( CP_UNIXCP, 0, buffer, -1, label, len )) + label[len-1] = 0; + } + else label[0] = 0; +} + +/* get the serial number by reading it from a file at the root of the filesystem */ +static DWORD get_filesystem_serial( const WCHAR *device ) +{ + HANDLE handle; + WCHAR serialW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; + + serialW[0] = device[4]; + handle = CreateFileW( serialW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + char buffer[32]; + DWORD size; + + if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; + CloseHandle( handle ); + buffer[size] = 0; + return strtoul( buffer, NULL, 16 ); + } + else return 0; +} /* fetch the type of a drive from the registry */ static UINT get_registry_drive_type( const WCHAR *root ) @@ -256,10 +305,15 @@ static enum fs_type VOLUME_ReadFATSuperblock( HANDLE handle, BYTE *buff ) /* try a fixed disk, with a FAT partition */ if (SetFilePointer( handle, 0, NULL, FILE_BEGIN ) != 0 || - !ReadFile( handle, buff, SUPERBLOCK_SIZE, &size, NULL ) || - size != SUPERBLOCK_SIZE) + !ReadFile( handle, buff, SUPERBLOCK_SIZE, &size, NULL )) return FS_ERROR; + if (size >= sizeof(wine_placeholder)-1 && + !memcmp( buff, wine_placeholder, sizeof(wine_placeholder)-1 )) + return FS_PLACEHOLDER; + + if (size != SUPERBLOCK_SIZE) return FS_ERROR; + /* FIXME: do really all FAT have their name beginning with * "FAT" ? (At least FAT12, FAT16 and FAT32 have :) */ @@ -332,7 +386,7 @@ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) /************************************************************************** * VOLUME_GetSuperblockLabel */ -static void VOLUME_GetSuperblockLabel( enum fs_type type, const BYTE *superblock, +static void VOLUME_GetSuperblockLabel( const WCHAR *device, enum fs_type type, const BYTE *superblock, WCHAR *label, DWORD len ) { const BYTE *label_ptr = NULL; @@ -344,6 +398,9 @@ static void VOLUME_GetSuperblockLabel( enum fs_type type, const BYTE *superblock case FS_UNKNOWN: label_len = 0; break; + case FS_PLACEHOLDER: + get_filesystem_label( device, label, len ); + break; case FS_FAT1216: label_ptr = superblock + 0x2b; label_len = 11; @@ -384,13 +441,15 @@ static void VOLUME_GetSuperblockLabel( enum fs_type type, const BYTE *superblock /************************************************************************** * VOLUME_GetSuperblockSerial */ -static DWORD VOLUME_GetSuperblockSerial( enum fs_type type, const BYTE *superblock ) +static DWORD VOLUME_GetSuperblockSerial( const WCHAR *device, enum fs_type type, const BYTE *superblock ) { switch(type) { case FS_ERROR: case FS_UNKNOWN: break; + case FS_PLACEHOLDER: + return get_filesystem_serial( device ); case FS_FAT1216: return GETLONG( superblock, 0x27 ); case FS_FAT32: @@ -519,8 +578,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, TRACE( "%s: found fs type %d\n", debugstr_w(device), type ); if (type == FS_ERROR) return FALSE; - if (label && label_len) VOLUME_GetSuperblockLabel( type, superblock, label, label_len ); - if (serial) *serial = VOLUME_GetSuperblockSerial( type, superblock ); + if (label && label_len) VOLUME_GetSuperblockLabel( device, type, superblock, label, label_len ); + if (serial) *serial = VOLUME_GetSuperblockSerial( device, type, superblock ); goto fill_fs_info; } else TRACE( "cannot open device %s: err %d\n", debugstr_w(device), GetLastError() ); @@ -544,47 +603,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, break; } - if (label && label_len) - { - WCHAR labelW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; - - labelW[0] = device[4]; - handle = CreateFileW( labelW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - char buffer[256], *p; - DWORD size; - - if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; - CloseHandle( handle ); - p = buffer + size; - while (p > buffer && (p[-1] == ' ' || p[-1] == '\r' || p[-1] == '\n')) p--; - *p = 0; - if (!MultiByteToWideChar( CP_UNIXCP, 0, buffer, -1, label, label_len )) - label[label_len-1] = 0; - } - else label[0] = 0; - } - if (serial) - { - WCHAR serialW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; - - serialW[0] = device[4]; - handle = CreateFileW( serialW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - char buffer[32]; - DWORD size; - - if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; - CloseHandle( handle ); - buffer[size] = 0; - *serial = strtoul( buffer, NULL, 16 ); - } - else *serial = 0; - } + if (label && label_len) get_filesystem_label( device, label, label_len ); + if (serial) *serial = get_filesystem_serial( device ); fill_fs_info: /* now fill in the information that depends on the file system type */ @@ -1428,6 +1448,16 @@ HANDLE WINAPI FindFirstVolumeMountPointW(LPCWSTR root, LPWSTR mount_point, DWORD } /*********************************************************************** + * FindVolumeClose (KERNEL32.@) + */ +BOOL WINAPI FindVolumeClose(HANDLE handle) +{ + FIXME("(%p), stub!\n", handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * FindVolumeMountPointClose (KERNEL32.@) */ BOOL WINAPI FindVolumeMountPointClose(HANDLE h)

1 0

Rob Shearman : rpcrt4: Fix NdrSimpleStructUnmarshall to cope with [in, out] embedded pointers.
by Alexandre Julliard Nov. 30, 2007

Nov. 30, 2007

Module: wine Branch: master Commit: c735a14788011a139b55751c051809d14df9dde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c735a14788011a139b55751c0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 29 17:35:40 2007 +0000 rpcrt4: Fix NdrSimpleStructUnmarshall to cope with [in, out] embedded pointers. --- dlls/rpcrt4/ndr_marshall.c | 26 +++++++++++++------------- dlls/rpcrt4/tests/server.c | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f895376..8300b64 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1715,28 +1715,28 @@ unsigned char * WINAPI NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char fMustAlloc) { unsigned size = *(const WORD*)(pFormat+2); + unsigned char *saved_buffer; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); ALIGN_POINTER(pStubMsg->Buffer, pFormat[1] + 1); - pStubMsg->BufferMark = pStubMsg->Buffer; - - if (fMustAlloc) { + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); - safe_copy_from_buffer(pStubMsg, *ppMemory, size); - } else { - if (!pStubMsg->IsClient && !*ppMemory) { + else + { + if (!pStubMsg->IsClient && !*ppMemory) /* for servers, we just point straight into the RPC buffer */ *ppMemory = pStubMsg->Buffer; - safe_buffer_increment(pStubMsg, size); - } - else - /* for clients, memory should be provided by caller */ - safe_copy_from_buffer(pStubMsg, *ppMemory, size); } - if (pFormat[0] != RPC_FC_STRUCT) - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, *ppMemory, pFormat+4, TRUE /* FIXME */); + saved_buffer = pStubMsg->BufferMark = pStubMsg->Buffer; + safe_buffer_increment(pStubMsg, size); + if (pFormat[0] == RPC_FC_PSTRUCT) + EmbeddedPointerUnmarshall(pStubMsg, saved_buffer, *ppMemory, pFormat+4, fMustAlloc); + + TRACE("copying %p to %p\n", saved_buffer, *ppMemory); + if (*ppMemory != saved_buffer) + memcpy(*ppMemory, saved_buffer, size); return NULL; } diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index ad0dd73..20e6033 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -876,7 +876,6 @@ pointer_tests(void) name.size = 10; name.name = buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, name.size); get_name(&name); - todo_wine ok(name.name == buffer, "[in,out] pointer should have stayed as %p but instead changed to %p\n", name.name, buffer); HeapFree(GetProcessHeap(), 0, name.name);

1 0

Rob Shearman : rpcrt4: Move forcing of fMustAlloc to NULL to the callers of EmbeddedPointerUnmarshall .
by Alexandre Julliard Nov. 30, 2007

Nov. 30, 2007

Module: wine Branch: master Commit: 4e8f69ac2d8d7edc8f68068e23d1a161f8f06662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e8f69ac2d8d7edc8f68068e2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 29 17:35:29 2007 +0000 rpcrt4: Move forcing of fMustAlloc to NULL to the callers of EmbeddedPointerUnmarshall. This will enable them to be individually fixed up to use memory if it was provided by the caller. --- dlls/rpcrt4/ndr_marshall.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 9394251..f665f1c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1322,7 +1322,7 @@ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, for (u=0; u<count; u++,info+=8) { unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; - PointerUnmarshall(pStubMsg, bufptr, (unsigned char**)memptr, info+4, TRUE); + PointerUnmarshall(pStubMsg, bufptr, (unsigned char**)memptr, info+4, fMustAlloc); } } pFormat += 8 * count; @@ -1692,7 +1692,7 @@ unsigned char * WINAPI NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, } if (pFormat[0] != RPC_FC_STRUCT) - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat+4, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat+4, TRUE /* FIXME */); return NULL; } @@ -2579,7 +2579,7 @@ unsigned char * WINAPI NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_from_buffer(pStubMsg, *ppMemory, size); - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; } @@ -2723,7 +2723,7 @@ unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pS *ppMemory = NdrAllocate(pStubMsg, memsize); safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; } @@ -3471,7 +3471,7 @@ unsigned char * WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMs safe_copy_from_buffer(pStubMsg, *ppMemory, pCStructFormat->memory_size + bufsize); if (pCStructFormat->type == RPC_FC_CPSTRUCT) - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; } @@ -3721,7 +3721,7 @@ unsigned char * WINAPI NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE else if (cvarray_type == RPC_FC_C_WSTRING) TRACE("string=%s\n", debugstr_w((WCHAR *)(*ppMemory + pCVStructFormat->memory_size))); - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; } @@ -4025,7 +4025,7 @@ unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_from_buffer(pStubMsg, *ppMemory, total_size); - pFormat = EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + pFormat = EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; } @@ -4255,7 +4255,7 @@ unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, *ppMemory = NdrAllocate(pStubMsg, size); safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, TRUE /* FIXME */); return NULL; }

1 0

Rob Shearman : rpcrt4: EmbeddedPointerUnmarshall doesn' t need to change the address of the allocated memory, so reduce the level of indirection of the memory parameter by one.
by Alexandre Julliard Nov. 30, 2007

Nov. 30, 2007

Module: wine Branch: master Commit: 43e0c67fe2ee1fc1fa2f3983cc08d43c3a59b2b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e0c67fe2ee1fc1fa2f3983c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 29 17:35:22 2007 +0000 rpcrt4: EmbeddedPointerUnmarshall doesn't need to change the address of the allocated memory, so reduce the level of indirection of the memory parameter by one. --- dlls/rpcrt4/ndr_marshall.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 35028b4..9394251 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1268,7 +1268,7 @@ static unsigned char * EmbeddedPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, * EmbeddedPointerUnmarshall */ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, - unsigned char **ppMemory, + unsigned char *pMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) { @@ -1277,7 +1277,7 @@ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned i; unsigned char *saved_buffer = NULL; - TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + TRACE("(%p,%p,%p,%d)\n", pStubMsg, pMemory, pFormat, fMustAlloc); if (*pFormat != RPC_FC_PP) return NULL; pFormat += 2; @@ -1315,7 +1315,7 @@ static unsigned char * EmbeddedPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, } for (i = 0; i < rep; i++) { PFORMAT_STRING info = pFormat; - unsigned char *membase = *ppMemory + (i * stride); + unsigned char *membase = pMemory + (i * stride); unsigned char *bufbase = Mark + (i * stride); unsigned u; @@ -1692,7 +1692,7 @@ unsigned char * WINAPI NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, } if (pFormat[0] != RPC_FC_STRUCT) - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat+4, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat+4, fMustAlloc); return NULL; } @@ -2579,7 +2579,7 @@ unsigned char * WINAPI NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_from_buffer(pStubMsg, *ppMemory, size); - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; } @@ -2723,7 +2723,7 @@ unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pS *ppMemory = NdrAllocate(pStubMsg, memsize); safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; } @@ -3471,7 +3471,7 @@ unsigned char * WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMs safe_copy_from_buffer(pStubMsg, *ppMemory, pCStructFormat->memory_size + bufsize); if (pCStructFormat->type == RPC_FC_CPSTRUCT) - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; } @@ -3721,7 +3721,7 @@ unsigned char * WINAPI NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE else if (cvarray_type == RPC_FC_C_WSTRING) TRACE("string=%s\n", debugstr_w((WCHAR *)(*ppMemory + pCVStructFormat->memory_size))); - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; } @@ -4025,7 +4025,7 @@ unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_from_buffer(pStubMsg, *ppMemory, total_size); - pFormat = EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + pFormat = EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; } @@ -4255,7 +4255,7 @@ unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, *ppMemory = NdrAllocate(pStubMsg, size); safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); - EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, pFormat, fMustAlloc); return NULL; }

1 0

Rob Shearman : rpcrt4: Errors in sending or receiving packets should result in RPC_S_CALL_FAILED being returned , not RPC_S_PROTOCOL_ERROR.
by Alexandre Julliard Nov. 30, 2007

Nov. 30, 2007

Module: wine Branch: master Commit: 34522de870f14af0ed3bcffd24cd9138e6270098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34522de870f14af0ed3bcffd2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 29 15:42:20 2007 +0000 rpcrt4: Errors in sending or receiving packets should result in RPC_S_CALL_FAILED being returned, not RPC_S_PROTOCOL_ERROR. --- dlls/rpcrt4/rpc_message.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 91572b1..5b4d30e 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -532,7 +532,7 @@ write: if (count<0) { WARN("rpcrt4_conn_write failed (auth)\n"); RPCRT4_SetThreadCurrentConnection(NULL); - return RPC_S_PROTOCOL_ERROR; + return RPC_S_CALL_FAILED; } buffer_pos += Header->common.frag_len - hdr_size - alen - auth_pad_len; @@ -708,7 +708,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, dwRead = rpcrt4_conn_read(Connection, &common_hdr, sizeof(common_hdr)); if (dwRead != sizeof(common_hdr)) { WARN("Short read of header, %d bytes\n", dwRead); - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_CALL_FAILED; goto fail; } @@ -734,7 +734,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, dwRead = rpcrt4_conn_read(Connection, &(*Header)->common + 1, hdr_length - sizeof(common_hdr)); if (dwRead != hdr_length - sizeof(common_hdr)) { WARN("bad header length, %d bytes, hdr_length %d\n", dwRead, hdr_length); - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_CALL_FAILED; goto fail; } @@ -760,7 +760,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, if (auth_length) { auth_data = HeapAlloc(GetProcessHeap(), 0, RPC_AUTH_VERIFIER_LEN(&common_hdr)); if (!auth_data) { - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_OUT_OF_RESOURCES; goto fail; } } @@ -806,7 +806,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, (unsigned char *)pMsg->Buffer + buffer_length, data_length); if (dwRead != data_length) { WARN("bad data length, %d/%ld\n", dwRead, data_length); - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_CALL_FAILED; goto fail; } @@ -826,7 +826,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, if (dwRead != header_auth_len) { WARN("bad authentication data length, %d/%d\n", dwRead, header_auth_len); - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_CALL_FAILED; goto fail; } @@ -854,7 +854,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection *Connection, RpcPktHdr **Header, dwRead = rpcrt4_conn_read(Connection, *Header, hdr_length); if (dwRead != hdr_length) { WARN("invalid packet header size (%d)\n", dwRead); - status = RPC_S_PROTOCOL_ERROR; + status = RPC_S_CALL_FAILED; goto fail; }

1 0

Alexander Nicolaysen Sørnes : vendor: Order application list by name
by Chris Morgan Nov. 30, 2007

Nov. 30, 2007

Module: appdb Branch: master Commit: 31750b9de02fa6a56d819b7393d1d5c95164ffc8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=31750b9de02fa6a56d819b73… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Nov 29 23:54:31 2007 +0100 vendor: Order application list by name --- include/vendor.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index 409467f..0690415 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -47,7 +47,7 @@ class Vendor { */ $sQuery = "SELECT appId FROM appFamily - WHERE vendorId = '?'"; + WHERE vendorId = '?' ORDER by appName"; if($hResult = query_parameters($sQuery, $this->iVendorId)) { while($oRow = query_fetch_object($hResult))

1 0

Louis Lenders : advapi32: Add stub for CreateProcessWithLogonW.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: defbdf76e5d01c6e134edd0bc2589f6d7d10ad61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=defbdf76e5d01c6e134edd0bc… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Nov 27 20:48:53 2007 +0000 advapi32: Add stub for CreateProcessWithLogonW. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 9724113..1a346b5 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -96,7 +96,7 @@ @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) # @ stub CreateProcessAsUserSecure @ stdcall CreateProcessAsUserW(long str str ptr ptr long long ptr str ptr ptr) -# @ stub CreateProcessWithLogonW +@ stdcall CreateProcessWithLogonW(wstr wstr wstr long wstr wstr long ptr wstr ptr ptr) # @ stub CreateRestrictedToken @ stdcall CreateServiceA(long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) @ stdcall CreateServiceW (long ptr ptr long long long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4fdbb54..9b32fdd 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -4253,6 +4253,21 @@ BOOL WINAPI CreateProcessAsUserW( } /****************************************************************************** + * CreateProcessWithLogonW + */ +BOOL WINAPI CreateProcessWithLogonW( LPCWSTR lpUsername, LPCWSTR lpDomain, LPCWSTR lpPassword, DWORD dwLogonFlags, + LPCWSTR lpApplicationName, LPWSTR lpCommandLine, DWORD dwCreationFlags, LPVOID lpEnvironment, + LPCWSTR lpCurrentDirectory, LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation ) +{ + FIXME("%s %s %s 0x%08x %s %s 0x%08x %p %s %p %p stub\n", debugstr_w(lpUsername), debugstr_w(lpDomain), + debugstr_w(lpPassword), dwLogonFlags, debugstr_w(lpApplicationName), + debugstr_w(lpCommandLine), dwCreationFlags, lpEnvironment, debugstr_w(lpCurrentDirectory), + lpStartupInfo, lpProcessInformation); + + return FALSE; +} + +/****************************************************************************** * DuplicateTokenEx [ADVAPI32.@] */ BOOL WINAPI DuplicateTokenEx(

1 0

Gerald Pfeifer : gdi32: Fix the type of two loop variables.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: 24186d42dae5f34c278895b6353ea8af7f376577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24186d42dae5f34c278895b63… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Nov 28 23:18:12 2007 +0100 gdi32: Fix the type of two loop variables. --- dlls/gdi32/font.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 3b6ec3b..1b80df1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2128,7 +2128,8 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, { HFONT orig_font = dc->hFont, cur_font; UINT glyph; - INT span = 0, *offsets = NULL, i; + INT span = 0, *offsets = NULL; + unsigned int i; glyphs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WORD)); for(i = 0; i < count; i++) @@ -2138,7 +2139,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, { if(!offsets) { - int j; + unsigned int j; offsets = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*deltas)); offsets[0] = 0; if(!deltas)

1 0

Gerald Pfeifer : winedbg: Warning fixes.
by Alexandre Julliard Nov. 29, 2007

Nov. 29, 2007

Module: wine Branch: master Commit: cdaf13052a58ae412a1909ee785a5e10c7cb518b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdaf13052a58ae412a1909ee7… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 29 00:11:13 2007 +0100 winedbg: Warning fixes. --- programs/winedbg/info.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index a71961e..2c56d8f 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -201,7 +201,7 @@ static BOOL CALLBACK info_mod_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) void info_win32_module(DWORD64 base) { struct info_module im; - int i, j, num_printed = 0; + UINT i, j, num_printed = 0; DWORD opt; if (!dbg_curr_process) @@ -388,7 +388,6 @@ void info_win32_window(HWND hWnd, BOOL detailed) char wndName[128]; RECT clientRect; RECT windowRect; - int i; WORD w; if (!IsWindow(hWnd)) hWnd = GetDesktopWindow(); @@ -434,6 +433,8 @@ void info_win32_window(HWND hWnd, BOOL detailed) if (GetClassLong(hWnd, GCL_CBWNDEXTRA)) { + UINT i; + dbg_printf("Extra bytes:"); for (i = 0; i < GetClassLong(hWnd, GCL_CBWNDEXTRA) / 2; i++) {

1 0