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

André Hentschel : ntdll: Hint that call_entry_point is ARM assembler.
by Alexandre Julliard April 5, 2013

April 5, 2013

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: Clip surface drawn region to new visible rect on window resize.
by Alexandre Julliard April 5, 2013

April 5, 2013

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

Ken Thomases : winemac: Initialize window surface to Mac-standard window background color instead of black .
by Alexandre Julliard April 5, 2013

April 5, 2013

Module: wine Branch: master Commit: f37153ac7d43d1ebb157c193b7ca2c61084b8923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37153ac7d43d1ebb157c193b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Apr 4 14:26:08 2013 -0500 winemac: Initialize window surface to Mac-standard window background color instead of black. --- dlls/winemac.drv/cocoa_window.m | 42 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/surface.c | 5 +++- 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 9911195..6a85d74 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1796,3 +1796,45 @@ void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) [pool release]; } + +/*********************************************************************** + * macdrv_window_background_color + * + * Returns the standard Mac window background color as a 32-bit value of + * the form 0x00rrggbb. + */ +uint32_t macdrv_window_background_color(void) +{ + static uint32_t result; + static dispatch_once_t once; + + // Annoyingly, [NSColor windowBackgroundColor] refuses to convert to other + // color spaces (RGB or grayscale). So, the only way to get RGB values out + // of it is to draw with it. + dispatch_once(&once, ^{ + OnMainThread(^{ + unsigned char rgbx[4]; + unsigned char *planes = rgbx; + NSBitmapImageRep *bitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:&planes + pixelsWide:1 + pixelsHigh:1 + bitsPerSample:8 + samplesPerPixel:3 + hasAlpha:NO + isPlanar:NO + colorSpaceName:NSCalibratedRGBColorSpace + bitmapFormat:0 + bytesPerRow:4 + bitsPerPixel:32]; + [NSGraphicsContext saveGraphicsState]; + [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]]; + [[NSColor windowBackgroundColor] set]; + NSRectFill(NSMakeRect(0, 0, 1, 1)); + [NSGraphicsContext restoreGraphicsState]; + [bitmap release]; + result = rgbx[0] << 16 | rgbx[1] << 8 | rgbx[2]; + }); + }); + + return result; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 46d13a9..c4819c3 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -347,6 +347,7 @@ extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; +extern uint32_t macdrv_window_background_color(void) DECLSPEC_HIDDEN; /* keyboard */ diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 564d004..a27ff24 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -236,6 +236,7 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, DWORD *colors; pthread_mutexattr_t attr; int err; + DWORD window_background; surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])); @@ -286,8 +287,10 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, } update_blit_data(surface); surface->use_alpha = use_alpha; - surface->bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, surface->info.bmiHeader.biSizeImage); + surface->bits = HeapAlloc(GetProcessHeap(), 0, surface->info.bmiHeader.biSizeImage); if (!surface->bits) goto failed; + window_background = macdrv_window_background_color(); + memset_pattern4(surface->bits, &window_background, surface->info.bmiHeader.biSizeImage); TRACE("created %p for %p %s bits %p-%p\n", surface, window, wine_dbgstr_rect(rect), surface->bits, surface->bits + surface->info.bmiHeader.biSizeImage);

1 0

Ken Thomases : winemac: Tell Cocoa to preserve our window content during live resizing.
by Alexandre Julliard April 5, 2013

April 5, 2013

Module: wine Branch: master Commit: 26a74c664d6d4d16224f1ecc7461fd02e09645d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a74c664d6d4d16224f1ecc7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Apr 4 14:26:01 2013 -0500 winemac: Tell Cocoa to preserve our window content during live resizing. --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 43be348..9911195 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -277,6 +277,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) return YES; } + - (BOOL) preservesContentDuringLiveResize + { + // Returning YES from this tells Cocoa to keep our view's content during + // a Cocoa-driven resize. In theory, we're also supposed to override + // -setFrameSize: to mark exposed sections as needing redisplay, but + // user32 will take care of that in a roundabout way. This way, we don't + // redraw until the window surface is flushed. + // + // This doesn't do anything when we resize the window ourselves. + return YES; + } + @end

1 0

Akihiro Sagawa : gdi32: Improve fixed-pitch advance calculation as well as outline text metrics.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: e5f1508031eefb4f71f5fc6a3acaf71308003b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f1508031eefb4f71f5fc6a3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 20:08:16 2013 +0900 gdi32: Improve fixed-pitch advance calculation as well as outline text metrics. --- dlls/gdi32/freetype.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7bc4366..96c94e4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5881,7 +5881,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, BOOL needsTransform = FALSE; BOOL tategaki = (font->GSUB_Table != NULL); UINT original_index; - FT_Fixed avgAdvance = 0; + LONG avgAdvance = 0; + FT_Fixed em_scale; TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat); @@ -6022,9 +6023,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, TEXTMETRICW tm; if (get_text_metrics(incoming_font, &tm) && !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH)) { - avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, - incoming_font->ft_face->size->metrics.x_scale); - if (avgAdvance && (ft_face->glyph->metrics.horiAdvance+63) >> 6 == (avgAdvance*2+63) >> 6) + em_scale = MulDiv(incoming_font->ppem, 1 << 16, incoming_font->ft_face->units_per_EM); + avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, em_scale); + if (avgAdvance && + (ft_face->glyph->metrics.horiAdvance+63) >> 6 == pFT_MulFix(incoming_font->ntmAvgWidth*2, em_scale)) TRACE("Fixed-pitch full-width character detected\n"); else avgAdvance = 0; /* cancel this feature */ @@ -6037,7 +6039,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!avgAdvance) adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6; else - adv = (INT)((avgAdvance + 32) >> 6) * 2; + adv = (INT)avgAdvance * 2; top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; bottom = (ft_face->glyph->metrics.horiBearingY - @@ -6082,10 +6084,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!avgAdvance || vec.y) lpgm->gmCellIncX = (vec.x+63) >> 6; else { - vec.x = avgAdvance; + vec.x = incoming_font->ntmAvgWidth; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); - lpgm->gmCellIncX = ((vec.x+32) >> 6) * 2; + lpgm->gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; } vec.x = ft_face->glyph->metrics.horiAdvance; @@ -6094,10 +6096,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!avgAdvance || vec.y) adv = (vec.x+63) >> 6; else { - vec.x = avgAdvance; + vec.x = incoming_font->ntmAvgWidth; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); - adv = ((vec.x+32) >> 6) * 2; + adv = pFT_MulFix(vec.x, em_scale) * 2; } }

1 0

Akihiro Sagawa : gdi32: Improve outline text metrics calculation, especially if unitsPerEm is not power of 2.
by Alexandre Julliard April 4, 2013

April 4, 2013

Module: wine Branch: master Commit: 3a9689106145c8585e917ae6f4f22226d87872ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9689106145c8585e917ae6f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 20:08:14 2013 +0900 gdi32: Improve outline text metrics calculation, especially if unitsPerEm is not power of 2. --- dlls/gdi32/freetype.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 83e7ad8..7bc4366 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6775,7 +6775,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) TT_OS2 *pOS2; TT_HoriHeader *pHori; TT_Postscript *pPost; - FT_Fixed x_scale, y_scale; + FT_Fixed em_scale; WCHAR *family_nameW, *style_nameW, *face_nameW, *full_nameW; char *cp; INT ascent, descent; @@ -6837,8 +6837,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) needed += lenfull; - x_scale = ft_face->size->metrics.x_scale; - y_scale = ft_face->size->metrics.y_scale; + em_scale = (FT_Fixed)MulDiv(font->ppem, 1 << 16, ft_face->units_per_EM); pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2); if(!pOS2) { @@ -6878,8 +6877,8 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->ntmCellHeight = ascent + descent; font->ntmAvgWidth = pOS2->xAvgCharWidth; -#define SCALE_X(x) ((pFT_MulFix(x, x_scale) + 32) >> 6) -#define SCALE_Y(y) ((pFT_MulFix(y, y_scale) + 32) >> 6) +#define SCALE_X(x) (pFT_MulFix(x, em_scale)) +#define SCALE_Y(y) (pFT_MulFix(y, em_scale)) if(font->yMax) { TM.tmAscent = font->yMax;

1 0

Akihiro Sagawa : winmm: Inherit the seek position when using standard file handle.
by Alexandre Julliard April 4, 2013

April 4, 2013

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 April 4, 2013

April 4, 2013

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

Ludger Sprenker : windowscodecs: Add initializations for tiff encoder options.
by Alexandre Julliard April 4, 2013

April 4, 2013

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 April 4, 2013

April 4, 2013

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