October 2023 - Wine-commits

Jeff Smith : gdiplus: Implement GdipResetPageTransform.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 142dc48aaea0539c0c4bda82c72eb907c729ac4a URL: https://gitlab.winehq.org/wine/wine/-/commit/142dc48aaea0539c0c4bda82c72eb9… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Oct 26 00:15:07 2023 -0500 gdiplus: Implement GdipResetPageTransform. --- dlls/gdiplus/graphics.c | 23 ++++++++++++++++++----- dlls/gdiplus/tests/graphics.c | 4 ---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 58b2de213a6..32c45458c8f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -7536,14 +7536,27 @@ cleanup: GpStatus WINGDIPAPI GdipResetPageTransform(GpGraphics *graphics) { - static int calls; + GpStatus stat; - TRACE("(%p) stub\n", graphics); + TRACE("(%p)\n", graphics); - if(!(calls++)) - FIXME("not implemented\n"); + if(!graphics) + return InvalidParameter; - return NotImplemented; + if(graphics->busy) + return ObjectBusy; + + if (is_metafile_graphics(graphics)) + { + stat = METAFILE_SetPageTransform((GpMetafile*)graphics->image, UnitDisplay, 1.0); + if (stat != Ok) + return stat; + } + + graphics->scale = 1.0; + graphics->unit = UnitDisplay; + + return Ok; } GpStatus WINGDIPAPI GdipGraphicsSetAbort(GpGraphics *graphics, GdiplusAbort *pabort) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 40b624df1ba..784a88d9a70 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1829,7 +1829,6 @@ static void test_Get_Release_DC(void) status = GdipResetClip(graphics); expect(ObjectBusy, status); status = GdipResetPageTransform(graphics); - todo_wine expect(ObjectBusy, status); status = GdipResetWorldTransform(graphics); expect(ObjectBusy, status); @@ -4139,15 +4138,12 @@ static void test_set_page_transform(void) expect(Ok, status); expectf_(2.0, scale, 0); status = GdipResetPageTransform(graphics); - todo_wine expect(Ok, status); status = GdipGetPageUnit(graphics, &unit); expect(Ok, status); - todo_wine expect(UnitDisplay, unit); status = GdipGetPageScale(graphics, &scale); expect(Ok, status); - todo_wine expectf_(1.0, scale, 0); GdipDeleteGraphics(graphics);

1 0

Jeff Smith : gdiplus: Fix a GdipSetPageScale return status.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 8f7749aa451b0fc7c7ef7932cbc2ed28f603500d URL: https://gitlab.winehq.org/wine/wine/-/commit/8f7749aa451b0fc7c7ef7932cbc2ed… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Oct 26 00:17:58 2023 -0500 gdiplus: Fix a GdipSetPageScale return status. --- dlls/gdiplus/graphics.c | 5 ++++- dlls/gdiplus/tests/graphics.c | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 32c45458c8f..6cc0c3bfbe3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6164,12 +6164,15 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) TRACE("(%p, %.2f)\n", graphics, scale); - if(!graphics || (scale <= 0.0)) + if(!graphics) return InvalidParameter; if(graphics->busy) return ObjectBusy; + if(scale <= 0.0) + return InvalidParameter; + if (is_metafile_graphics(graphics)) { stat = METAFILE_SetPageTransform((GpMetafile*)graphics->image, graphics->unit, scale); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 784a88d9a70..5f502b72593 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1847,7 +1847,6 @@ static void test_Get_Release_DC(void) status = GdipSetPageScale(graphics, 1.0); expect(ObjectBusy, status); status = GdipSetPageScale(graphics, 0.0); - todo_wine expect(ObjectBusy, status); status = GdipSetPageUnit(graphics, UnitWorld); expect(ObjectBusy, status);

1 0

Jeff Smith : gdiplus: Fix GdipSetPageUnit parameter validation.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 6972aa77c1c884b909f5c60c0fcb7e8bf9ef92a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/6972aa77c1c884b909f5c60c0fcb7e… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Oct 26 00:21:22 2023 -0500 gdiplus: Fix GdipSetPageUnit parameter validation. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6cc0c3bfbe3..371629a5bef 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6197,7 +6197,7 @@ GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) if(graphics->busy) return ObjectBusy; - if(unit == UnitWorld) + if(unit == UnitWorld || unit > UnitMillimeter) return InvalidParameter; if (is_metafile_graphics(graphics)) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5f502b72593..724be3f1030 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4104,7 +4104,6 @@ static void test_set_page_transform(void) { winetest_push_context("%u", i); status = GdipSetPageUnit(graphics, td_unit[i].unit); - todo_wine_if(td_unit[i].unit > UnitMillimeter) expect(td_unit[i].isInvalid ? InvalidParameter : Ok, status); if (status == Ok) { @@ -4131,7 +4130,6 @@ static void test_set_page_transform(void) status = GdipGetPageUnit(graphics, &unit); expect(Ok, status); - todo_wine expect(UnitMillimeter, unit); status = GdipGetPageScale(graphics, &scale); expect(Ok, status);

1 0

Zebediah Figura : ntdll: Do not reject data directories at the end of a file.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 229ccfd04829b63c9da694303b48d4153cac45db URL: https://gitlab.winehq.org/wine/wine/-/commit/229ccfd04829b63c9da694303b48d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 26 10:46:22 2023 -0500 ntdll: Do not reject data directories at the end of a file. Found when wpfgfx_cor3.dll failed to relocate in Bentley CONNECTION Client. Fixes: 56d9e1a8a8dcce492587b2d26889a3072f4d2e2c. --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 24de360d983..2c2000751e5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2612,7 +2612,7 @@ static IMAGE_DATA_DIRECTORY *get_data_dir( IMAGE_NT_HEADERS *nt, SIZE_T total_si if (!data->Size) return NULL; if (!data->VirtualAddress) return NULL; if (data->VirtualAddress >= total_size) return NULL; - if (data->Size >= total_size - data->VirtualAddress) return NULL; + if (data->Size > total_size - data->VirtualAddress) return NULL; return data; }

1 0

Brendan Shanks : winemac.drv: Disable declaration-after-statement warnings in ObjC files.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 5d78428fa815e86b9f8eb70c9be2055e4d19b94e URL: https://gitlab.winehq.org/wine/wine/-/commit/5d78428fa815e86b9f8eb70c9be205… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 24 21:50:03 2023 -0500 winemac.drv: Disable declaration-after-statement warnings in ObjC files. --- dlls/winemac.drv/cocoa_app.m | 2 ++ dlls/winemac.drv/cocoa_clipboard.m | 2 ++ dlls/winemac.drv/cocoa_cursorclipping.m | 2 ++ dlls/winemac.drv/cocoa_display.m | 2 ++ dlls/winemac.drv/cocoa_event.m | 2 ++ dlls/winemac.drv/cocoa_main.m | 2 ++ dlls/winemac.drv/cocoa_opengl.m | 2 ++ dlls/winemac.drv/cocoa_status_item.m | 2 ++ dlls/winemac.drv/cocoa_window.m | 1 + 9 files changed, 17 insertions(+) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index c1a35af5a00..4e26bf1e122 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -25,6 +25,8 @@ #import "cocoa_event.h" #import "cocoa_window.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + static NSString* const WineAppWaitQueryResponseMode = @"WineAppWaitQueryResponseMode"; diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index cc5d1ffe55e..a3dca323705 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -23,6 +23,8 @@ #import "cocoa_event.h" #import "cocoa_window.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + #if !defined(MAC_OS_X_VERSION_10_14) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_14 /* For older SDKs, #define the new names of constants deprecated/renamed in macOS 10.14. */ #define NSBitmapImageFileTypeBMP NSBMPFileType diff --git a/dlls/winemac.drv/cocoa_cursorclipping.m b/dlls/winemac.drv/cocoa_cursorclipping.m index faefa5030e7..cfb7ff529e7 100644 --- a/dlls/winemac.drv/cocoa_cursorclipping.m +++ b/dlls/winemac.drv/cocoa_cursorclipping.m @@ -23,6 +23,8 @@ #import "cocoa_cursorclipping.h" #import "cocoa_window.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + /* Neither Quartz nor Cocoa has an exact analog for Win32 cursor clipping. * diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 856fa2ea77a..fbbe16efcbf 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -26,6 +26,8 @@ #endif #include "macdrv_cocoa.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + static uint64_t dedicated_gpu_id; static uint64_t integrated_gpu_id; diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 701de6eb8f7..11dd9c3c784 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -29,6 +29,8 @@ #import "cocoa_app.h" #import "cocoa_window.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThreadDictionaryKey"; diff --git a/dlls/winemac.drv/cocoa_main.m b/dlls/winemac.drv/cocoa_main.m index 73a2514a61a..8c9507a75b1 100644 --- a/dlls/winemac.drv/cocoa_main.m +++ b/dlls/winemac.drv/cocoa_main.m @@ -25,6 +25,8 @@ #include "macdrv_cocoa.h" #import "cocoa_app.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + /* Condition values for an NSConditionLock. Used to signal between run_cocoa_app and macdrv_start_cocoa_app so the latter knows when the former is running diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 43574972600..31a1f28970b 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -26,6 +26,8 @@ #include "cocoa_app.h" #include "cocoa_event.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + @interface WineOpenGLContext () @property (retain, nonatomic) NSView* latentView; diff --git a/dlls/winemac.drv/cocoa_status_item.m b/dlls/winemac.drv/cocoa_status_item.m index 1ffdeb8048d..31f8a668d81 100644 --- a/dlls/winemac.drv/cocoa_status_item.m +++ b/dlls/winemac.drv/cocoa_status_item.m @@ -23,6 +23,8 @@ #import "cocoa_app.h" #import "cocoa_event.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" + @interface WineStatusItem : NSView { diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index e2373b4837c..5700bd3d531 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -33,6 +33,7 @@ #import "cocoa_event.h" #import "cocoa_opengl.h" +#pragma GCC diagnostic ignored "-Wdeclaration-after-statement" #if !defined(MAC_OS_X_VERSION_10_12) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 /* Additional Mac virtual keycode, to complement those in Carbon's <HIToolbox/Events.h>. */

1 0

Hans Leidekker : advapi32/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 362f953748c2e6ad3c2278c984bc522ae4a769eb URL: https://gitlab.winehq.org/wine/wine/-/commit/362f953748c2e6ad3c2278c984bc52… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 25 17:25:06 2023 +0200 advapi32/tests: Get rid of workarounds for old Windows versions. --- dlls/advapi32/tests/registry.c | 124 +++++++++++++---------------------------- 1 file changed, 40 insertions(+), 84 deletions(-)

1 0

Hans Leidekker : advapi32/tests: Skip WoW64 registry tests on 32-bit.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 2ad2ad035dd206ef5f34121776df911a4a2b8248 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ad2ad035dd206ef5f34121776df91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 25 21:54:50 2023 +0200 advapi32/tests: Skip WoW64 registry tests on 32-bit. --- dlls/advapi32/tests/registry.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c45509ecddf..29b1aff6b74 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -62,6 +62,7 @@ static DWORD (WINAPI *pEnumDynamicTimeZoneInformation)(const DWORD, DYNAMIC_TIME_ZONE_INFORMATION*); static BOOL limited_user; +static const BOOL is_64bit = sizeof(void *) > sizeof(int); static const char *dbgstr_SYSTEMTIME(const SYSTEMTIME *st) { @@ -1163,9 +1164,9 @@ static void test_reg_open_key(void) * the registry access check is performed correctly. Redirection isn't * being tested, so the tests don't care about whether the process is * running under WOW64. */ - if (!pIsWow64Process) + if (!is_64bit) { - win_skip("WOW64 flags are not recognized\n"); + skip("Not running WoW64 tests on 32-bit\n"); return; }

1 0

Rémi Bernon : gitlab: Run tests with LP_NUM_THREADS=4 env var.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: d9ad68a1ef1bb9288f5f39199a6042f013e6b464 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9ad68a1ef1bb9288f5f39199a6042… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 26 00:19:53 2023 +0200 gitlab: Run tests with LP_NUM_THREADS=4 env var. This forces mesa LLVMPIPE driver to use a fixed number of threads, and greatly reduces its memory usage from the $(nproc) default. On Gitlab this is 32 threads, which often exhaust VM space in 32bit tests. --- tools/gitlab/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index aaae5671843..4e0b6d75983 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -21,6 +21,7 @@ - export PATH=$BASEDIR/usr/local/bin:$PATH - export DISPLAY=:0 - export LC_ALL=C.UTF-8 + - export LP_NUM_THREADS=4 - export WINEDEBUG=err-all,fixme-all - | cat >$HOME/xorg.conf << EOF

1 0

Paul Gofman : ntdll: Define heap block's BLOCK_FLAG_LFH as 0x80.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 059094c1c18ddc33b04eac53a72fd0eb7510be94 URL: https://gitlab.winehq.org/wine/wine/-/commit/059094c1c18ddc33b04eac53a72fd0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Oct 19 18:46:13 2023 -0600 ntdll: Define heap block's BLOCK_FLAG_LFH as 0x80. --- dlls/ntdll/heap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 5ce7f8fad2f..b5e2076ffae 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -103,12 +103,12 @@ C_ASSERT( sizeof(struct block) == 8 ); #define BLOCK_FLAG_PREV_FREE 0x02 #define BLOCK_FLAG_FREE_LINK 0x03 #define BLOCK_FLAG_LARGE 0x04 -#define BLOCK_FLAG_LFH 0x08 /* block is handled by the LFH frontend */ -#define BLOCK_FLAG_USER_INFO 0x10 /* user flags up to 0xf0 */ -#define BLOCK_FLAG_USER_MASK 0xf0 +#define BLOCK_FLAG_LFH 0x80 /* block is handled by the LFH frontend */ +#define BLOCK_FLAG_USER_INFO 0x08 /* user flags bits 3-6 */ +#define BLOCK_FLAG_USER_MASK 0x78 -#define BLOCK_USER_FLAGS( heap_flags ) (((heap_flags) >> 4) & BLOCK_FLAG_USER_MASK) -#define HEAP_USER_FLAGS( block_flags ) (((block_flags) & BLOCK_FLAG_USER_MASK) << 4) +#define BLOCK_USER_FLAGS( heap_flags ) (((heap_flags) >> 5) & BLOCK_FLAG_USER_MASK) +#define HEAP_USER_FLAGS( block_flags ) (((block_flags) & BLOCK_FLAG_USER_MASK) << 5) /* entry to link free blocks in free lists */ @@ -1946,7 +1946,7 @@ static NTSTATUS heap_allocate_block_lfh( struct heap *heap, ULONG flags, SIZE_T if ((block = find_free_bin_block( heap, flags, block_size, bin ))) { block_set_type( block, BLOCK_TYPE_USED ); - block_set_flags( block, ~BLOCK_FLAG_LFH, BLOCK_USER_FLAGS( flags ) ); + block_set_flags( block, (BYTE)~BLOCK_FLAG_LFH, BLOCK_USER_FLAGS( flags ) ); block->tail_size = block_size - sizeof(*block) - size; initialize_block( block, 0, size, flags ); mark_block_tail( block, flags ); @@ -1971,7 +1971,7 @@ static NTSTATUS heap_free_block_lfh( struct heap *heap, ULONG flags, struct bloc i = block_get_group_index( block ); valgrind_make_writable( block, sizeof(*block) ); block_set_type( block, BLOCK_TYPE_FREE ); - block_set_flags( block, ~BLOCK_FLAG_LFH, BLOCK_FLAG_FREE ); + block_set_flags( block, (BYTE)~BLOCK_FLAG_LFH, BLOCK_FLAG_FREE ); mark_block_free( block + 1, (char *)block + block_size - (char *)(block + 1), flags ); /* if this was the last used block in a group and GROUP_FLAG_FREE was set */

1 0

Bartosz Kosiorek : gdiplus: Improve performance of units_to_pixels by not using division.
by Alexandre Julliard 26 Oct '23

26 Oct '23

Module: wine Branch: master Commit: 012f61067591c53a5d2508d8721223ae9a835383 URL: https://gitlab.winehq.org/wine/wine/-/commit/012f61067591c53a5d2508d8721223… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Tue Oct 24 22:12:21 2023 +0200 gdiplus: Improve performance of units_to_pixels by not using division. Single float division (divss) is at least four time slower, than multiplication (mulss). More information: https://www.agner.org/optimize/instruction_tables.pdf The units_to_pixels was optimized to use only multiplication (mulss), and avoid using divisions (divss). --- dlls/gdiplus/gdiplus.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index a3c85986ffc..3c4ecdeab5f 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -36,7 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); static const REAL mm_per_inch = 25.4; +static const REAL inch_per_mm = 1.0 / 25.4; static const REAL point_per_inch = 72.0; +static const REAL inch_per_point = 1.0 / 72.0; static Status WINAPI NotificationHook(ULONG_PTR *token) { @@ -333,17 +335,17 @@ REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi, BOOL printer_display) return units; case UnitDisplay: if (printer_display) - return units * dpi / 100.0; + return units * dpi * 0.01f; else return units; case UnitPoint: - return units * dpi / point_per_inch; + return units * dpi * inch_per_point; case UnitInch: return units * dpi; case UnitDocument: - return units * dpi / 300.0; /* Per MSDN */ + return units * dpi * (1.0f / 300.0f); /* Per MSDN */ case UnitMillimeter: - return units * dpi / mm_per_inch; + return units * dpi * inch_per_mm; default: FIXME("Unhandled unit type: %d\n", unit); return 0;

1 0