March 2010 - Wine-commits - list.winehq.org

Juan Lang : rpcrt4: Implement UuidCreateSequential using the machine' s MAC address, when available.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 86292d1dbacfd626452f79eccf04c0f0929c6450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86292d1dbacfd626452f79ecc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 3 14:37:40 2010 -0800 rpcrt4: Implement UuidCreateSequential using the machine's MAC address, when available. --- dlls/rpcrt4/Makefile.in | 2 +- dlls/rpcrt4/rpcrt4_main.c | 132 ++++++++++++++++++++++++++++++++++++++++++++- dlls/rpcrt4/tests/rpc.c | 2 - 3 files changed, 132 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index fda374c..ce50b36 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = rpcrt4.dll IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32 kernel32 ntdll -DELAYIMPORTS = wininet secur32 user32 +DELAYIMPORTS = iphlpapi wininet secur32 user32 EXTRALIBS = @SOCKETLIBS@ C_SRCS = \ diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index a790ccb..344b6d0 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -44,6 +44,8 @@ #include "winnt.h" #include "winternl.h" #include "ntsecapi.h" +#include "iptypes.h" +#include "iphlpapi.h" #include "wine/unicode.h" #include "rpc.h" @@ -60,6 +62,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(rpc); static UUID uuid_nil; +static CRITICAL_SECTION uuid_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &uuid_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": uuid_cs") } +}; +static CRITICAL_SECTION uuid_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; + static CRITICAL_SECTION threaddata_cs; static CRITICAL_SECTION_DEBUG threaddata_cs_debug = { @@ -305,6 +316,58 @@ RPC_STATUS WINAPI UuidCreate(UUID *Uuid) return RPC_S_OK; } +/* Number of 100ns ticks per clock tick. To be safe, assume that the clock + resolution is at least 1000 * 100 * (1/1000000) = 1/10 of a second */ +#define TICKS_PER_CLOCK_TICK 1000 +#define SECSPERDAY 86400 +#define TICKSPERSEC 10000000 +/* UUID system time starts at October 15, 1582 */ +#define SECS_15_OCT_1582_TO_1601 ((17 + 30 + 31 + 365 * 18 + 5) * SECSPERDAY) +#define TICKS_15_OCT_1582_TO_1601 ((ULONGLONG)SECS_15_OCT_1582_TO_1601 * TICKSPERSEC) + +static void RPC_UuidGetSystemTime(ULONGLONG *time) +{ + FILETIME ft; + + GetSystemTimeAsFileTime(&ft); + + *time = ((ULONGLONG)ft.dwHighDateTime << 32) | ft.dwLowDateTime; + *time += TICKS_15_OCT_1582_TO_1601; +} + +/* Assume that a hardware address is at least 6 bytes long */ +#define ADDRESS_BYTES_NEEDED 6 + +static RPC_STATUS RPC_UuidGetNodeAddress(BYTE *address) +{ + int i; + DWORD status = RPC_S_OK; + + ULONG buflen = sizeof(IP_ADAPTER_INFO); + PIP_ADAPTER_INFO adapter = HeapAlloc(GetProcessHeap(), 0, buflen); + + if (GetAdaptersInfo(adapter, &buflen) == ERROR_BUFFER_OVERFLOW) { + HeapFree(GetProcessHeap(), 0, adapter); + adapter = HeapAlloc(GetProcessHeap(), 0, buflen); + } + + if (GetAdaptersInfo(adapter, &buflen) == NO_ERROR) { + for (i = 0; i < ADDRESS_BYTES_NEEDED; i++) { + address[i] = adapter->Address[i]; + } + } + /* We can't get a hardware address, just use random numbers. + Set the multicast bit to prevent conflicts with real cards. */ + else { + RtlGenRandom(address, ADDRESS_BYTES_NEEDED); + address[0] |= 0x01; + status = RPC_S_UUID_LOCAL_ONLY; + } + + HeapFree(GetProcessHeap(), 0, adapter); + return status; +} + /************************************************************************* * UuidCreateSequential [RPCRT4.@] * @@ -315,10 +378,77 @@ RPC_STATUS WINAPI UuidCreate(UUID *Uuid) * RPC_S_OK if successful. * RPC_S_UUID_LOCAL_ONLY if UUID is only locally unique. * + * FIXME: No compensation for changes across reloading + * this dll or across reboots (e.g. clock going + * backwards and swapped network cards). The RFC + * suggests using NVRAM for storing persistent + * values. */ RPC_STATUS WINAPI UuidCreateSequential(UUID *Uuid) { - return UuidCreate(Uuid); + static int initialised, count; + + ULONGLONG time; + static ULONGLONG timelast; + static WORD sequence; + + static DWORD status; + static BYTE address[MAX_ADAPTER_ADDRESS_LENGTH]; + + EnterCriticalSection(&uuid_cs); + + if (!initialised) { + RPC_UuidGetSystemTime(&timelast); + count = TICKS_PER_CLOCK_TICK; + + sequence = ((rand() & 0xff) << 8) + (rand() & 0xff); + sequence &= 0x1fff; + + status = RPC_UuidGetNodeAddress(address); + initialised = 1; + } + + /* Generate time element of the UUID. Account for going faster + than our clock as well as the clock going backwards. */ + while (1) { + RPC_UuidGetSystemTime(&time); + if (time > timelast) { + count = 0; + break; + } + if (time < timelast) { + sequence = (sequence + 1) & 0x1fff; + count = 0; + break; + } + if (count < TICKS_PER_CLOCK_TICK) { + count++; + break; + } + } + + timelast = time; + time += count; + + /* Pack the information into the UUID structure. */ + + Uuid->Data1 = (unsigned long)(time & 0xffffffff); + Uuid->Data2 = (unsigned short)((time >> 32) & 0xffff); + Uuid->Data3 = (unsigned short)((time >> 48) & 0x0fff); + + /* This is a version 1 UUID */ + Uuid->Data3 |= (1 << 12); + + Uuid->Data4[0] = sequence & 0xff; + Uuid->Data4[1] = (sequence & 0x3f00) >> 8; + Uuid->Data4[1] |= 0x80; + memcpy(&Uuid->Data4[2], address, ADDRESS_BYTES_NEEDED); + + LeaveCriticalSection(&uuid_cs); + + TRACE("%s\n", debugstr_guid(Uuid)); + + return status; } diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 7bd78ba..bb480e1 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -820,7 +820,6 @@ static void test_UuidCreateSequential(void) ok(!ret || ret == RPC_S_UUID_LOCAL_ONLY, "expected RPC_S_OK or RPC_S_UUID_LOCAL_ONLY, got %08x\n", ret); version = (guid1.Data3 & 0xf000) >> 12; - todo_wine ok(version == 1, "unexpected version %d\n", version); if (version == 1) { @@ -849,7 +848,6 @@ static void test_UuidCreateSequential(void) ok(!ret || ret == RPC_S_UUID_LOCAL_ONLY, "expected RPC_S_OK or RPC_S_UUID_LOCAL_ONLY, got %08x\n", ret); version = (guid2.Data3 & 0xf000) >> 12; - todo_wine ok(version == 1, "unexpected version %d\n", version); ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), "unexpected value in MAC address\n");

1 0

Justin Chevrier : gdiplus/test: Add GdipSetImageAttributesRemapTable test and fix typo.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 74a3945b0095b7613d210b9c33ff201d8bebee82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a3945b0095b7613d210b9c3… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Wed Mar 3 20:06:32 2010 -0500 gdiplus/test: Add GdipSetImageAttributesRemapTable test and fix typo. --- dlls/gdiplus/tests/image.c | 66 ++++++++++++++++++++++++++++++++++++++++++ include/gdipluscolormatrix.h | 2 +- 2 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9d5c051..2e3bd74 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1745,6 +1745,71 @@ static void test_rotateflip(void) GdipDisposeImage(bitmap); } +static void test_remaptable(void) +{ + GpStatus stat; + GpImageAttributes *imageattr; + GpBitmap *bitmap1, *bitmap2; + GpGraphics *graphics; + ARGB color; + ColorMap *map; + + map = GdipAlloc(sizeof(ColorMap)); + + map->oldColor.Argb = 0xff00ff00; + map->newColor.Argb = 0xffff00ff; + + stat = GdipSetImageAttributesRemapTable(NULL, ColorAdjustTypeDefault, TRUE, 1, map); + todo_wine expect(InvalidParameter, stat); + + stat = GdipCreateImageAttributes(&imageattr); + expect(Ok, stat); + + stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 1, NULL); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeCount, TRUE, 1, map); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeAny, TRUE, 1, map); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 0, map); + todo_wine expect(InvalidParameter, stat); + + stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, FALSE, 0, NULL); + todo_wine expect(Ok, stat); + + stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 1, map); + todo_wine expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1); + expect(Ok, stat); + + stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap2); + expect(Ok, stat); + + stat = GdipBitmapSetPixel(bitmap1, 0, 0, 0xff00ff00); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap2, &graphics); + expect(Ok, stat); + + stat = GdipDrawImageRectRectI(graphics, (GpImage*)bitmap1, 0,0,1,1, 0,0,1,1, + UnitPixel, imageattr, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap2, 0, 0, &color); + expect(Ok, stat); + todo_wine ok(color_match(0xffff00ff, color, 1), "Expected ffff00ff, got %.8x\n", color); + + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bitmap1); + GdipDisposeImage((GpImage*)bitmap2); + GdipDisposeImageAttributes(imageattr); + GdipFree(map); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1780,6 +1845,7 @@ START_TEST(image) test_gamma(); test_multiframegif(); test_rotateflip(); + test_remaptable(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h index 532e8f4..fbf1b2a 100644 --- a/include/gdipluscolormatrix.h +++ b/include/gdipluscolormatrix.h @@ -45,7 +45,7 @@ enum ColorAdjustType struct ColorMap { Color oldColor; - Color newCOlor; + Color newColor; }; #ifndef __cplusplus

1 0

Justin Chevrier : gdiplus: Implement GdipSetImageAttributesRemapTable with updated test.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 78f9177d9d3cce66b3bfe65dfa6652e1c5d6d457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78f9177d9d3cce66b3bfe65df… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Wed Mar 3 20:06:33 2010 -0500 gdiplus: Implement GdipSetImageAttributesRemapTable with updated test. --- dlls/gdiplus/gdiplus_private.h | 7 +++++++ dlls/gdiplus/imageattributes.c | 19 ++++++++++++++----- dlls/gdiplus/tests/image.c | 14 +++++++------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 8e26eb1..ca1cba6 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -264,10 +264,17 @@ struct color_matrix{ ColorMatrix graymatrix; }; +struct color_remap_table{ + BOOL enabled; + INT mapsize; + GDIPCONST ColorMap *colormap; +}; + struct GpImageAttributes{ WrapMode wrap; struct color_key colorkeys[ColorAdjustTypeCount]; struct color_matrix colormatrices[ColorAdjustTypeCount]; + struct color_remap_table colorremaptables[ColorAdjustTypeCount]; BOOL gamma_enabled[ColorAdjustTypeCount]; REAL gamma[ColorAdjustTypeCount]; }; diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index c9c3bcc..1a7118d 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -204,14 +204,23 @@ GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAtt ColorAdjustType type, BOOL enableFlag, UINT mapSize, GDIPCONST ColorMap *map) { - static int calls; - TRACE("(%p,%u,%i,%u,%p)\n", imageAttr, type, enableFlag, mapSize, map); - if(!(calls++)) - FIXME("not implemented\n"); + if(!imageAttr || type >= ColorAdjustTypeCount) + return InvalidParameter; - return NotImplemented; + if (enableFlag) + { + if(!map || !mapSize) + return InvalidParameter; + + imageAttr->colorremaptables[type].mapsize = mapSize; + imageAttr->colorremaptables[type].colormap = map; + } + + imageAttr->colorremaptables[type].enabled = enableFlag; + + return Ok; } GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes *imageAttr, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 2e3bd74..9085ef2 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1760,28 +1760,28 @@ static void test_remaptable(void) map->newColor.Argb = 0xffff00ff; stat = GdipSetImageAttributesRemapTable(NULL, ColorAdjustTypeDefault, TRUE, 1, map); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipCreateImageAttributes(&imageattr); expect(Ok, stat); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 1, NULL); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeCount, TRUE, 1, map); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeAny, TRUE, 1, map); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 0, map); - todo_wine expect(InvalidParameter, stat); + expect(InvalidParameter, stat); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, FALSE, 0, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipSetImageAttributesRemapTable(imageattr, ColorAdjustTypeDefault, TRUE, 1, map); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat32bppRGB, NULL, &bitmap1); expect(Ok, stat);

1 0

Christian Costa : d3dx9_36: Avoid dereferencing null pointers in trace ( spotted by Paul Vriens).
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 6dfe16fc480d73d272cf1fb1731b487238a4be42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dfe16fc480d73d272cf1fb17… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Mar 4 08:20:44 2010 +0100 d3dx9_36: Avoid dereferencing null pointers in trace (spotted by Paul Vriens). --- dlls/d3dx9_36/shader.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 9acad32..e4de6b3 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -154,11 +154,13 @@ HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVO /* Check if this is the comment we are looking for */ if (*(ptr + 1) == fourcc) { + UINT ctab_size = (comment_size - 1) * sizeof(DWORD); + LPCVOID ctab_data = ptr + 2; if (size) - *size = (comment_size - 1) * sizeof(DWORD); + *size = ctab_size; if (data) - *data = ptr + 2; - TRACE("Returning comment data at %p with size %d\n", *data, *size); + *data = ctab_data; + TRACE("Returning comment data at %p with size %d\n", ctab_data, ctab_size); return D3D_OK; } ptr += comment_size;

1 0

Paul Vriens : shell32/tests: Prevent crash on W2K and below.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: f370ab7e9b074ac668075af71be41ff535a7fbbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f370ab7e9b074ac668075af71… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 4 08:49:34 2010 +0100 shell32/tests: Prevent crash on W2K and below. --- dlls/shell32/tests/shlfolder.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 9b19471..85f04a9 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -104,17 +104,23 @@ static void test_ParseDisplayName(void) hr = SHGetDesktopFolder(&IDesktopFolder); if(hr != S_OK) return; - /* null name and pidl */ - hr = IShellFolder_ParseDisplayName(IDesktopFolder, - NULL, NULL, NULL, NULL, NULL, 0); - ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); - - /* null name */ - newPIDL = (ITEMIDLIST*)0xdeadbeef; - hr = IShellFolder_ParseDisplayName(IDesktopFolder, - NULL, NULL, NULL, NULL, &newPIDL, 0); - ok(newPIDL == 0, "expected null, got %p\n", newPIDL); - ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); + /* Tests crash on W2K and below (SHCreateShellItem available as of XP) */ + if (pSHCreateShellItem) + { + /* null name and pidl */ + hr = IShellFolder_ParseDisplayName(IDesktopFolder, + NULL, NULL, NULL, NULL, NULL, 0); + ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); + + /* null name */ + newPIDL = (ITEMIDLIST*)0xdeadbeef; + hr = IShellFolder_ParseDisplayName(IDesktopFolder, + NULL, NULL, NULL, NULL, &newPIDL, 0); + ok(newPIDL == 0, "expected null, got %p\n", newPIDL); + ok(hr == E_INVALIDARG, "returned %08x, expected E_INVALIDARG\n", hr); + } + else + win_skip("Tests would crash on W2K and below\n"); MultiByteToWideChar(CP_ACP, 0, cInetTestA, -1, cTestDirW, MAX_PATH); hr = IShellFolder_ParseDisplayName(IDesktopFolder,

1 0

Hans Leidekker : msi: Initialize a couple of variables.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 353035fadd7f4098a22ee40d91d23b3882fe4531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=353035fadd7f4098a22ee40d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 4 09:17:50 2010 +0100 msi: Initialize a couple of variables. Found by Valgrind. --- dlls/msi/action.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 08cf975..9b44de0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4285,8 +4285,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) { MSIFEATURE *feature; UINT rc; - HKEY hkey; - HKEY userdata = NULL; + HKEY hkey = NULL, userdata = NULL; if (!msi_check_publish(package)) return ERROR_SUCCESS; @@ -4853,7 +4852,7 @@ static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param) MSIPACKAGE *package = param; LPCWSTR compgroupid, component, feature, qualifier, text; LPWSTR advertise = NULL, output = NULL; - HKEY hkey; + HKEY hkey = NULL; UINT rc; MSICOMPONENT *comp; MSIFEATURE *feat; @@ -5933,7 +5932,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) LPWSTR data = NULL, newval = NULL, deformatted = NULL, ptr; DWORD flags, type, size; UINT res; - HKEY env; + HKEY env = NULL; MSICOMPONENT *comp; MSIRECORD *uirow; int action = 0;

1 0

Dylan Smith : gdi32: Provide a non-blank font face name for ANSI_FIXED_FONT .
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: e2d7da06047e40b6f3a0e174e22a70fe59d2c93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d7da06047e40b6f3a0e174e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Mar 4 05:17:29 2010 -0500 gdi32: Provide a non-blank font face name for ANSI_FIXED_FONT. This patch avoids using the wrong font when this stock font is selected, which could be seen by modifying notepad to send WM_SETFONT to the edit control with GetStockObject(ANSI_FIXED_FONT) for wParam. --- dlls/gdi32/gdiobj.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 3c8bdfa..3f84f9c 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -89,7 +89,8 @@ static const LOGFONTW OEMFixedFont = static const LOGFONTW AnsiFixedFont = { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, {'\0'} }; + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, + {'C','o','u','r','i','e','r','\0'} }; static const LOGFONTW AnsiVarFont = { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET,

1 0

Alexandre Julliard : wine.inf: Create a few Wow64 symbolic links.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 562ba3c91c17e6bac91b68b7ae7a64de2e793427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=562ba3c91c17e6bac91b68b7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 4 14:17:23 2010 +0100 wine.inf: Create a few Wow64 symbolic links. --- tools/wine.inf.in | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e4e3829..4702761 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -75,6 +75,32 @@ AddReg=\ Timezones,\ VersionInfo +[DefaultInstall.ntamd64] +RegisterDlls=RegisterDllsSection +WineFakeDlls=FakeDllsSection +UpdateInis=SystemIni +AddReg=\ + Classes,\ + ContentIndex,\ + ControlClass,\ + CurrentVersion,\ + Debugger,\ + Desktop,\ + Metrics,\ + DirectX,\ + Fonts,\ + MCI,\ + Misc,\ + Nls,\ + OLE,\ + Printing,\ + Services, \ + SessionMgr,\ + Tapi,\ + Timezones,\ + VersionInfo,\ + Wow64 + [DefaultInstall.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService @@ -2868,3 +2894,9 @@ HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" + +[Wow64] +HKLM,Software\Classes\Wow6432Node\AppId,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Classes\AppId" +HKLM,Software\Classes\Wow6432Node\Protocols,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Classes\Protocols" +HKLM,Software\Classes\Wow6432Node\TypeLib,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Classes\TypeLib" +HKLM,Software\Wow6432Node\Classes,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Classes\Wow6432Node"

1 0

Yann Droneaud : aclocal.m4: Fix WINE_TRY_CFLAGS macro (LLVM/Clang).
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 5d3eacd25009dd531c52f4a08572eabf8a899810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d3eacd25009dd531c52f4a08… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Thu Mar 4 11:43:17 2010 +0100 aclocal.m4: Fix WINE_TRY_CFLAGS macro (LLVM/Clang). --- aclocal.m4 | 2 +- configure | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 7f5f040..1aba083 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -75,7 +75,7 @@ AC_DEFUN([WINE_TRY_CFLAGS], AC_CACHE_CHECK([whether the compiler supports $1], ac_var, [ac_wine_try_cflags_saved=$CFLAGS CFLAGS="$CFLAGS $1" -AC_LINK_IFELSE(AC_LANG_SOURCE([int main(int argc, char *argv[]) { return 0; }]), +AC_LINK_IFELSE(AC_LANG_SOURCE([[int main(int argc, char **argv) { return 0; }]]), [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)]) CFLAGS=$ac_wine_try_cflags_saved]) AS_IF([test AS_VAR_GET(ac_var) = yes], diff --git a/configure b/configure index 6d98218..48ad51a 100755 --- a/configure +++ b/configure @@ -6546,7 +6546,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,confest.so.1" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__soname_confest_so_1=yes @@ -6571,7 +6571,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-h,confest.so.1" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__h_confest_so_1=yes @@ -6598,7 +6598,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic,-z,defs" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs=yes @@ -6624,7 +6624,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic,-init,__wine_spec_init,-fini,__wine_spec_fini" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__init___wine_spec_init__fini___wine_spec_fini=yes @@ -6651,7 +6651,7 @@ else CFLAGS="$CFLAGS -fPIC -shared -Wl,--version-script=conftest.map" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__shared__Wl___version_script_conftest_map=yes @@ -6678,7 +6678,7 @@ else CFLAGS="$CFLAGS -fPIC -Wl,--export-dynamic" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fPIC__Wl___export_dynamic=yes @@ -6706,7 +6706,7 @@ else CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_var=yes" @@ -6734,7 +6734,7 @@ else CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : eval "$as_ac_var=yes" @@ -6763,7 +6763,7 @@ else CFLAGS="$CFLAGS -Wl,--enable-new-dtags" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wl___enable_new_dtags=yes @@ -6791,7 +6791,7 @@ else CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes @@ -11504,7 +11504,7 @@ else CFLAGS="$CFLAGS -fno-builtin" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fno_builtin=yes @@ -11530,7 +11530,7 @@ else CFLAGS="$CFLAGS -fno-strict-aliasing" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__fno_strict_aliasing=yes @@ -11555,7 +11555,7 @@ else CFLAGS="$CFLAGS -Wdeclaration-after-statement" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wdeclaration_after_statement=yes @@ -11580,7 +11580,7 @@ else CFLAGS="$CFLAGS -Wstrict-prototypes" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wstrict_prototypes=yes @@ -11605,7 +11605,7 @@ else CFLAGS="$CFLAGS -Wtype-limits" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wtype_limits=yes @@ -11630,7 +11630,7 @@ else CFLAGS="$CFLAGS -Wwrite-strings" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Wwrite_strings=yes @@ -11691,7 +11691,7 @@ else CFLAGS="$CFLAGS -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int main(int argc, char *argv) { return 0; } +int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_cflags__Werror=yes

1 0

Alexandre Julliard : ntdll: Return STATUS_IMAGE_NOT_AT_BASE when an image mapping has to be relocated.
by Alexandre Julliard 04 Mar '10

04 Mar '10

Module: wine Branch: master Commit: 83c272a258c337f64dd57048a7b265390ed151e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83c272a258c337f64dd57048a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 20:04:55 2010 +0100 ntdll: Return STATUS_IMAGE_NOT_AT_BASE when an image mapping has to be relocated. --- dlls/kernel32/virtual.c | 2 +- dlls/ntdll/loader.c | 2 +- dlls/ntdll/virtual.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 9ad941b..dcd5b85 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -545,7 +545,7 @@ LPVOID WINAPI MapViewOfFileEx( HANDLE handle, DWORD access, if (access & FILE_MAP_EXECUTE) protect <<= 4; if ((status = NtMapViewOfSection( handle, GetCurrentProcess(), &addr, 0, 0, &offset, - &count, ViewShare, 0, protect ))) + &count, ViewShare, 0, protect )) < 0) { SetLastError( RtlNtStatusToDosError(status) ); addr = NULL; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7bbcf95..1723f18 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1498,7 +1498,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, LPCWSTR name, HANDLE file, status = NtMapViewOfSection( mapping, NtCurrentProcess(), &module, 0, 0, &size, &len, ViewShare, 0, PAGE_READONLY ); NtClose( mapping ); - if (status != STATUS_SUCCESS) return status; + if (status < 0) return status; /* create the MODREF */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9731069..15973fb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1296,6 +1296,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz #ifdef VALGRIND_LOAD_PDB_DEBUGINFO VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, delta); #endif + if (ptr != base) return STATUS_IMAGE_NOT_AT_BASE; return STATUS_SUCCESS; error: @@ -2409,7 +2410,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p res = NTDLL_queue_process_apc( process, &call, &result ); if (res != STATUS_SUCCESS) return res; - if (result.map_view.status == STATUS_SUCCESS) + if ((NTSTATUS)result.map_view.status >= 0) { *addr_ptr = wine_server_get_ptr( result.map_view.addr ); *size_ptr = result.map_view.size; @@ -2461,7 +2462,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p -1, dup_mapping, addr_ptr ); } if (needs_close) close( unix_handle ); - if (!res) *size_ptr = size; + if (res >= 0) *size_ptr = size; return res; }

1 0