August 2008 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Don't use biSizeImage for a BI_BITFIELDS dib.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 67a5f256c46b0d022ac76e5302a4884cf6b11074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a5f256c46b0d022ac76e530… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 29 11:49:58 2008 +0100 gdi32: Don't use biSizeImage for a BI_BITFIELDS dib. --- dlls/gdi32/brush.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 01f69a8..908670e 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -61,7 +61,7 @@ static HGLOBAL16 dib_copy(const BITMAPINFO *info, UINT coloruse) HGLOBAL16 hmem; INT size; - if (info->bmiHeader.biCompression) + if (info->bmiHeader.biCompression != BI_RGB && info->bmiHeader.biCompression != BI_BITFIELDS) size = info->bmiHeader.biSizeImage; else size = DIB_GetDIBImageBytes(info->bmiHeader.biWidth,

1 0

Rob Shearman : oleaut32: Fix invalid free of import library entry name with SLTG typelibs.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: fc269433cefbddc1d727e508b3079c8c8015f752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc269433cefbddc1d727e508b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Aug 14 18:50:57 2008 +0100 oleaut32: Fix invalid free of import library entry name with SLTG typelibs. Use TLB_MultiByteToBSTR to allocate import library entry name in ITypeLib2_Constructor_MSFT as BSTR instead of a normal block of memory to make the allocator the same as for SLTG typelibs. Free the name with SysFreeString instead of TLB_Free. --- dlls/oleaut32/typelib.c | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b058dc5..d7139d2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1436,6 +1436,18 @@ static inline void TLB_FreeCustData(TLBCustData *pCustData) } } +static BSTR TLB_MultiByteToBSTR(const char *ptr) +{ + DWORD len; + BSTR ret; + + len = MultiByteToWideChar(CP_ACP, 0, ptr, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len - 1); + if (!ret) return ret; + MultiByteToWideChar(CP_ACP, 0, ptr, -1, ret, len); + return ret; +} + /********************************************************************** * * Functions for reading MSFT typelibs (those created by CreateTypeLib2) @@ -2699,7 +2711,6 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) while(offset < tlbSegDir.pImpFiles.offset +tlbSegDir.pImpFiles.length) { char *name; - DWORD len; *ppImpLib = TLB_Alloc(sizeof(TLBImpLib)); (*ppImpLib)->offset = offset - tlbSegDir.pImpFiles.offset; @@ -2713,10 +2724,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) size >>= 2; name = TLB_Alloc(size+1); MSFT_Read(name, size, &cx, DO_NOT_SEEK); - len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0 ); - (*ppImpLib)->name = TLB_Alloc(len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, name, -1, (*ppImpLib)->name, len ); - TLB_Free(name); + (*ppImpLib)->name = TLB_MultiByteToBSTR(name); MSFT_ReadGuid(&(*ppImpLib)->guid, oGuid, &cx); offset = (offset + sizeof(INT) + sizeof(DWORD) + sizeof(LCID) + sizeof(UINT16) + size + 3) & ~3; @@ -2750,18 +2758,6 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) } -static BSTR TLB_MultiByteToBSTR(const char *ptr) -{ - DWORD len; - BSTR ret; - - len = MultiByteToWideChar(CP_ACP, 0, ptr, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len - 1); - if (!ret) return ret; - MultiByteToWideChar(CP_ACP, 0, ptr, -1, ret, len); - return ret; -} - static BOOL TLB_GUIDFromString(const char *str, GUID *guid) { char b[3]; @@ -3875,7 +3871,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) { if (pImpLib->pImpTypeLib) ITypeLib_Release((ITypeLib *)pImpLib->pImpTypeLib); - TLB_Free(pImpLib->name); + SysFreeString(pImpLib->name); pImpLibNext = pImpLib->next; TLB_Free(pImpLib);

1 0

Huw Davies : wineps.drv: Make sure we call CreateFontIndirect with zero width, otherwise we' ll get a scaled-width font.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: d84ea74ec887d7659ee6ba20a27cf1c65abcbd58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84ea74ec887d7659ee6ba20a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 5 14:31:16 2008 +0100 wineps.drv: Make sure we call CreateFontIndirect with zero width, otherwise we'll get a scaled-width font. --- dlls/wineps.drv/type1.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index 95534f8..9fe3b39 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -221,6 +221,7 @@ BOOL T1_download_glyph(PSDRV_PDEVICE *physDev, DOWNLOAD *pdl, DWORD index, rc.top = t1->emsize; DPtoLP(physDev->hdc, (POINT*)&rc, 2); lf.lfHeight = -abs(rc.top - rc.bottom); + lf.lfWidth = 0; lf.lfOrientation = lf.lfEscapement = 0; unscaled_font = CreateFontIndirectW(&lf); old_font = SelectObject(physDev->hdc, unscaled_font);

1 0

Rob Shearman : oleaut32: Avoid unnecessary allocations in TLB_MultiByteToBSTR and SLTG_ReadString.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 2fab79955fca7cf6b5a3672d19477425b4ace2f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fab79955fca7cf6b5a3672d1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Aug 14 18:50:49 2008 +0100 oleaut32: Avoid unnecessary allocations in TLB_MultiByteToBSTR and SLTG_ReadString. --- dlls/oleaut32/typelib.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 45c5e13..b058dc5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2753,14 +2753,12 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) static BSTR TLB_MultiByteToBSTR(const char *ptr) { DWORD len; - WCHAR *nameW; BSTR ret; len = MultiByteToWideChar(CP_ACP, 0, ptr, -1, NULL, 0); - nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, ptr, -1, nameW, len); - ret = SysAllocString(nameW); - HeapFree(GetProcessHeap(), 0, nameW); + ret = SysAllocStringLen(NULL, len - 1); + if (!ret) return ret; + MultiByteToWideChar(CP_ACP, 0, ptr, -1, ret, len); return ret; } @@ -2790,16 +2788,14 @@ static WORD SLTG_ReadString(const char *ptr, BSTR *pBstr) { WORD bytelen; DWORD len; - WCHAR *nameW; *pBstr = NULL; bytelen = *(const WORD*)ptr; if(bytelen == 0xffff) return 2; len = MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, NULL, 0); - nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - len = MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, nameW, len); - *pBstr = SysAllocStringLen(nameW, len); - HeapFree(GetProcessHeap(), 0, nameW); + *pBstr = SysAllocStringLen(NULL, len - 1); + if (*pBstr) + len = MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, *pBstr, len); return bytelen + 2; }

1 0

Rob Shearman : rpcrt4: Fix RpcBindingToStringBinding to not generate a UUID string if the object UUID is nil .
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: d2d513db74bfd26068e4ca2f202c2fa8f4292fa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d513db74bfd26068e4ca2f2… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Aug 14 09:15:02 2008 +0100 rpcrt4: Fix RpcBindingToStringBinding to not generate a UUID string if the object UUID is nil. --- dlls/rpcrt4/rpc_binding.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index a439bc3..3f7c31b 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -816,8 +816,13 @@ RPC_STATUS WINAPI RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, RPC_CS TRACE("(%p,%p)\n", Binding, StringBinding); - ret = UuidToStringA(&bind->ObjectUuid, &ObjectUuid); - if (ret != RPC_S_OK) return ret; + if (UuidIsNil(&bind->ObjectUuid, &ret)) + ObjectUuid = NULL; + else + { + ret = UuidToStringA(&bind->ObjectUuid, &ObjectUuid); + if (ret != RPC_S_OK) return ret; + } ret = RpcStringBindingComposeA(ObjectUuid, (unsigned char*)bind->Protseq, (unsigned char*) bind->NetworkAddr, (unsigned char*) bind->Endpoint, NULL, StringBinding);

1 0

Rob Shearman : rpcrt4: Print a warning if connecting to a named pipe failed in rpcrt4_conn_open_pipe in the !wait case .
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 0a5e5a6e5bff3964dba7b718bb3302cbacf08158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5e5a6e5bff3964dba7b718b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Aug 14 09:15:09 2008 +0100 rpcrt4: Print a warning if connecting to a named pipe failed in rpcrt4_conn_open_pipe in the !wait case. --- dlls/rpcrt4/rpc_transport.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 75423b9..adba3c8 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -210,9 +210,7 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, TRACE("connection failed, error=%x\n", err); return RPC_S_SERVER_TOO_BUSY; } - if (!wait) - return RPC_S_SERVER_UNAVAILABLE; - if (!WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { + if (!wait || !WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { err = GetLastError(); WARN("connection failed, error=%x\n", err); return RPC_S_SERVER_UNAVAILABLE;

1 0

Rob Shearman : rpcrt4: Fix RpcStringBindingComposeA/ W and RpcStringBindingParseA/ W to escape and unescape delimiters in the string binding.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: ef5a5a44903e3db469b08f937ef30071e107746b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5a5a44903e3db469b08f937… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Aug 14 09:15:20 2008 +0100 rpcrt4: Fix RpcStringBindingComposeA/W and RpcStringBindingParseA/W to escape and unescape delimiters in the string binding. This behaviour is stated by the DCE/RPC specification and is also shown in the rpcrt4 conformance tests. --- dlls/rpcrt4/rpc_binding.c | 246 ++++++++++++++++++++++++++++++++------------- dlls/rpcrt4/rpc_epmap.c | 2 +- dlls/rpcrt4/tests/rpc.c | 3 - 3 files changed, 177 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef5a5a44903e3db469b08…

1 0

Rob Shearman : include: Fix the WINELIB_NAME_AW macro for RpcBindingToStringBinding.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: f5af8f614fb8a8479340d640757670e1c8c639f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5af8f614fb8a8479340d6407… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Aug 14 09:14:17 2008 +0100 include: Fix the WINELIB_NAME_AW macro for RpcBindingToStringBinding. --- include/rpcdce.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index 6bc6561..8c10233 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -329,7 +329,7 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, RPC_CSTR *StringBinding ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, RPC_WSTR *StringBinding ); -#define RpcBindingFromStringBinding WINELIB_NAME_AW(RpcBindingFromStringBinding) +#define RpcBindingToStringBinding WINELIB_NAME_AW(RpcBindingToStringBinding) RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector );

1 0

Rob Shearman : rpcrt4: Add test for RpcBindingToStringBindingA.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 90bd74081af0d6e0849b96ec4a28dea6958ebae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90bd74081af0d6e0849b96ec4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Aug 14 09:14:52 2008 +0100 rpcrt4: Add test for RpcBindingToStringBindingA. --- dlls/rpcrt4/tests/rpc.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 19a0a94..a32eadd 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -722,6 +722,35 @@ static void test_endpoint_mapper(void) ok(status == RPC_S_OK, "RpcBindingVectorFree failed with error %lu\n", status); } +static void test_RpcStringBindingFromBinding(void) +{ + static unsigned char ncacn_np[] = "ncacn_np"; + static unsigned char address[] = "."; + static unsigned char endpoint[] = "\\pipe\\wine_rpc_test"; + RPC_STATUS status; + handle_t handle; + RPC_CSTR binding; + + status = RpcStringBindingCompose(NULL, ncacn_np, address, + endpoint, NULL, &binding); + ok(status == RPC_S_OK, "RpcStringBindingCompose failed (%lu)\n", status); + + status = RpcBindingFromStringBinding(binding, &handle); + ok(status == RPC_S_OK, "RpcBindingFromStringBinding failed (%lu)\n", status); + RpcStringFree(&binding); + + status = RpcBindingToStringBinding(handle, &binding); + ok(status == RPC_S_OK, "RpcStringBindingFromBinding failed with error %lu\n", status); + + todo_wine + ok(!strcmp((const char *)binding, "ncacn_np:.[\\\\pipe\\\\wine_rpc_test]"), + "binding string didn't match what was expected: \"%s\"\n", binding); + RpcStringFree(&binding); + + status = RpcBindingFree(&handle); + ok(status == RPC_S_OK, "RpcBindingFree failed with error %lu\n", status); +} + START_TEST( rpc ) { trace ( " ** Uuid Conversion and Comparison Tests **\n" ); @@ -734,4 +763,5 @@ START_TEST( rpc ) test_RpcStringBindingParseA(); test_I_RpcExceptionFilter(); test_endpoint_mapper(); + test_RpcStringBindingFromBinding(); }

1 0

Rob Shearman : rpcrt4: Check that strings in SMB, NB and pipe floors are nul-terminated before copying the data.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: ce085ed8ec9bd5b88a58257d3485f8ade1b4578b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce085ed8ec9bd5b88a58257d3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Aug 10 18:24:35 2008 +0100 rpcrt4: Check that strings in SMB, NB and pipe floors are nul-terminated before copying the data. --- dlls/rpcrt4/rpc_transport.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index a797646..75423b9 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -504,7 +504,8 @@ static RPC_STATUS rpcrt4_ncacn_np_parse_top_of_tower(const unsigned char *tower_ if ((smb_floor->count_lhs != sizeof(smb_floor->protid)) || (smb_floor->protid != EPM_PROTOCOL_SMB) || - (smb_floor->count_rhs > tower_size)) + (smb_floor->count_rhs > tower_size) || + (tower_data[smb_floor->count_rhs - 1] != '\0')) return EPT_S_NOT_REGISTERED; if (endpoint) @@ -527,7 +528,8 @@ static RPC_STATUS rpcrt4_ncacn_np_parse_top_of_tower(const unsigned char *tower_ if ((nb_floor->count_lhs != sizeof(nb_floor->protid)) || (nb_floor->protid != EPM_PROTOCOL_NETBIOS) || - (nb_floor->count_rhs > tower_size)) + (nb_floor->count_rhs > tower_size) || + (tower_data[nb_floor->count_rhs - 1] != '\0')) return EPT_S_NOT_REGISTERED; if (networkaddr) @@ -714,7 +716,8 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_top_of_tower(const unsigned char *tower_d if ((pipe_floor->count_lhs != sizeof(pipe_floor->protid)) || (pipe_floor->protid != EPM_PROTOCOL_PIPE) || - (pipe_floor->count_rhs > tower_size)) + (pipe_floor->count_rhs > tower_size) || + (tower_data[pipe_floor->count_rhs - 1] != '\0')) return EPT_S_NOT_REGISTERED; if (networkaddr)

1 0