wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Akihiro Sagawa : winmm: Inherit the seek position when using standard file handle.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 7a222508679328875b795392f2b90a6f2b313016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a222508679328875b795392f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 4 22:28:14 2013 +0900 winmm: Inherit the seek position when using standard file handle. --- dlls/winmm/mmio.c | 4 ++-- dlls/winmm/tests/mmio.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 551ccbf..73cad60 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -670,9 +670,9 @@ static HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, refmminfo->wErrorRet = send_message(wm->ioProc, &wm->info, MMIOM_OPEN, (LPARAM)szFileName, 0, FALSE); - /* grab file size, when possible */ + /* update offsets and grab file size, when possible */ if (wm->info.fccIOProc != FOURCC_MEM && (send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_CUR, FALSE)) != -1) { - pos = wm->info.lDiskOffset; + pos = wm->info.lBufOffset = wm->info.lDiskOffset; send_message(wm->ioProc, &wm->info, MMIOM_SEEK, 0, SEEK_END, FALSE); wm->dwFileSize = wm->info.lDiskOffset; send_message(wm->ioProc, &wm->info, MMIOM_SEEK, pos, SEEK_SET, FALSE); diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index d4697db..495b870 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -704,6 +704,8 @@ static void test_mmioSeek(void) const LONG size = sizeof(RIFF_buf), offset = 16; char test_file[MAX_PATH]; MMRESULT res; + HFILE hfile; + OFSTRUCT ofs; /* test memory file */ memset(&mmio, 0, sizeof(mmio)); @@ -784,6 +786,24 @@ static void test_mmioSeek(void) mmioClose(hmmio, 0); } + /* test seek position inheritance from standard file handle */ + hfile = OpenFile(test_file, &ofs, OF_READ); + ok(hfile != HFILE_ERROR, "Failed to open the file, err %d\n", GetLastError()); + if (hfile != HFILE_ERROR) { + pos = _llseek(hfile, offset, SEEK_SET); + ok(pos != HFILE_ERROR, "Failed to seek, err %d\n", GetLastError()); + memset(&mmio, 0, sizeof(mmio)); + mmio.fccIOProc = FOURCC_DOS; + mmio.adwInfo[0] = (DWORD)hfile; + hmmio = mmioOpen(NULL, &mmio, MMIO_READ | MMIO_DENYWRITE | MMIO_ALLOCBUF); + ok(hmmio != NULL, "mmioOpen error %u\n", mmio.wErrorRet); + if (hmmio != NULL) { + pos = mmioSeek(hmmio, 0, SEEK_CUR); + ok(pos == offset, "expected %d, got %d\n", offset, pos); + mmioClose(hmmio, 0); + } + } + DeleteFileA(test_file); }

1 0

André Hentschel : explorerframe: Clear pointer when nothing is selected.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 80f6197fdc1811dc3bf0d70944151a19f433eb33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f6197fdc1811dc3bf0d7094… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 4 00:10:37 2013 +0200 explorerframe: Clear pointer when nothing is selected. --- dlls/explorerframe/nstc.c | 3 +++ dlls/explorerframe/tests/nstc.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index d5e78e7..a881cc4 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -1240,7 +1240,10 @@ static HRESULT WINAPI NSTC2_fnGetSelectedItems(INameSpaceTreeControl2* iface, psiselected = get_selected_shellitem(This); if(!psiselected) + { + *psiaItems = NULL; return E_FAIL; + } hr = SHCreateShellItemArrayFromShellItem(psiselected, &IID_IShellItemArray, (void**)psiaItems); diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 6287078..ab6a0ce 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1366,7 +1366,7 @@ static void test_basics(void) psia = (void*)0xdeadbeef; hr = INameSpaceTreeControl_GetSelectedItems(pnstc, &psia); ok(hr == E_FAIL, "Got 0x%08x\n", hr); - ok(psia == (void*)0xdeadbeef, "Got %p\n", psia); + ok(!psia || broken(psia == (void*)0xdeadbeef /* before Win8 */), "Got %p\n", psia); hr = INameSpaceTreeControl_AppendRoot(pnstc, psitestdir2, SHCONTF_FOLDERS, 0, NULL); ok(hr == S_OK, "Got (0x%08x)\n", hr);

1 0

André Hentschel : wined3d: Report Win 8 when appropriate.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: a2bebdcc7ccdaf2e5a2eae0daca5dfaadd85f967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2bebdcc7ccdaf2e5a2eae0da… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 3 22:23:23 2013 +0200 wined3d: Report Win 8 when appropriate. --- dlls/wined3d/directx.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4b42845..d4b993b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1282,14 +1282,19 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, driver_os_version = 7; driver_model = DRIVER_MODEL_NT6X; } + else if (os_version.dwMinorVersion == 1) + { + driver_os_version = 8; + driver_model = DRIVER_MODEL_NT6X; + } else { - if (os_version.dwMinorVersion > 1) + if (os_version.dwMinorVersion > 2) { - FIXME("Unhandled OS version %u.%u, reporting Win 7.\n", + FIXME("Unhandled OS version %u.%u, reporting Win 8.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); } - driver_os_version = 8; + driver_os_version = 9; driver_model = DRIVER_MODEL_NT6X; } break;

1 0

Ludger Sprenker : windowscodecs: Add initializations for tiff encoder options.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: b5dfd48bc8077e132cdf481dac95da1a6521578c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5dfd48bc8077e132cdf481da… Author: Ludger Sprenker <ludger(a)sprenker.net> Date: Mon Apr 1 22:28:12 2013 +0200 windowscodecs: Add initializations for tiff encoder options. --- dlls/windowscodecs/tests/converter.c | 2 +- dlls/windowscodecs/tiffformat.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 5b8f6e4..b77e455 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -499,7 +499,7 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o } if (clsid_encoder == &CLSID_WICTiffEncoder) - todo_wine test_specific_encoder_properties(options, testdata_tiff_props, all_props, cProperties2); + test_specific_encoder_properties(options, testdata_tiff_props, all_props, cProperties2); for (i=0; i < cProperties2; i++) { diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 0fcb81a..62f1ad7 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -54,6 +54,9 @@ static CRITICAL_SECTION_DEBUG init_tiff_cs_debug = }; static CRITICAL_SECTION init_tiff_cs = { &init_tiff_cs_debug, -1, 0, 0, 0, 0 }; +static const WCHAR wszTiffCompressionMethod[] = {'T','i','f','f','C','o','m','p','r','e','s','s','i','o','n','M','e','t','h','o','d',0}; +static const WCHAR wszCompressionQuality[] = {'C','o','m','p','r','e','s','s','i','o','n','Q','u','a','l','i','t','y',0}; + static void *libtiff_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(TIFFClientOpen); @@ -1909,7 +1912,31 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (SUCCEEDED(hr)) { - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + PROPBAG2 opts[2]= {{0}}; + opts[0].pstrName = (LPOLESTR)wszTiffCompressionMethod; + opts[0].vt = VT_UI1; + opts[0].dwType = PROPBAG2_TYPE_DATA; + + opts[1].pstrName = (LPOLESTR)wszCompressionQuality; + opts[1].vt = VT_R4; + opts[1].dwType = PROPBAG2_TYPE_DATA; + + hr = CreatePropertyBag2(opts, 2, ppIEncoderOptions); + + if (SUCCEEDED(hr)) + { + VARIANT v; + VariantInit(&v); + V_VT(&v) = VT_UI1; + V_UNION(&v, bVal) = WICTiffCompressionDontCare; + hr = IPropertyBag2_Write(*ppIEncoderOptions, 1, opts, &v); + VariantClear(&v); + if (FAILED(hr)) + { + IPropertyBag2_Release(*ppIEncoderOptions); + *ppIEncoderOptions = NULL; + } + } } if (SUCCEEDED(hr))

1 0

Nozomi Kodama : d3dx9: Implement D3DXSHEvalHemisphereLight.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 6d6603b4955d55a2531f6722a521a546a259235c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6603b4955d55a2531f6722a… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Sun Mar 31 13:37:34 2013 -1000 d3dx9: Implement D3DXSHEvalHemisphereLight. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 46 ++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 88 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9math.h | 1 + 23 files changed, 155 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d6603b4955d55a2531f6…

1 0

Nozomi Kodama : d3dx9: Implement D3DXSHEvalSphericalLight.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 6247dae2ace8763f393e8a895b5191c284a8ebd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6247dae2ace8763f393e8a895… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Sun Mar 31 13:37:06 2013 -1000 d3dx9: Implement D3DXSHEvalSphericalLight. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 42 ++++++++++++ dlls/d3dx9_36/tests/math.c | 148 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9math.h | 1 + 23 files changed, 211 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6247dae2ace8763f393e8…

1 0

Nozomi Kodama : d3dx9: Do not use relative error for small numbers.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 97317528317bf485f3b911f17530edd4a5a8ba19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97317528317bf485f3b911f17… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Sun Mar 31 13:35:24 2013 -1000 d3dx9: Do not use relative error for small numbers. --- dlls/d3dx9_36/tests/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c093ad8..f44240f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -27,7 +27,7 @@ #define admitted_error 0.0001f -#define relative_error(exp, out) ((exp == 0.0f) ? fabs(exp - out) : (fabs(1.0f - (out) / (exp)))) +#define relative_error(exp, out) (fabs(exp) < 0.01f ? fabs(exp - out) : fabs(1.0f - (out) / (exp))) #define expect_color(expectedcolor,gotcolor) ok((relative_error(expectedcolor.r, gotcolor.r)<admitted_error)&&(relative_error(expectedcolor.g, gotcolor.g)<admitted_error)&&(relative_error(expectedcolor.b, gotcolor.b)<admitted_error)&&(relative_error(expectedcolor.a, gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a);

1 0

Victor Martinez Calvo : windowscodecs: Don't overwrite bih. bV5AlphaMask and set the LCS_DEVICE_RGB flag in bih.bV5CSType.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: cd7637ec6d278c6cf522688e494dd497e09e70de URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7637ec6d278c6cf522688e4… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Thu Apr 4 02:07:36 2013 +0200 windowscodecs: Don't overwrite bih.bV5AlphaMask and set the LCS_DEVICE_RGB flag in bih.bV5CSType. --- dlls/windowscodecs/bmpencode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 9bd2340..b071c80 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -360,7 +360,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bih.bV5GreenMask = This->format->greenmask; bih.bV5BlueMask = This->format->bluemask; bih.bV5AlphaMask = This->format->alphamask; - bih.bV5AlphaMask = LCS_DEVICE_RGB; + bih.bV5CSType = LCS_DEVICE_RGB; } bfh.bfSize = sizeof(BITMAPFILEHEADER) + info_size + bih.bV5SizeImage;

1 0

Victor Martinez Calvo : msvcrt: Fix copy-pasta typos LOCALE_SSHORTDATE-> LOCALE_SLONGDATE in _create_locale.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: f2b78d1fd0d5958e26b11eb7dd7c00983b26ad68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b78d1fd0d5958e26b11eb7d… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Wed Apr 3 21:42:21 2013 +0200 msvcrt: Fix copy-pasta typos LOCALE_SSHORTDATE->LOCALE_SLONGDATE in _create_locale. --- dlls/msvcrt/locale.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 520c8fe..14ccd0a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1222,7 +1222,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { size += sizeof(cloc_short_date) + sizeof(cloc_short_dateW); - }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { size += sizeof(cloc_long_date) + sizeof(cloc_long_dateW); }else { ret = GetLocaleInfoA(lcid_tmp, time_data[i] @@ -1255,7 +1255,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_short_date, sizeof(cloc_short_date)); ret += sizeof(cloc_short_date); - }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_long_date, sizeof(cloc_long_date)); ret += sizeof(cloc_long_date); }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) { @@ -1271,7 +1271,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_short_dateW, sizeof(cloc_short_dateW)); ret += sizeof(cloc_short_dateW); - }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_long_dateW, sizeof(cloc_long_dateW)); ret += sizeof(cloc_long_dateW); }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) {

1 0

Victor Martinez Calvo : msxml3: Fix SafeArrayGetUBond check in BindStatusCallback_create.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 0a6ab4b7135ae87c3d331df16040e85d9a3afc8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a6ab4b7135ae87c3d331df16… Author: Victor Martinez Calvo <vmartinez(a)reactos.org> Date: Wed Apr 3 19:37:44 2013 +0200 msxml3: Fix SafeArrayGetUBond check in BindStatusCallback_create. --- dlls/msxml3/httprequest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 681ccab..682381d 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -722,7 +722,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * heap_free(bsc); return hr; } - if ((hr = SafeArrayGetUBound(sa, 1, &size) != S_OK)) + if ((hr = SafeArrayGetUBound(sa, 1, &size)) != S_OK) { SafeArrayUnaccessData(sa); heap_free(bsc);

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013