September 2018 - Wine-Commits

Józef Kucia : wined3d: Add GPU information for Intel HD Graphics 630.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: c9561dcfdce7172ace9e255b9ff44a2b4985c9dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9561dcfdce7172ace9e255b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 22:45:01 2018 +0200 wined3d: Add GPU information for Intel HD Graphics 630. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5757c2c8c63bc0175556cdb5cf0655ad0e9c94ce) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6790a71..e8b2607 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1526,6 +1526,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8afcc9b..b8a3788 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2476,6 +2476,7 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_HD630 = 0x5912, }; struct wined3d_fbo_ops

1 0

Piotr Caban : msi: Fix condition evaluation when comparing literal and integer.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: c32f85c5f41989d532cc730ff1d6f585111a9692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c32f85c5f41989d532cc730f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 13 13:12:51 2018 +0200 msi: Fix condition evaluation when comparing literal and integer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45445 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7837ae20cdeabab661da7bb5dae24f5ffefe17ee) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/cond.y | 2 +- dlls/msi/tests/package.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 6ee6ab9..3a0d028 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -218,7 +218,7 @@ boolean_factor: } else if ($1.type == VALUE_LITERAL || $3.type == VALUE_LITERAL) { - $$ = FALSE; + $$ = ($2 == COND_NE || $2 == COND_INE ); } else if ($1.type == VALUE_SYMBOL) /* symbol operator integer */ { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 2022953..cfd5489 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2071,6 +2071,10 @@ static void test_condition(void) ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "&nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "&nofeature<>3"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + r = MsiEvaluateConditionA(hpkg, "\"\"<>3"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); r = MsiEvaluateConditionA(hpkg, "!nofeature=\"\""); ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); MsiEvaluateConditionA(hpkg, "$nocomponent=\"\"");

1 0

Vincent Povirk : mscoree: Use upgrade code to find installed Wine Mono version.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 1e871af6b317405a78ba0de0606012187e64b105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e871af6b317405a78ba0de0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 16 13:57:29 2018 -0500 mscoree: Use upgrade code to find installed Wine Mono version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45317 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cb6e92d3287e9768b2e535c0b3fa159b19ec26cf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/mscoree_main.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 42f8169..c4876fe 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -669,8 +669,10 @@ static BOOL install_wine_mono(void) { BOOL is_wow64 = FALSE; HMODULE hmsi; + UINT (WINAPI *pMsiEnumRelatedProductsA)(LPCSTR,DWORD,DWORD,LPSTR); UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); char versionstringbuf[15]; + char productcodebuf[39]; UINT res; DWORD buffer_size; PROCESS_INFORMATION pi; @@ -681,7 +683,7 @@ static BOOL install_wine_mono(void) BOOL ret; static const char* mono_version = "4.7.1"; - static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; + static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; static const WCHAR argsW[] = @@ -703,11 +705,22 @@ static BOOL install_wine_mono(void) return FALSE; } - pMsiGetProductInfoA = (void*)GetProcAddress(hmsi, "MsiGetProductInfoA"); + pMsiEnumRelatedProductsA = (void*)GetProcAddress(hmsi, "MsiEnumRelatedProductsA"); - buffer_size = sizeof(versionstringbuf); + res = pMsiEnumRelatedProductsA(mono_upgrade_code, 0, 0, productcodebuf); - res = pMsiGetProductInfoA(mono_product_code, "VersionString", versionstringbuf, &buffer_size); + if (res == ERROR_SUCCESS) + { + pMsiGetProductInfoA = (void*)GetProcAddress(hmsi, "MsiGetProductInfoA"); + + buffer_size = sizeof(versionstringbuf); + + res = pMsiGetProductInfoA(productcodebuf, "VersionString", versionstringbuf, &buffer_size); + } + else if (res != ERROR_NO_MORE_ITEMS) + { + ERR("MsiEnumRelatedProducts failed, err=%u\n", res); + } FreeLibrary(hmsi);

1 0

Fabian Maurer : wrc: Don' t crash when parsing COMBOBOX element without style.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 56cc1b8af24488d9a7a972f0b6d234a9ec23cd8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=56cc1b8af24488d9a7a972f0… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Jul 20 17:33:12 2018 +0200 wrc: Don't crash when parsing COMBOBOX element without style. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c0dfdbcf7b07d5f456a4669cf215f77135484e47) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/wrc/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 0f73f90..8196e9f 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -1969,7 +1969,7 @@ static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control defaultstyle |= LBS_NOTIFY | WS_BORDER; break; case CT_COMBOBOX: - if (!(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST))) + if (!ctrl->gotstyle || !(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST))) defaultstyle |= CBS_SIMPLE; break; case CT_STATIC:

1 0

Vincent Povirk : gdi32: Check that emf records are within the file.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: cb42844c7e3f952bdf0a59bad87c50f3820e8a55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb42844c7e3f952bdf0a59ba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 12:46:20 2018 -0500 gdi32: Check that emf records are within the file. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b6da3547d8990c3c3affc3a5865aefd2a0946949) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 045015f..2f6c794 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2469,6 +2469,14 @@ BOOL WINAPI EnumEnhMetaFile( { emr = (ENHMETARECORD *)((char *)emh + offset); + if (offset + 8 > emh->nBytes || + offset > offset + emr->nSize || + offset + emr->nSize > emh->nBytes) + { + WARN("record truncated\n"); + break; + } + /* In Win9x mode we update the xform if the record will produce output */ if (hdc && IS_WIN9X() && emr_produces_output(emr->iType)) EMF_Update_MF_Xform(hdc, info);

1 0

Vincent Povirk : gdi32: Check for truncated EMF files.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: e2546a64c6f94d8ab1708f7950a787771804bf13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2546a64c6f94d8ab1708f79… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 12:46:19 2018 -0500 gdi32: Check for truncated EMF files. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8d2676fd14f130f9e8f06744743423168bf8d18d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 25 +++++++++++++++++++------ dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 111fa43..045015f 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -246,11 +246,16 @@ static inline BOOL is_dib_monochrome( const BITMAPINFO* info ) /**************************************************************************** * EMF_Create_HENHMETAFILE */ -HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) +HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on_disk ) { HENHMETAFILE hmf; ENHMETAFILEOBJ *metaObj; + if (filesize < sizeof(*emh)) + { + WARN("File too small for emf header\n"); + return 0; + } if (emh->iType != EMR_HEADER) { SetLastError(ERROR_INVALID_DATA); @@ -263,6 +268,11 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) emh->iType, emh->dSignature); return 0; } + if (filesize < emh->nBytes) + { + WARN("File truncated (got %u bytes, header says %u)\n", emh->nBytes, filesize); + return 0; + } if (!(metaObj = HeapAlloc( GetProcessHeap(), 0, sizeof(*metaObj) ))) return 0; @@ -317,14 +327,17 @@ static HENHMETAFILE EMF_GetEnhMetaFile( HANDLE hFile ) ENHMETAHEADER *emh; HANDLE hMapping; HENHMETAFILE hemf; + DWORD filesize; + + filesize = GetFileSize( hFile, NULL ); hMapping = CreateFileMappingA( hFile, NULL, PAGE_READONLY, 0, 0, NULL ); - emh = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, 0 ); + emh = MapViewOfFile( hMapping, FILE_MAP_READ, 0, 0, filesize ); CloseHandle( hMapping ); if (!emh) return 0; - hemf = EMF_Create_HENHMETAFILE( emh, TRUE ); + hemf = EMF_Create_HENHMETAFILE( emh, filesize, TRUE ); if (!hemf) UnmapViewOfFile( emh ); return hemf; @@ -467,7 +480,7 @@ HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT bufsize, const BYTE *buf) ENHMETAHEADER *emh = HeapAlloc( GetProcessHeap(), 0, bufsize ); HENHMETAFILE hmf; memmove(emh, buf, bufsize); - hmf = EMF_Create_HENHMETAFILE( emh, FALSE ); + hmf = EMF_Create_HENHMETAFILE( emh, bufsize, FALSE ); if (!hmf) HeapFree( GetProcessHeap(), 0, emh ); return hmf; @@ -2561,7 +2574,7 @@ HENHMETAFILE WINAPI CopyEnhMetaFileA( if (!file) { emrDst = HeapAlloc( GetProcessHeap(), 0, emrSrc->nBytes ); memcpy( emrDst, emrSrc, emrSrc->nBytes ); - hmfDst = EMF_Create_HENHMETAFILE( emrDst, FALSE ); + hmfDst = EMF_Create_HENHMETAFILE( emrDst, emrSrc->nBytes, FALSE ); if (!hmfDst) HeapFree( GetProcessHeap(), 0, emrDst ); } else { @@ -2603,7 +2616,7 @@ HENHMETAFILE WINAPI CopyEnhMetaFileW( if (!file) { emrDst = HeapAlloc( GetProcessHeap(), 0, emrSrc->nBytes ); memcpy( emrDst, emrSrc, emrSrc->nBytes ); - hmfDst = EMF_Create_HENHMETAFILE( emrDst, FALSE ); + hmfDst = EMF_Create_HENHMETAFILE( emrDst, emrSrc->nBytes, FALSE ); if (!hmfDst) HeapFree( GetProcessHeap(), 0, emrDst ); } else { diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 6f9a956..4872efd 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -528,7 +528,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ CloseHandle( physDev->hFile ); } - hmf = EMF_Create_HENHMETAFILE( physDev->emh, (physDev->hFile != 0) ); + hmf = EMF_Create_HENHMETAFILE( physDev->emh, physDev->emh->nBytes, (physDev->hFile != 0) ); physDev->emh = NULL; /* So it won't be deleted */ free_dc_ptr( dc ); return hmf; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4236aa3..fc2dc91 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -268,7 +268,7 @@ extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HI extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; /* enhmetafile.c */ -extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) DECLSPEC_HIDDEN; +extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on_disk ) DECLSPEC_HIDDEN; /* freetype.c */

1 0

Alex Henrie : gdi32: Fix memory leak on error in PATH_WidenPath (Coverity) .
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 47911f80251b002e2fd3f76fc1248cdb3f2e7531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47911f80251b002e2fd3f76f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 1 07:15:44 2018 -0600 gdi32: Fix memory leak on error in PATH_WidenPath (Coverity). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7c57461d299620f2e0fa3b9f02bdbe910de41e75) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/path.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 51334b2..04fa678 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1749,6 +1749,9 @@ static struct gdi_path *PATH_WidenPath(DC *dc) break; default: ERR("Got path flag %c\n", flat_path->flags[i]); + for(i = 0; i < numStrokes; i++) free_gdi_path(pStrokes[i]); + HeapFree(GetProcessHeap(), 0, pStrokes); + free_gdi_path(flat_path); return NULL; } }

1 0

Louis Lenders : ntoskrnl.exe: Add stub for IoUnregisterPlugPlayNotification.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: be4b62e892651ffd79125cff56ac75553a4b25a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be4b62e892651ffd79125cff… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jun 26 17:05:31 2018 +0200 ntoskrnl.exe: Add stub for IoUnregisterPlugPlayNotification. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 37e22ebb33ddc205bd2c364e9bc79e263c92325b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1e63e3f..521350b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2682,6 +2682,15 @@ NTSTATUS WINAPI IoRegisterPlugPlayNotification(IO_NOTIFICATION_EVENT_CATEGORY ca } /***************************************************** + * IoUnregisterPlugPlayNotification (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoUnregisterPlugPlayNotification(PVOID notification) +{ + FIXME("stub: %p\n", notification); + return STATUS_SUCCESS; +} + +/***************************************************** * IoCsqInitialize (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_CSQ_REMOVE_IRP remove_irp, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 27797a2..46a1dee 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -471,7 +471,7 @@ @ stub IoThreadToProcess @ stdcall IoUnregisterFileSystem(ptr) @ stub IoUnregisterFsRegistrationChange -@ stub IoUnregisterPlugPlayNotification +@ stdcall IoUnregisterPlugPlayNotification(ptr) @ stdcall IoUnregisterShutdownNotification(ptr) @ stub IoUpdateShareAccess @ stub IoValidateDeviceIoControlAccess

1 0

Piotr Caban : msvcp90: Don't set failbit in basic_istream::tellg.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 091c963734fd29e84ffae0fac3d0124eea33eb86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=091c963734fd29e84ffae0fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 19 17:59:55 2018 +0200 msvcp90: Don't set failbit in basic_istream::tellg. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42304 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 98bc9fdaa431f274fe3a9fc538b0b562c6fad981) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/ios.c | 11 ----------- dlls/msvcp90/tests/ios.c | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 3f85997..fb9d668 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8823,9 +8823,6 @@ fpos_mbstatet* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpo if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_char_setstate(base, IOSTATE_failbit); }else { ret->off = -1; ret->pos = 0; @@ -8842,9 +8839,6 @@ fpos_mbstatet* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpo basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_char_setstate(base, IOSTATE_failbit); #endif return ret; @@ -10398,9 +10392,6 @@ fpos_mbstatet* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, f if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); }else { ret->off = -1; ret->pos = 0; @@ -10417,8 +10408,6 @@ fpos_mbstatet* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, f basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); #endif return ret; } diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index c075f01..e1a08ff 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1857,6 +1857,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_char_vbase_dtor, &ss); call_func1(p_basic_string_char_dtor, &str); @@ -1884,6 +1888,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); call_func1(p_basic_string_wchar_dtor, &wstr);

1 0

Piotr Caban : msvcp110: Add _Syserror_map implementation.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: eb508339ddc06d70beefe074fc324535c98e758c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb508339ddc06d70beefe074… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 16 16:33:01 2018 +0200 msvcp110: Add _Syserror_map implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c92b71f6e80bce782139882743fd578a0ef1dfbb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp140/msvcp140.spec | 4 +- dlls/msvcp90/misc.c | 186 ++++++++++++++++++++++++++++++++++++ 5 files changed, 194 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb508339ddc06d70beef…

1 0