January 2006 - Wine-commits

Marcus Meissner : winsock: AF_UNSPEC mapping.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 624e028787b7553f3ca25416d8b56260e6ea2b6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=624e028787b7553f3ca2541… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jan 3 12:11:07 2006 +0100 winsock: AF_UNSPEC mapping. Also map AF_UNSPEC sockaddrs in the sockaddr handlers. Zero initialize the sockaddr in ws_sockaddr_alloc(). --- dlls/winsock/socket.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index 75de7f5..e47b182 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -900,7 +900,7 @@ static struct WS_protoent *check_buffer_ * start with. Note that the returned pointer may be the original pointer * if no conversion is necessary. */ -static const struct sockaddr* ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsaddrlen, unsigned int *uaddrlen) +static struct sockaddr* ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsaddrlen, unsigned int *uaddrlen) { switch (wsaddr->sa_family) { @@ -924,7 +924,7 @@ static const struct sockaddr* ws_sockadd #ifdef IPX_FRAME_NONE uipx->sipx_type=IPX_FRAME_NONE; #endif - return (const struct sockaddr*)uipx; + return (struct sockaddr*)uipx; } #endif case WS_AF_INET6: { @@ -943,7 +943,7 @@ static const struct sockaddr* ws_sockadd uin6->sin6_port = win6old->sin6_port; uin6->sin6_flowinfo = win6old->sin6_flowinfo; memcpy(&uin6->sin6_addr,&win6old->sin6_addr,16); /* 16 bytes = 128 address bits */ - return (const struct sockaddr*)uin6; + return (struct sockaddr*)uin6; } if (wsaddrlen>=sizeof(struct WS_sockaddr_in6)) { *uaddrlen=sizeof(struct sockaddr_in6); @@ -953,7 +953,7 @@ static const struct sockaddr* ws_sockadd uin6->sin6_flowinfo = win6->sin6_flowinfo; uin6->sin6_scope_id = win6->sin6_scope_id; memcpy(&uin6->sin6_addr,&win6->sin6_addr,16); /* 16 bytes = 128 address bits */ - return (const struct sockaddr*)uin6; + return (struct sockaddr*)uin6; } FIXME("bad size %d for WS_sockaddr_in6\n",wsaddrlen); return NULL; @@ -969,7 +969,26 @@ static const struct sockaddr* ws_sockadd uin->sin_family = AF_INET; uin->sin_port = win->sin_port; memcpy(&uin->sin_addr,&win->sin_addr,4); /* 4 bytes = 32 address bits */ - return (const struct sockaddr*)uin; + return (struct sockaddr*)uin; + } + case WS_AF_UNSPEC: { + /* Try to determine the needed space by the passed windows sockaddr space */ + switch (wsaddrlen) { + default: /* likely a ipv4 address */ + case sizeof(struct WS_sockaddr_in): + *uaddrlen = sizeof(struct sockaddr_in); + break; +#ifdef HAVE_IPX + case sizeof(struct WS_sockaddr_ipx): + *uaddrlen = sizeof(struct sockaddr_ipx); + break; +#endif + case sizeof(struct WS_sockaddr_in6): + case sizeof(struct WS_sockaddr_in6_old): + *uaddrlen = sizeof(struct sockaddr_in6); + break; + } + return HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,*uaddrlen); } default: FIXME("Unknown address family %d, return NULL.\n", wsaddr->sa_family); @@ -995,7 +1014,7 @@ static inline struct sockaddr* ws_sockad else *uaddrlen=max(sizeof(struct sockaddr),*wsaddrlen); - return HeapAlloc(GetProcessHeap(), 0, *uaddrlen); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *uaddrlen); } /* Returns 0 if successful, -1 if the buffer is too small */ @@ -1083,6 +1102,10 @@ static int ws_sockaddr_u2ws(const struct *wsaddrlen = sizeof(struct WS_sockaddr_in); return 0; } + case AF_UNSPEC: { + memset(wsaddr,0,*wsaddrlen); + return 0; + } default: FIXME("Unknown address family %d\n", uaddr->sa_family); return -1;

1 0

Francois Gouget : Assorted spelling fixes
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 8ca1f3fc146529f5523949ba363d6db2e512be48 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ca1f3fc146529f5523949b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 3 12:10:50 2006 +0100 Assorted spelling fixes --- dlls/ddraw/tests/dsurface.c | 2 +- dlls/user/edit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index e1e0c93..26fe659 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -241,7 +241,7 @@ static void QueryInterface(void) return; } - /* Call IUnkown::QueryInterface */ + /* Call IUnknown::QueryInterface */ ret = IDirectDrawSurface_QueryInterface(dsurface, 0, &object); ok(ret == DDERR_INVALIDPARAMS, "IDirectDrawSurface::QueryInterface returned %lx\n", ret); diff --git a/dlls/user/edit.c b/dlls/user/edit.c index 05575bd..98cf736 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -155,7 +155,7 @@ typedef struct /* * IME Data */ - UINT composition_len; /* lenght of composition, 0 == no composition */ + UINT composition_len; /* length of composition, 0 == no composition */ int composition_start; /* the character position for the composition */ } EDITSTATE;

1 0

Francois Gouget : Add trailing '\n's to ok() calls.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 6526c3772dc8458089a34b4f441704bf84e380f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6526c3772dc8458089a34b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 3 12:10:37 2006 +0100 Add trailing '\n's to ok() calls. Remove spaces before '\n' in traces. --- dlls/shell32/tests/shlfileop.c | 2 +- dlls/wined3d/stateblock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index fe753b7..16a78a3 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -502,7 +502,7 @@ static void test_copy(void) shfo.pTo = "testdir2\0"; retval = SHFileOperation(&shfo); ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", retval); - ok(file_exists("testdir2\\test1.txt"), "Expected testdir2\\test1 to exist"); + ok(file_exists("testdir2\\test1.txt"), "Expected testdir2\\test1 to exist\n"); /* try to copy files to a file */ clean_after_shfo_tests(); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index be4ca95..c1e3e94 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -88,7 +88,7 @@ ULONG WINAPI IWineD3DStateBlockImpl_Rele if (This->textures[counter]) { /* release our 'internal' hold on the texture */ if(0 != IWineD3DBaseTexture_Release(This->textures[counter])) { - TRACE("Texture still referenced by stateblock, applications has leaked Stage = %u Texture = %p \n", counter, This->textures[counter]); + TRACE("Texture still referenced by stateblock, applications has leaked Stage = %u Texture = %p\n", counter, This->textures[counter]); } } }

1 0

Francois Gouget : winapi: Update win32.api to match the current sources.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 19d8a272d3a972a52f5d682d592b2842cb8bd9bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19d8a272d3a972a52f5d682… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 3 12:10:23 2006 +0100 winapi: Update win32.api to match the current sources. --- tools/winapi/win32.api | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 2eb5979..e5a7df8 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -763,6 +763,7 @@ HWND IMAGEHLP_SYMBOL_TYPE_INFO MINIDUMP_TYPE ULONG +unsigned short %longlong @@ -773,6 +774,7 @@ ULONG64 DWORD64 * LPAPI_VERSION +LPEXT_API_VERSION LPSTACKFRAME LPSTACKFRAME64 LPVOID @@ -813,6 +815,7 @@ PSYMBOL_REGISTERED_CALLBACK64 PTRANSLATE_ADDRESS_ROUTINE PTRANSLATE_ADDRESS_ROUTINE64 PVOID +PWINDBG_EXTENSION_APIS ULONG * char ** void * @@ -826,6 +829,10 @@ PCSTR PSTR char * +%void + +void + %%dciman32.dll %long

1 0

Francois Gouget : Small documentation tweaks to avoid winapi_check warnings.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 38884e0347fe9407c34455601df61c1443e8e147 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=38884e0347fe9407c344556… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 3 12:10:09 2006 +0100 Small documentation tweaks to avoid winapi_check warnings. --- dlls/msi/msi.c | 2 +- dlls/wldap32/page.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 0591a42..b80fe91 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -57,7 +57,7 @@ static LONG dll_count; static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; -/********************************************************************** +/* * Dll lifetime tracking declaration */ static void LockModule(void) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 81c6a8f..ef70057 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -187,6 +187,9 @@ ULONG ldap_get_paged_count( WLDAP32_LDAP return ret; } +/*********************************************************************** + * ldap_parse_page_controlA (WLDAP32.@) + */ ULONG ldap_parse_page_controlA( WLDAP32_LDAP *ld, PLDAPControlA *ctrls, ULONG *count, struct WLDAP32_berval **cookie ) { @@ -209,6 +212,9 @@ ULONG ldap_parse_page_controlA( WLDAP32_ return ret; } +/*********************************************************************** + * ldap_parse_page_controlW (WLDAP32.@) + */ ULONG ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls, ULONG *count, struct WLDAP32_berval **cookie ) {

1 0

Francois Gouget : winemenubuilder: Improve traces.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 6f0ff1496629233e66adecdf2a4c1a8d07ab75e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f0ff1496629233e66adecd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 3 12:09:47 2006 +0100 winemenubuilder: Improve traces. Add some traces to make it easier to debug icon generation problems. --- programs/winemenubuilder/winemenubuilder.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 3823142..50fd615 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -162,7 +162,10 @@ static BOOL SaveIconResAsXPM(const BITMA return FALSE; if (!(fXPMFile = fopen(szXPMFileName, "w"))) + { + WINE_TRACE("unable to open '%s' for writing: %s\n", szXPMFileName, strerror(errno)); return FALSE; + } i = WideCharToMultiByte(CP_UNIXCP, 0, commentW, -1, NULL, 0, NULL, NULL); comment = malloc(i); @@ -361,7 +364,10 @@ static int ExtractFromICO(LPCWSTR szFile filename = wine_get_unix_file_name(szFileName); if (!(fICOFile = fopen(filename, "r"))) + { + WINE_TRACE("unable to open '%s' for reading: %s\n", filename, strerror(errno)); goto error1; + } if (fread(&iconDir, sizeof (ICONDIR), 1, fICOFile) != 1) goto error2; @@ -487,15 +493,18 @@ static char *extract_icon( LPCWSTR path, if (!iconsdir) { WCHAR path[MAX_PATH]; - - if (GetTempPathW(MAX_PATH, path)) iconsdir = wine_get_unix_file_name(path); + if (GetTempPathW(MAX_PATH, path)) + iconsdir = wine_get_unix_file_name(path); + if (!iconsdir) + { + WINE_TRACE("no IconsDir\n"); + return NULL; /* No icon created */ + } } - - if (!iconsdir) - return NULL; /* No icon created */ if (!*iconsdir) { + WINE_TRACE("icon generation disabled\n"); HeapFree(GetProcessHeap(), 0, iconsdir); return NULL; /* No icon created */ }

1 0

Dmitry Timoshkov : gdi: Add a test which shows that GDI does not support compressed DIB sections.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 6f7b62b729f1ee79e82c149ed0ca3d1e06d86e38 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f7b62b729f1ee79e82c149… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 3 12:09:22 2006 +0100 gdi: Add a test which shows that GDI does not support compressed DIB sections. --- dlls/gdi/tests/bitmap.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/bitmap.c b/dlls/gdi/tests/bitmap.c index edad192..5eeda35 100644 --- a/dlls/gdi/tests/bitmap.c +++ b/dlls/gdi/tests/bitmap.c @@ -198,9 +198,67 @@ static void test_dibsections(void) COLORREF c0, c1; int i; int screen_depth; + MEMORY_BASIC_INFORMATION info; hdc = GetDC(0); screen_depth = GetDeviceCaps(hdc, BITSPIXEL) * GetDeviceCaps(hdc, PLANES); + + memset(pbmi, 0, sizeof(bmibuf)); + pbmi->bmiHeader.biSize = sizeof(pbmi->bmiHeader); + pbmi->bmiHeader.biHeight = 100; + pbmi->bmiHeader.biWidth = 512; + pbmi->bmiHeader.biBitCount = 24; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biCompression = BI_RGB; + + SetLastError(0xdeadbeef); + hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hdib != NULL, "CreateDIBSection error %ld\n", GetLastError()); + ok(GetObject(hdib, sizeof(DIBSECTION), &dibsec) != 0, "GetObject failed for DIBSection\n"); + ok(dibsec.dsBm.bmBits == bits, "dibsec.dsBits %p != bits %p\n", dibsec.dsBm.bmBits, bits); + + /* test the DIB memory */ + ok(VirtualQuery(bits, &info, sizeof(info)) == sizeof(info), + "VirtualQuery failed\n"); + ok(info.BaseAddress == bits, "%p != %p\n", info.BaseAddress, bits); + ok(info.AllocationBase == bits, "%p != %p\n", info.AllocationBase, bits); + ok(info.AllocationProtect == PAGE_READWRITE, "%lx != PAGE_READWRITE\n", info.AllocationProtect); + ok(info.RegionSize == 0x26000, "0x%lx != 0x26000\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "%lx != MEM_COMMIT\n", info.State); + ok(info.Protect == PAGE_READWRITE, "%lx != PAGE_READWRITE\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "%lx != MEM_PRIVATE\n", info.Type); + + DeleteObject(hdib); + + pbmi->bmiHeader.biBitCount = 8; + pbmi->bmiHeader.biCompression = BI_RLE8; + SetLastError(0xdeadbeef); + hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hdib == NULL, "CreateDIBSection should fail when asked to create a compressed DIB section\n"); + ok(GetLastError() == 0xdeadbeef, "wrong error %ld\n", GetLastError()); + + pbmi->bmiHeader.biBitCount = 16; + pbmi->bmiHeader.biCompression = BI_BITFIELDS; + ((PDWORD)pbmi->bmiColors)[0] = 0xf800; + ((PDWORD)pbmi->bmiColors)[1] = 0x07e0; + ((PDWORD)pbmi->bmiColors)[2] = 0x001f; + SetLastError(0xdeadbeef); + hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hdib != NULL, "CreateDIBSection error %ld\n", GetLastError()); + + /* test the DIB memory */ + ok(VirtualQuery(bits, &info, sizeof(info)) == sizeof(info), + "VirtualQuery failed\n"); + ok(info.BaseAddress == bits, "%p != %p\n", info.BaseAddress, bits); + ok(info.AllocationBase == bits, "%p != %p\n", info.AllocationBase, bits); + ok(info.AllocationProtect == PAGE_READWRITE, "%lx != PAGE_READWRITE\n", info.AllocationProtect); + ok(info.RegionSize == 0x19000, "0x%lx != 0x19000\n", info.RegionSize); + ok(info.State == MEM_COMMIT, "%lx != MEM_COMMIT\n", info.State); + ok(info.Protect == PAGE_READWRITE, "%lx != PAGE_READWRITE\n", info.Protect); + ok(info.Type == MEM_PRIVATE, "%lx != MEM_PRIVATE\n", info.Type); + + DeleteObject(hdib); + memset(pbmi, 0, sizeof(bmibuf)); pbmi->bmiHeader.biSize = sizeof(pbmi->bmiHeader); pbmi->bmiHeader.biHeight = 16;

1 0

Ulrich Czekalla : gdi32: Disallow creation of compressed DIB sections.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 4f5cbfb43d2f4a5f5c9883c28a28c9095c9ac448 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f5cbfb43d2f4a5f5c9883c… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Tue Jan 3 12:09:03 2006 +0100 gdi32: Disallow creation of compressed DIB sections. --- dlls/gdi/dib.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/gdi/dib.c b/dlls/gdi/dib.c index 26b8a1a..b408118 100644 --- a/dlls/gdi/dib.c +++ b/dlls/gdi/dib.c @@ -1148,6 +1148,12 @@ HBITMAP DIB_CreateDIBSection(HDC hdc, co &planes, &bpp, &compression, &sizeImage )) == -1)) return 0; + if (compression != BI_RGB && compression != BI_BITFIELDS) + { + TRACE("can't create a compressed (%lu) dibsection\n", compression); + return 0; + } + if (!(dib = HeapAlloc( GetProcessHeap(), 0, sizeof(*dib) ))) return 0; TRACE("format (%ld,%ld), planes %d, bpp %d, size %ld, %s\n", @@ -1186,12 +1192,7 @@ HBITMAP DIB_CreateDIBSection(HDC hdc, co if( bpp <= 8 ) dib->dsBmih.biClrUsed = 1 << bpp; - /* only use sizeImage if it's valid and we're dealing with a compressed bitmap */ - if (sizeImage && (compression == BI_RLE4 || compression == BI_RLE8)) - dib->dsBmih.biSizeImage = sizeImage; - else - dib->dsBmih.biSizeImage = dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; - + dib->dsBmih.biSizeImage = dib->dsBm.bmWidthBytes * dib->dsBm.bmHeight; /* set dsBitfields values */ if (usage == DIB_PAL_COLORS || bpp <= 8)

1 0

Robert Shearman : ole: Check the return value of IStream_SetSize in IStream_Read.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: dfa74b998ee8729f9129cd72119bf1e36f74fc23 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dfa74b998ee8729f9129cd7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 3 12:07:49 2006 +0100 ole: Check the return value of IStream_SetSize in IStream_Read. Check the return value of IStream_SetSize in IStream_Read, since otherwise execution could continue on and cause heap corruption. --- dlls/ole32/hglobalstream.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index ca73a22..4d1d4b5 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -313,7 +313,12 @@ static HRESULT WINAPI HGLOBALStreamImpl_ if (newSize.u.LowPart > This->streamSize.u.LowPart) { /* grow stream */ - IStream_SetSize(iface, newSize); + HRESULT hr = IStream_SetSize(iface, newSize); + if (FAILED(hr)) + { + ERR("IStream_SetSize failed with error 0x%08lx\n", hr); + return hr; + } } /*

1 0

Robert Shearman : ole: Fix mis-handling of return value in StgStreamImpl_Read.
by Alexandre Julliard 03 Jan '06

03 Jan '06

Module: wine Branch: refs/heads/master Commit: 8f604e925d016a694e8f9d4ee1bf0505f409df23 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f604e925d016a694e8f9d4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 3 12:07:34 2006 +0100 ole: Fix mis-handling of return value in StgStreamImpl_Read. BlockChainStream_ReadAt returns a BOOL, not an HRESULT so change StgStreamImpl_Read to handle this, by returning STG_E_READFAULT on failure. --- dlls/ole32/stg_stream.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 40f0e81..19b8bda 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -249,7 +249,7 @@ static HRESULT WINAPI StgStreamImpl_Read ULONG bytesReadBuffer; ULONG bytesToReadFromBuffer; - HRESULT res = S_FALSE; + HRESULT res; TRACE("(%p, %p, %ld, %p)\n", iface, pv, cb, pcbRead); @@ -282,11 +282,15 @@ static HRESULT WINAPI StgStreamImpl_Read } else if (This->bigBlockChain!=0) { - res = BlockChainStream_ReadAt(This->bigBlockChain, - This->currentPosition, - bytesToReadFromBuffer, - pv, - pcbRead); + BOOL success = BlockChainStream_ReadAt(This->bigBlockChain, + This->currentPosition, + bytesToReadFromBuffer, + pv, + pcbRead); + if (success) + res = S_OK; + else + res = STG_E_READFAULT; } else {

1 0