April 2013 - Wine-commits - list.winehq.org

Ken Thomases : winemac: Clip surface drawn region to new visible rect on window resize.
by Alexandre Julliard 05 Apr '13

05 Apr '13

Module: wine Branch: master Commit: c2bbdc4b868ad4f23e85871990f3edc6226d31ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2bbdc4b868ad4f23e8587199… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Apr 4 14:26:13 2013 -0500 winemac: Clip surface drawn region to new visible rect on window resize. This prevents stale drawing from being revealed if the window later grows. --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/surface.c | 32 ++++++++++++++++++++++++++++++++ dlls/winemac.drv/window.c | 1 + 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 881ce87..97ff08b 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -141,6 +141,7 @@ extern struct window_surface *create_surface(macdrv_window window, const RECT *r struct window_surface *old_surface, BOOL use_alpha) DECLSPEC_HIDDEN; extern void set_window_surface(macdrv_window window, struct window_surface *window_surface) DECLSPEC_HIDDEN; extern void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha) DECLSPEC_HIDDEN; +extern void surface_clip_to_visible_rect(struct window_surface *window_surface, const RECT *visible_rect) DECLSPEC_HIDDEN; extern void macdrv_handle_event(const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index a27ff24..a79ec47 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -410,3 +410,35 @@ CGImageRef create_surface_image(void *window_surface, CGRect *rect, int copy_dat return cgimage; } + +/*********************************************************************** + * surface_clip_to_visible_rect + * + * Intersect the accumulated drawn region with a new visible rect, + * effectively discarding stale drawing in the surface slack area. + */ +void surface_clip_to_visible_rect(struct window_surface *window_surface, const RECT *visible_rect) +{ + struct macdrv_window_surface *surface = get_mac_surface(window_surface); + + window_surface->funcs->lock(window_surface); + + if (surface->drawn) + { + RECT rect; + HRGN region; + + rect = *visible_rect; + OffsetRect(&rect, -rect.left, -rect.top); + + if ((region = CreateRectRgnIndirect(&rect))) + { + CombineRgn(surface->drawn, surface->drawn, region, RGN_AND); + DeleteObject(region); + + update_blit_data(surface); + } + } + + window_surface->funcs->unlock(window_surface); +} diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 0ff54d4..987aa34 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1284,6 +1284,7 @@ void CDECL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags if (!memcmp(&data->surface->rect, &surface_rect, sizeof(surface_rect))) { /* existing surface is good enough */ + surface_clip_to_visible_rect(data->surface, visible_rect); window_surface_add_ref(data->surface); *surface = data->surface; goto done;

1 0

André Hentschel : ntdll: Hint that call_entry_point is ARM assembler.
by Alexandre Julliard 05 Apr '13

05 Apr '13

Module: wine Branch: master Commit: b6fdba7873b462a6d433b71a12f2aa237419b95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6fdba7873b462a6d433b71a1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 4 22:11:03 2013 +0200 ntdll: Hint that call_entry_point is ARM assembler. --- dlls/ntdll/relay.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 81e1593..c8a066a2 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -357,6 +357,7 @@ __ASM_GLOBAL_FUNC( call_entry_point, "ret" ) #elif defined(__arm__) __ASM_GLOBAL_FUNC( call_entry_point, + ".arm\n\t" "push {r4, r5, LR}\n\t" "mov r4, r0\n\t" "mov r5, SP\n\t"

1 0

Ken Thomases : winemac: Add debug tracing for queried icon size.
by Alexandre Julliard 05 Apr '13

05 Apr '13

Module: wine Branch: master Commit: 787a937ed86f6f0e0975af663d5590b33da4e01e URL: http://source.winehq.org/git/wine.git/?a=commit;h=787a937ed86f6f0e0975af663… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Apr 5 03:34:16 2013 -0500 winemac: Add debug tracing for queried icon size. --- dlls/winemac.drv/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/image.c b/dlls/winemac.drv/image.c index 4228265..a39564a 100644 --- a/dlls/winemac.drv/image.c +++ b/dlls/winemac.drv/image.c @@ -205,6 +205,7 @@ CGImageRef create_cgimage_from_icon(HANDLE icon, int width, int height) if (!info.hbmColor) bm.bmHeight = max(1, bm.bmHeight / 2); width = bm.bmWidth; height = bm.bmHeight; + TRACE("new width %d height %d\n", width, height); DeleteObject(info.hbmColor); DeleteObject(info.hbmMask);

1 0

Ken Thomases : winemac: Scale large system tray icons down to fit status bar.
by Alexandre Julliard 05 Apr '13

05 Apr '13

Module: wine Branch: master Commit: 401b75e3e9619ad80a95c5ff30d8d8f1b94b7831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=401b75e3e9619ad80a95c5ff3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Apr 5 03:34:20 2013 -0500 winemac: Scale large system tray icons down to fit status bar. --- dlls/winemac.drv/cocoa_status_item.m | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index 27908ab..5b4ee94 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -149,8 +149,21 @@ void macdrv_set_status_item_image(macdrv_status_item s, CGImageRef cgimage) NSImage* image = nil; if (cgimage) { + NSSize size; + CGFloat maxSize = [[NSStatusBar systemStatusBar] thickness]; + BOOL changed = FALSE; + image = [[NSImage alloc] initWithCGImage:cgimage size:NSZeroSize]; CGImageRelease(cgimage); + size = [image size]; + while (size.width > maxSize || size.height > maxSize) + { + size.width /= 2.0; + size.height /= 2.0; + changed = TRUE; + } + if (changed) + [image setSize:size]; } [statusItem.item setImage:image]; [image release];

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: 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

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

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

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

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