Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 64253: [WIN32K] - Add a debug print to help, well..., debugging.
by jgardou＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: jgardou Date: Tue Sep 23 23:28:22 2014 New Revision: 64253 URL: http://svn.reactos.org/svn/reactos?rev=64253&view=rev Log: [WIN32K] - Add a debug print to help, well..., debugging. Modified: trunk/reactos/win32ss/user/ntuser/callback.c Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Tue Sep 23 23:28:22 2014 @@ -295,6 +295,9 @@ ULONG ResultLength; ULONG ArgumentLength; LRESULT Result; + + TRACE("co_IntCallWindowProc(Proc %p, IsAnsiProc: %s, Wnd %p, Message %u, wParam %Iu, lParam %Id, lParamBufferSize %d)\n", + Proc, IsAnsiProc ? "TRUE" : "FALSE", Wnd, Message, wParam, lParam, lParamBufferSize); /* Do not allow the desktop thread to do callback to user mode */ ASSERT(PsGetCurrentThreadWin32Thread() != gptiDesktopThread);

1 0

[jgardou] 64252: [HIVESFT] - Add the AddTrust Certificate root. Now Oracle servers can be reached with SSL.
by jgardou＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: jgardou Date: Tue Sep 23 23:28:08 2014 New Revision: 64252 URL: http://svn.reactos.org/svn/reactos?rev=64252&view=rev Log: [HIVESFT] - Add the AddTrust Certificate root. Now Oracle servers can be reached with SSL. Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Tue Sep 23 23:28:08 2014 @@ -420,6 +420,78 @@ 0xB6,0xF7,0x82,0x5F,0x85,0xD2,0x41,0x18,0xDB,0x81,0xB3,0x04,0x1C,0xC5,0x1F,0xA4,\ 0x80,0x6F,0x15,0x20,0xC9,0xDE,0x0C,0x88,0x0A,0x1D,0xD6,0x66,0x55,0xE2,0xFC,0x48,\ 0xC9,0x29,0x26,0x69,0xE0 + +; AddTrust External CA Root +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\02FAF3E291435468607857694DF5E45B68851868","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x3A,0x04,0x00,0x00,0x30,0x82,0x04,0x36,\ + 0x30,0x82,0x03,0x1E,0xA0,0x03,0x02,0x01,0x02,0x02,0x01,0x01,0x30,0x0D,0x06,0x09,\ + 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x30,0x6F,0x31,0x0B,0x30,\ + 0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x53,0x45,0x31,0x14,0x30,0x12,0x06,0x03,\ + 0x55,0x04,0x0A,0x13,0x0B,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x41,0x42,\ + 0x31,0x26,0x30,0x24,0x06,0x03,0x55,0x04,0x0B,0x13,0x1D,0x41,0x64,0x64,0x54,0x72,\ + 0x75,0x73,0x74,0x20,0x45,0x78,0x74,0x65,0x72,0x6E,0x61,0x6C,0x20,0x54,0x54,0x50,\ + 0x20,0x4E,0x65,0x74,0x77,0x6F,0x72,0x6B,0x31,0x22,0x30,0x20,0x06,0x03,0x55,0x04,\ + 0x03,0x13,0x19,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x45,0x78,0x74,0x65,\ + 0x72,0x6E,0x61,0x6C,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74,0x30,0x1E,0x17,0x0D,\ + 0x30,0x30,0x30,0x35,0x33,0x30,0x31,0x30,0x34,0x38,0x33,0x38,0x5A,0x17,0x0D,0x32,\ + 0x30,0x30,0x35,0x33,0x30,0x31,0x30,0x34,0x38,0x33,0x38,0x5A,0x30,0x6F,0x31,0x0B,\ + 0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x53,0x45,0x31,0x14,0x30,0x12,0x06,\ + 0x03,0x55,0x04,0x0A,0x13,0x0B,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x41,\ + 0x42,0x31,0x26,0x30,0x24,0x06,0x03,0x55,0x04,0x0B,0x13,0x1D,0x41,0x64,0x64,0x54,\ + 0x72,0x75,0x73,0x74,0x20,0x45,0x78,0x74,0x65,0x72,0x6E,0x61,0x6C,0x20,0x54,0x54,\ + 0x50,0x20,0x4E,0x65,0x74,0x77,0x6F,0x72,0x6B,0x31,0x22,0x30,0x20,0x06,0x03,0x55,\ + 0x04,0x03,0x13,0x19,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x45,0x78,0x74,\ + 0x65,0x72,0x6E,0x61,0x6C,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74,0x30,0x82,0x01,\ + 0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,\ + 0x03,0x82,0x01,0x0F,0x00,0x30,0x82,0x01,0x0A,0x02,0x82,0x01,0x01,0x00,0xB7,0xF7,\ + 0x1A,0x33,0xE6,0xF2,0x00,0x04,0x2D,0x39,0xE0,0x4E,0x5B,0xED,0x1F,0xBC,0x6C,0x0F,\ + 0xCD,0xB5,0xFA,0x23,0xB6,0xCE,0xDE,0x9B,0x11,0x33,0x97,0xA4,0x29,0x4C,0x7D,0x93,\ + 0x9F,0xBD,0x4A,0xBC,0x93,0xED,0x03,0x1A,0xE3,0x8F,0xCF,0xE5,0x6D,0x50,0x5A,0xD6,\ + 0x97,0x29,0x94,0x5A,0x80,0xB0,0x49,0x7A,0xDB,0x2E,0x95,0xFD,0xB8,0xCA,0xBF,0x37,\ + 0x38,0x2D,0x1E,0x3E,0x91,0x41,0xAD,0x70,0x56,0xC7,0xF0,0x4F,0x3F,0xE8,0x32,0x9E,\ + 0x74,0xCA,0xC8,0x90,0x54,0xE9,0xC6,0x5F,0x0F,0x78,0x9D,0x9A,0x40,0x3C,0x0E,0xAC,\ + 0x61,0xAA,0x5E,0x14,0x8F,0x9E,0x87,0xA1,0x6A,0x50,0xDC,0xD7,0x9A,0x4E,0xAF,0x05,\ + 0xB3,0xA6,0x71,0x94,0x9C,0x71,0xB3,0x50,0x60,0x0A,0xC7,0x13,0x9D,0x38,0x07,0x86,\ + 0x02,0xA8,0xE9,0xA8,0x69,0x26,0x18,0x90,0xAB,0x4C,0xB0,0x4F,0x23,0xAB,0x3A,0x4F,\ + 0x84,0xD8,0xDF,0xCE,0x9F,0xE1,0x69,0x6F,0xBB,0xD7,0x42,0xD7,0x6B,0x44,0xE4,0xC7,\ + 0xAD,0xEE,0x6D,0x41,0x5F,0x72,0x5A,0x71,0x08,0x37,0xB3,0x79,0x65,0xA4,0x59,0xA0,\ + 0x94,0x37,0xF7,0x00,0x2F,0x0D,0xC2,0x92,0x72,0xDA,0xD0,0x38,0x72,0xDB,0x14,0xA8,\ + 0x45,0xC4,0x5D,0x2A,0x7D,0xB7,0xB4,0xD6,0xC4,0xEE,0xAC,0xCD,0x13,0x44,0xB7,0xC9,\ + 0x2B,0xDD,0x43,0x00,0x25,0xFA,0x61,0xB9,0x69,0x6A,0x58,0x23,0x11,0xB7,0xA7,0x33,\ + 0x8F,0x56,0x75,0x59,0xF5,0xCD,0x29,0xD7,0x46,0xB7,0x0A,0x2B,0x65,0xB6,0xD3,0x42,\ + 0x6F,0x15,0xB2,0xB8,0x7B,0xFB,0xEF,0xE9,0x5D,0x53,0xD5,0x34,0x5A,0x27,0x02,0x03,\ + 0x01,0x00,0x01,0xA3,0x81,0xDC,0x30,0x81,0xD9,0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,\ + 0x04,0x16,0x04,0x14,0xAD,0xBD,0x98,0x7A,0x34,0xB4,0x26,0xF7,0xFA,0xC4,0x26,0x54,\ + 0xEF,0x03,0xBD,0xE0,0x24,0xCB,0x54,0x1A,0x30,0x0B,0x06,0x03,0x55,0x1D,0x0F,0x04,\ + 0x04,0x03,0x02,0x01,0x06,0x30,0x0F,0x06,0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,\ + 0x05,0x30,0x03,0x01,0x01,0xFF,0x30,0x81,0x99,0x06,0x03,0x55,0x1D,0x23,0x04,0x81,\ + 0x91,0x30,0x81,0x8E,0x80,0x14,0xAD,0xBD,0x98,0x7A,0x34,0xB4,0x26,0xF7,0xFA,0xC4,\ + 0x26,0x54,0xEF,0x03,0xBD,0xE0,0x24,0xCB,0x54,0x1A,0xA1,0x73,0xA4,0x71,0x30,0x6F,\ + 0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x53,0x45,0x31,0x14,0x30,\ + 0x12,0x06,0x03,0x55,0x04,0x0A,0x13,0x0B,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,\ + 0x20,0x41,0x42,0x31,0x26,0x30,0x24,0x06,0x03,0x55,0x04,0x0B,0x13,0x1D,0x41,0x64,\ + 0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x45,0x78,0x74,0x65,0x72,0x6E,0x61,0x6C,0x20,\ + 0x54,0x54,0x50,0x20,0x4E,0x65,0x74,0x77,0x6F,0x72,0x6B,0x31,0x22,0x30,0x20,0x06,\ + 0x03,0x55,0x04,0x03,0x13,0x19,0x41,0x64,0x64,0x54,0x72,0x75,0x73,0x74,0x20,0x45,\ + 0x78,0x74,0x65,0x72,0x6E,0x61,0x6C,0x20,0x43,0x41,0x20,0x52,0x6F,0x6F,0x74,0x82,\ + 0x01,0x01,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,\ + 0x00,0x03,0x82,0x01,0x01,0x00,0xB0,0x9B,0xE0,0x85,0x25,0xC2,0xD6,0x23,0xE2,0x0F,\ + 0x96,0x06,0x92,0x9D,0x41,0x98,0x9C,0xD9,0x84,0x79,0x81,0xD9,0x1E,0x5B,0x14,0x07,\ + 0x23,0x36,0x65,0x8F,0xB0,0xD8,0x77,0xBB,0xAC,0x41,0x6C,0x47,0x60,0x83,0x51,0xB0,\ + 0xF9,0x32,0x3D,0xE7,0xFC,0xF6,0x26,0x13,0xC7,0x80,0x16,0xA5,0xBF,0x5A,0xFC,0x87,\ + 0xCF,0x78,0x79,0x89,0x21,0x9A,0xE2,0x4C,0x07,0x0A,0x86,0x35,0xBC,0xF2,0xDE,0x51,\ + 0xC4,0xD2,0x96,0xB7,0xDC,0x7E,0x4E,0xEE,0x70,0xFD,0x1C,0x39,0xEB,0x0C,0x02,0x51,\ + 0x14,0x2D,0x8E,0xBD,0x16,0xE0,0xC1,0xDF,0x46,0x75,0xE7,0x24,0xAD,0xEC,0xF4,0x42,\ + 0xB4,0x85,0x93,0x70,0x10,0x67,0xBA,0x9D,0x06,0x35,0x4A,0x18,0xD3,0x2B,0x7A,0xCC,\ + 0x51,0x42,0xA1,0x7A,0x63,0xD1,0xE6,0xBB,0xA1,0xC5,0x2B,0xC2,0x36,0xBE,0x13,0x0D,\ + 0xE6,0xBD,0x63,0x7E,0x79,0x7B,0xA7,0x09,0x0D,0x40,0xAB,0x6A,0xDD,0x8F,0x8A,0xC3,\ + 0xF6,0xF6,0x8C,0x1A,0x42,0x05,0x51,0xD4,0x45,0xF5,0x9F,0xA7,0x62,0x21,0x68,0x15,\ + 0x20,0x43,0x3C,0x99,0xE7,0x7C,0xBD,0x24,0xD8,0xA9,0x91,0x17,0x73,0x88,0x3F,0x56,\ + 0x1B,0x31,0x38,0x18,0xB4,0x71,0x0F,0x9A,0xCD,0xC8,0x0E,0x9E,0x8E,0x2E,0x1B,0xE1,\ + 0x8C,0x98,0x83,0xCB,0x1F,0x31,0xF1,0x44,0x4C,0xC6,0x04,0x73,0x49,0x76,0x60,0x0F,\ + 0xC7,0xF8,0xBD,0x17,0x80,0x6B,0x2E,0xE9,0xCC,0x4C,0x0E,0x5A,0x9A,0x79,0x0F,0x20,\ + 0x0A,0x2E,0xD5,0x9E,0x63,0x26,0x1E,0x55,0x92,0x94,0xD8,0x82,0x17,0x5A,0x7B,0xD0,\ + 0xBC,0xC7,0x8F,0x4E,0x86,0x04 ; Time zone settings HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012

1 0

[hbelusca] 64251: [NTVDM]: Fix the PC speaker frequency, that was an octave higher than normal for the pacman.com game of CORE-8436, as well as in Dave and Rescue-Rover (because they use PIT mode 3...
by hbelusca＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: hbelusca Date: Tue Sep 23 21:04:05 2014 New Revision: 64251 URL: http://svn.reactos.org/svn/reactos?rev=64251&view=rev Log: [NTVDM]: Fix the PC speaker frequency, that was an octave higher than normal for the pacman.com game of CORE-8436, as well as in Dave and Rescue-Rover (because they use PIT mode 3, aka. square wave), but was normal for Advanced Netwars (which uses PIT mode 2, aka. rate generator). Now all those games get correct sound frequency. Modified: trunk/reactos/subsystems/ntvdm/hardware/speaker.c Modified: trunk/reactos/subsystems/ntvdm/hardware/speaker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] Tue Sep 23 21:04:05 2014 @@ -48,8 +48,8 @@ if (PitChannel2ReloadValue == 0) PitChannel2ReloadValue = 65536; /* Set beep data */ - BeepSetParameters.Frequency = (PIT_BASE_FREQUENCY / PitChannel2ReloadValue) * - (PitChannel2->Mode == PIT_MODE_SQUARE_WAVE ? 2 : 1); + BeepSetParameters.Frequency = (PIT_BASE_FREQUENCY / PitChannel2ReloadValue) + /* * (PitChannel2->Mode == PIT_MODE_SQUARE_WAVE ? 2 : 1) */; BeepSetParameters.Duration = INFINITE; /* Send the beep */

1 0

[tkreuzer] 64250: [WIN32K] - Make sure to make a copy of DC attribute fields before checking / using them - Avoid breaking DC flags in IntGdiSetMode on failure - Fix some comments
by tkreuzer＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: tkreuzer Date: Tue Sep 23 21:01:47 2014 New Revision: 64250 URL: http://svn.reactos.org/svn/reactos?rev=64250&view=rev Log: [WIN32K] - Make sure to make a copy of DC attribute fields before checking / using them - Avoid breaking DC flags in IntGdiSetMode on failure - Fix some comments Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c trunk/reactos/win32ss/gdi/ntgdi/dc.h Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] Tue Sep 23 21:01:47 2014 @@ -20,7 +20,7 @@ * Page space: * This is the coordinate system on the screen or on the paper layout for * printer devices. The coordinate system is also orthogonal but one unit - * does not neccesarily match one pixel. Instead there are different mapping + * does not necessarily match one pixel. Instead there are different mapping * modes that can be set using SetMapMode() that specify how page space units * are transformed into device space units. These mapping modes are: * - MM_TEXT: One unit matches one unit in device space (one pixel) @@ -32,15 +32,15 @@ * - MM_ISOTROPIC: * - MM_ANISOTROPIC: * If the mapping mode is either MM_ISOTROPIC or MM_ANISOTROPIC, the actual - * transormation is calculated from the window and viewport extension. + * transformation is calculated from the window and viewport extension. * The window extension can be set using SetWindowExtEx() and describes the * extents of an arbitrary window (not to confuse with the gui element!) in * page space coordinates. * The viewport extension can be set using SetViewportExtEx() and describes * the extent of the same window in device space coordinates. If the mapping * mode is MM_ISOTROPIC one of the viewport extensions can be adjusted by GDI - * to make sure the mapping stays isotropic, that is it has the same x/y ratio - * as the window extension. + * to make sure the mapping stays isotropic, i.e. that it has the same x/y + * ratio as the window extension. * * World space: * World space is the coordinate system that is used for all GDI drawing @@ -52,13 +52,14 @@ * can be set using SetWorldTransform(), which is applied to transform world * space coordinates into page space coordinates. * - * User mode data - * All coordinate translation data is stored in the dc attribute, so the values - * might be invalid. This has to be taken into account. Integer values might be + * User mode data: + * All coordinate translation data is stored in the DC attribute, so the values + * might be invalid. This has to be taken into account. Values might also be * zero, so when a division is made, the value has to be read first and then - * checked! For floating point values (FLOATOBJ as well) these restrictions do - * not apply, since we cannot get dividy-by-zero exceptions. - * Though the result might be a completely random and invalid value, if it was + * checked! This is true for both integer and floating point values, even if + * we cannot get floating point exceptions on x86, we can get them on all other + * architectures that use the FPU directly instead of emulation. + * The result of all operations might be completely random and invalid, if it was * messed with in an illegal way in user mode. This is not a problem, since the * result of coordinate transformations are never expected to be "valid" values. * In the worst case, the drawing operation draws rubbish into the DC. @@ -135,27 +136,31 @@ { PDC_ATTR pdcattr = pdc->pdcattr; PSIZEL pszlViewPortExt; + SIZEL szlWindowExt; /* Get the viewport extension */ pszlViewPortExt = DC_pszlViewportExt(pdc); + + /* Copy the window extension, so no one can mess with it */ + szlWindowExt = pdcattr->szlWindowExt; /* No shearing / rotation */ FLOATOBJ_SetLong(&pmx->efM12, 0); FLOATOBJ_SetLong(&pmx->efM21, 0); /* Calculate scaling */ - if (pdcattr->szlWindowExt.cx != 0) + if (szlWindowExt.cx != 0) { FLOATOBJ_SetLong(&pmx->efM11, pszlViewPortExt->cx); - FLOATOBJ_DivLong(&pmx->efM11, pdcattr->szlWindowExt.cx); + FLOATOBJ_DivLong(&pmx->efM11, szlWindowExt.cx); } else FLOATOBJ_SetLong(&pmx->efM11, 1); - if (pdcattr->szlWindowExt.cy != 0) + if (szlWindowExt.cy != 0) { FLOATOBJ_SetLong(&pmx->efM22, pszlViewPortExt->cy); - FLOATOBJ_DivLong(&pmx->efM22, pdcattr->szlWindowExt.cy); + FLOATOBJ_DivLong(&pmx->efM22, szlWindowExt.cy); } else FLOATOBJ_SetLong(&pmx->efM22, 1); @@ -512,7 +517,7 @@ /* The xform is permitted to be NULL for MWT_IDENTITY. * However, if it is not NULL, then it must be valid even * though it is not used. */ - if (pxformUnsafe != NULL || dwMode != MWT_IDENTITY) + if ((pxformUnsafe != NULL) || (dwMode != MWT_IDENTITY)) { _SEH2_TRY { @@ -806,13 +811,11 @@ PDC dc, int MapMode) { - int PrevMapMode; + INT iPrevMapMode; + FLONG flXform; PDC_ATTR pdcattr = dc->pdcattr; - PrevMapMode = pdcattr->iMapMode; - - pdcattr->iMapMode = MapMode; - pdcattr->flXform &= ~(ISO_OR_ANISO_MAP_MODE|PTOD_EFM22_NEGATIVE| + flXform = pdcattr->flXform & ~(ISO_OR_ANISO_MAP_MODE|PTOD_EFM22_NEGATIVE| PTOD_EFM11_NEGATIVE|POSITIVE_Y_IS_UP|PAGE_TO_DEVICE_SCALE_IDENTITY| PAGE_TO_DEVICE_IDENTITY); @@ -823,11 +826,11 @@ pdcattr->szlWindowExt.cy = 1; pdcattr->szlViewportExt.cx = 1; pdcattr->szlViewportExt.cy = 1; - pdcattr->flXform |= PAGE_TO_DEVICE_SCALE_IDENTITY; + flXform |= PAGE_TO_DEVICE_SCALE_IDENTITY; break; case MM_ISOTROPIC: - pdcattr->flXform |= ISO_OR_ANISO_MAP_MODE; + flXform |= ISO_OR_ANISO_MAP_MODE; /* Fall through */ case MM_LOMETRIC: @@ -866,19 +869,23 @@ break; case MM_ANISOTROPIC: - pdcattr->flXform &= ~(PAGE_TO_DEVICE_IDENTITY|POSITIVE_Y_IS_UP); - pdcattr->flXform |= ISO_OR_ANISO_MAP_MODE; + flXform &= ~(PAGE_TO_DEVICE_IDENTITY|POSITIVE_Y_IS_UP); + flXform |= ISO_OR_ANISO_MAP_MODE; break; default: - pdcattr->iMapMode = PrevMapMode; - PrevMapMode = 0; - } - - pdcattr->flXform |= (PAGE_XLATE_CHANGED|PAGE_EXTENTS_CHANGED| + return 0; + } + + /* Save the old map mode and set the new one */ + iPrevMapMode = pdcattr->iMapMode; + pdcattr->iMapMode = MapMode; + + /* Update xform flags */ + pdcattr->flXform = flXform | (PAGE_XLATE_CHANGED|PAGE_EXTENTS_CHANGED| INVALIDATE_ATTRIBUTES|DEVICE_TO_PAGE_INVALID|DEVICE_TO_WORLD_INVALID); - return PrevMapMode; + return iPrevMapMode; } @@ -994,7 +1001,7 @@ IntMirrorWindowOrg(PDC dc) { PDC_ATTR pdcattr; - LONG X; + LONG X, cx; pdcattr = dc->pdcattr; @@ -1003,13 +1010,16 @@ pdcattr->ptlWindowOrg.x = pdcattr->lWindowOrgx; // Flip it back. return; } - if (!pdcattr->szlViewportExt.cx) return; + + /* Copy the window extension, so no one can mess with it */ + cx = pdcattr->szlViewportExt.cx; + if (cx == 0) return; // // WOrgx = wox - (Width - 1) * WExtx / VExtx // X = (dc->erclWindow.right - dc->erclWindow.left) - 1; // Get device width - 1 - X = (X * pdcattr->szlWindowExt.cx) / pdcattr->szlViewportExt.cx; + X = (X * pdcattr->szlWindowExt.cx) / cx; pdcattr->ptlWindowOrg.x = pdcattr->lWindowOrgx - X; // Now set the inverted win origion. pdcattr->flXform |= PAGE_XLATE_CHANGED; Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Tue Sep 23 21:01:47 2014 @@ -113,7 +113,7 @@ RECTL erclBounds; RECTL erclBoundsApp; PREGION prgnAPI; - PREGION prgnVis; /* Visible region (must never be 0) */ + _Notnull_ PREGION prgnVis; /* Visible region (must never be 0) */ PREGION prgnRao; POINTL ptlFillOrigin; EBRUSHOBJ eboFill;

1 0

[tkreuzer] 64249: [WIN32K] - Modify REGION_CropAndOffsetRegion to return the region complexity - Improve NtGdiIntersectClipRect to only allocate a new region, if we don't have one yet, otherwise cr...
by tkreuzer＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: tkreuzer Date: Tue Sep 23 20:21:13 2014 New Revision: 64249 URL: http://svn.reactos.org/svn/reactos?rev=64249&view=rev Log: [WIN32K] - Modify REGION_CropAndOffsetRegion to return the region complexity - Improve NtGdiIntersectClipRect to only allocate a new region, if we don't have one yet, otherwise crop it using REGION_CropAndOffsetRegion Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/gdi/ntgdi/region.h Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Tue Sep 23 20:21:13 2014 @@ -241,54 +241,71 @@ return Result; } -int APIENTRY NtGdiIntersectClipRect(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect) -{ - INT Result; - RECTL Rect; - PREGION pNewRgn; - PDC dc = DC_LockDc(hDC); +INT +APIENTRY +NtGdiIntersectClipRect( + _In_ HDC hdc, + _In_ INT xLeft, + _In_ INT yTop, + _In_ INT xRight, + _In_ INT yBottom) +{ + INT iComplexity; + RECTL rect; + PREGION prgnNew; + PDC pdc; DPRINT("NtGdiIntersectClipRect(%p, %d,%d-%d,%d)\n", - hDC, LeftRect, TopRect, RightRect, BottomRect); - - if (!dc) + hdc, xLeft, yTop, xRight, yBottom); + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) { EngSetLastError(ERROR_INVALID_HANDLE); return ERROR; } - Rect.left = LeftRect; - Rect.top = TopRect; - Rect.right = RightRect; - Rect.bottom = BottomRect; - - IntLPtoDP(dc, (LPPOINT)&Rect, 2); - - pNewRgn = IntSysCreateRectpRgnIndirect(&Rect); - if (!pNewRgn) - { - Result = ERROR; - } - else if (!dc->dclevel.prgnClip) - { - dc->dclevel.prgnClip = pNewRgn; - Result = SIMPLEREGION; - } - else - { - Result = IntGdiCombineRgn(dc->dclevel.prgnClip, dc->dclevel.prgnClip, pNewRgn, RGN_AND); - REGION_Delete(pNewRgn); - } - if (Result != ERROR) - dc->fs |= DC_FLAG_DIRTY_RAO; - - DC_UnlockDc(dc); - - return Result; + /* Convert coordinates to device space */ + rect.left = xLeft; + rect.top = yTop; + rect.right = xRight; + rect.bottom = yBottom; + IntLPtoDP(pdc, (LPPOINT)&rect, 2); + + /* Check if we already have a clip region */ + if (pdc->dclevel.prgnClip != NULL) + { + /* We have a region, crop it */ + iComplexity = REGION_CropAndOffsetRegion(pdc->dclevel.prgnClip, + pdc->dclevel.prgnClip, + &rect, + NULL); + } + else + { + /* We don't have a region yet, allocate a new one */ + prgnNew = IntSysCreateRectpRgnIndirect(&rect); + if (prgnNew == NULL) + { + iComplexity = ERROR; + } + else + { + /* Set the new region */ + pdc->dclevel.prgnClip = prgnNew; + iComplexity = SIMPLEREGION; + } + } + + /* If we succeeded, mark the RAO region as dirty */ + if (iComplexity != ERROR) + pdc->fs |= DC_FLAG_DIRTY_RAO; + + /* Unlock the DC */ + DC_UnlockDc(pdc); + + return iComplexity; } int APIENTRY NtGdiOffsetClipRgn(HDC hDC, Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Tue Sep 23 20:21:13 2014 @@ -489,12 +489,12 @@ INT FASTCALL -REGION_Complexity( PROSRGNDATA obj ) -{ - if (!obj) return NULLREGION; - switch(obj->rdh.nCount) - { - DPRINT("Region Complexity -> %lu",obj->rdh.nCount); +REGION_Complexity(PREGION prgn) +{ + if (!prgn) return NULLREGION; + switch(prgn->rdh.nCount) + { + DPRINT("Region Complexity -> %lu", prgn->rdh.nCount); case 0: return NULLREGION; case 1: return SIMPLEREGION; default: return COMPLEXREGION; @@ -581,13 +581,13 @@ /*********************************************************************** * REGION_CropAndOffsetRegion */ -BOOL FASTCALL +INT +FASTCALL REGION_CropAndOffsetRegion( - PROSRGNDATA rgnDst, - PROSRGNDATA rgnSrc, + PREGION rgnDst, + PREGION rgnSrc, const RECTL *rect, - const POINTL *offset -) + const POINTL *offset) // FIXME: we should probably remove offset from here { POINT pt = {0,0}; const POINT *off = offset; @@ -602,13 +602,13 @@ if (off->x || off->y) xrect = rgnDst->Buffer; else - return TRUE; + return REGION_Complexity(rgnDst); } else { xrect = ExAllocatePoolWithTag(PagedPool, rgnSrc->rdh.nCount * sizeof(RECT), TAG_REGION); if(!xrect) - return FALSE; + return ERROR; if (rgnDst->Buffer && rgnDst->Buffer != &rgnDst->rdh.rcBound) ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); // Free the old buffer. Will be assigned to xrect below. } @@ -669,7 +669,7 @@ PRECTL temp; temp = ExAllocatePoolWithTag(PagedPool, i * sizeof(RECT), TAG_REGION); if (!temp) - return FALSE; + return ERROR; if (rgnDst->Buffer && rgnDst->Buffer != &rgnDst->rdh.rcBound) ExFreePoolWithTag(rgnDst->Buffer, TAG_REGION); // free the old buffer @@ -727,7 +727,7 @@ rgnDst->rdh.iType = RDH_RECTANGLES; } - return TRUE; + return REGION_Complexity(rgnDst); empty: if (!rgnDst->Buffer) @@ -739,10 +739,10 @@ rgnDst->rdh.nRgnSize = RGN_DEFAULT_RECTS * sizeof(RECT); } else - return FALSE; + return ERROR; } EMPTY_REGION(rgnDst); - return TRUE; + return NULLREGION; } Modified: trunk/reactos/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] Tue Sep 23 20:21:13 2014 @@ -28,7 +28,7 @@ INT FASTCALL REGION_GetRgnBox(PROSRGNDATA Rgn, RECTL *pRect); BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, const RECTL *rc); BOOL FASTCALL REGION_PtInRegion(PREGION, INT, INT); -BOOL FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, const RECTL *rect, const POINT *off); +INT FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, const RECTL *rect, const POINT *off); VOID FASTCALL REGION_SetRectRgn(PROSRGNDATA pRgn, INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); VOID NTAPI REGION_vCleanup(PVOID ObjectBody);

1 0

[akhaldi] 64248: [MSPATCHA] * Import from Wine 1.7.27. CORE-8550 #comment mspatcha.dll added in r64248. CORE-8540
by akhaldi＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: akhaldi Date: Tue Sep 23 19:48:41 2014 New Revision: 64248 URL: http://svn.reactos.org/svn/reactos?rev=64248&view=rev Log: [MSPATCHA] * Import from Wine 1.7.27. CORE-8550 #comment mspatcha.dll added in r64248. CORE-8540 Added: trunk/reactos/dll/win32/mspatcha/ (with props) trunk/reactos/dll/win32/mspatcha/CMakeLists.txt (with props) trunk/reactos/dll/win32/mspatcha/mspatcha.spec (with props) trunk/reactos/dll/win32/mspatcha/mspatcha_main.c (with props) trunk/reactos/dll/win32/mspatcha/version.rc (with props) trunk/reactos/include/psdk/patchapi.h (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Tue Sep 23 19:48:41 2014 @@ -107,6 +107,7 @@ add_subdirectory(msisip) add_subdirectory(msisys.ocx) #add_subdirectory(msnet32) #to be deleted in trunk. +add_subdirectory(mspatcha) add_subdirectory(msports) add_subdirectory(msrle32) add_subdirectory(mssign32) Propchange: trunk/reactos/dll/win32/mspatcha/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Sep 23 19:48:41 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/mspatcha/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/mspatcha/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/mspatcha/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/mspatcha/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mspatcha/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mspatcha/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/mspatcha/CMakeLists.txt [iso-8859-1] Tue Sep 23 19:48:41 2014 @@ -0,0 +1,16 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_definitions(-D__WINESRC__) + +spec2def(mspatcha.dll mspatcha.spec) + +list(APPEND SOURCE + mspatcha_main.c + ${CMAKE_CURRENT_BINARY_DIR}/mspatcha_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/mspatcha.def) + +add_library(mspatcha SHARED ${SOURCE} version.rc) +set_module_type(mspatcha win32dll) +target_link_libraries(mspatcha wine) +add_importlibs(mspatcha msvcrt kernel32 ntdll) +add_cd_file(TARGET mspatcha DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/mspatcha/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mspatcha/mspatcha.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mspatcha/mspatch… ============================================================================== --- trunk/reactos/dll/win32/mspatcha/mspatcha.spec (added) +++ trunk/reactos/dll/win32/mspatcha/mspatcha.spec [iso-8859-1] Tue Sep 23 19:48:41 2014 @@ -0,0 +1,12 @@ +1 stdcall ApplyPatchToFileA(str str str long) +2 stub ApplyPatchToFileByHandles +3 stub ApplyPatchToFileByHandlesEx +4 stub ApplyPatchToFileExA +5 stub ApplyPatchToFileExW +6 stdcall ApplyPatchToFileW(wstr wstr wstr long) +7 stdcall GetFilePatchSignatureA(str long ptr long ptr long ptr long ptr) +8 stub GetFilePatchSignatureByHandle +9 stdcall GetFilePatchSignatureW(wstr long ptr long ptr long ptr long ptr) +10 stub TestApplyPatchToFileA +11 stub TestApplyPatchToFileByHandles +12 stub TestApplyPatchToFileW Propchange: trunk/reactos/dll/win32/mspatcha/mspatcha.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mspatcha/mspatcha_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mspatcha/mspatch… ============================================================================== --- trunk/reactos/dll/win32/mspatcha/mspatcha_main.c (added) +++ trunk/reactos/dll/win32/mspatcha/mspatcha_main.c [iso-8859-1] Tue Sep 23 19:48:41 2014 @@ -0,0 +1,128 @@ +/* + * PatchAPI + * + * Copyright 2011 David Hedberg for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <wine/config.h> + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <patchapi.h> + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(mspatcha); + +/***************************************************** + * DllMain (MSPATCHA.@) + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } + + return TRUE; +} + +static inline WCHAR *strdupAW( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + int len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + } + return dst; +} + +/***************************************************** + * ApplyPatchToFileA (MSPATCHA.1) + */ +BOOL WINAPI ApplyPatchToFileA(LPCSTR patch_file, LPCSTR old_file, LPCSTR new_file, ULONG apply_flags) +{ + BOOL ret; + WCHAR *patch_fileW, *new_fileW, *old_fileW = NULL; + + if (!(patch_fileW = strdupAW( patch_file ))) return FALSE; + if (old_file && !(old_fileW = strdupAW( old_file ))) + { + HeapFree( GetProcessHeap(), 0, patch_fileW ); + return FALSE; + } + if (!(new_fileW = strdupAW( new_file ))) + { + HeapFree( GetProcessHeap(), 0, patch_fileW ); + HeapFree( GetProcessHeap(), 0, old_fileW ); + return FALSE; + } + ret = ApplyPatchToFileW( patch_fileW, old_fileW, new_fileW, apply_flags ); + HeapFree( GetProcessHeap(), 0, patch_fileW ); + HeapFree( GetProcessHeap(), 0, old_fileW ); + HeapFree( GetProcessHeap(), 0, new_fileW ); + return ret; +} + +/***************************************************** + * ApplyPatchToFileW (MSPATCHA.6) + */ +BOOL WINAPI ApplyPatchToFileW(LPCWSTR patch_file, LPCWSTR old_file, LPCWSTR new_file, ULONG apply_flags) +{ + FIXME("stub - %s, %s, %s, %08x\n", debugstr_w(patch_file), debugstr_w(old_file), + debugstr_w(new_file), apply_flags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/***************************************************** + * GetFilePatchSignatureA (MSPATCHA.7) + */ +BOOL WINAPI GetFilePatchSignatureA(LPCSTR filename, ULONG flags, PVOID data, ULONG ignore_range_count, + PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, + PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPSTR buffer) +{ + FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_a(filename), flags, data, + ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/***************************************************** + * GetFilePatchSignatureW (MSPATCHA.9) + */ +BOOL WINAPI GetFilePatchSignatureW(LPCWSTR filename, ULONG flags, PVOID data, ULONG ignore_range_count, + PPATCH_IGNORE_RANGE ignore_range, ULONG retain_range_count, + PPATCH_RETAIN_RANGE retain_range, ULONG bufsize, LPWSTR buffer) +{ + FIXME("stub - %s, %x, %p, %u, %p, %u, %p, %u, %p\n", debugstr_w(filename), flags, data, + ignore_range_count, ignore_range, retain_range_count, retain_range, bufsize, buffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} Propchange: trunk/reactos/dll/win32/mspatcha/mspatcha_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mspatcha/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mspatcha/version… ============================================================================== --- trunk/reactos/dll/win32/mspatcha/version.rc (added) +++ trunk/reactos/dll/win32/mspatcha/version.rc [iso-8859-1] Tue Sep 23 19:48:41 2014 @@ -0,0 +1,26 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine File Patch API" +#define WINE_FILENAME_STR "mspatcha.dll" +#define WINE_FILEVERSION 6,1,7600,16385 +#define WINE_FILEVERSION_STR "6.1.7600.16385" +#define WINE_PRODUCTVERSION 6,1,7600,16385 +#define WINE_PRODUCTVERSION_STR "6.1.7600.16385" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/mspatcha/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/patchapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/patchapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/patchapi.h (added) +++ trunk/reactos/include/psdk/patchapi.h [iso-8859-1] Tue Sep 23 19:48:41 2014 @@ -0,0 +1,52 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _PATCHAPI_H_ +#define _PATCHAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define APPLY_OPTION_FAIL_IF_EXACT 0x00000001 +#define APPLY_OPTION_FAIL_IF_CLOSE 0x00000002 +#define APPLY_OPTION_TEST_ONLY 0x00000004 +#define APPLY_OPTION_VALID_FLAGS 0x00000007 + +typedef struct _PATCH_IGNORE_RANGE +{ + ULONG OffsetInOldFile; + ULONG LengthInBytes; +} PATCH_IGNORE_RANGE, *PPATCH_IGNORE_RANGE; + +typedef struct _PATCH_RETAIN_RANGE +{ + ULONG OffsetInOldFile; + ULONG LengthInBytes; + ULONG OffsetInNewFile; +} PATCH_RETAIN_RANGE, *PPATCH_RETAIN_RANGE; + +BOOL WINAPI ApplyPatchToFileA(LPCSTR,LPCSTR,LPCSTR,ULONG); +BOOL WINAPI ApplyPatchToFileW(LPCWSTR,LPCWSTR,LPCWSTR,ULONG); +#define ApplyPatchToFile WINELIB_NAME_AW(ApplyPatchToFile) + +#ifdef __cplusplus +} +#endif + +#endif /* _PATCHAPI_H_ */ Propchange: trunk/reactos/include/psdk/patchapi.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Sep 23 19:48:41 2014 @@ -126,6 +126,7 @@ reactos/dll/win32/msisip # Synced to Wine-1.7.17 reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.17 reactos/dll/win32/msnet32 # Synced to Wine-1.7.17 +reactos/dll/win32/mspatcha # Synced to Wine-1.7.27 reactos/dll/win32/msrle32 # Synced to Wine-1.7.17 reactos/dll/win32/mssign32 # Synced to Wine-1.7.17 reactos/dll/win32/mssip32 # Synced to Wine-1.7.17

1 0

[tkreuzer] 64247: [WIN32K] - Improve GetClipBox (we have a RAO region, make use of that, no need to check for Clip or Meta region and combine them with the vis region) and fix coordinates (result m...
by tkreuzer＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: tkreuzer Date: Tue Sep 23 19:32:38 2014 New Revision: 64247 URL: http://svn.reactos.org/svn/reactos?rev=64247&view=rev Log: [WIN32K] - Improve GetClipBox (we have a RAO region, make use of that, no need to check for Clip or Meta region and combine them with the vis region) and fix coordinates (result must be in logical coordinate space!) Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c trunk/reactos/win32ss/gdi/ntgdi/cliprgn.h Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Tue Sep 23 19:32:38 2014 @@ -117,91 +117,77 @@ return retval; } -INT FASTCALL -GdiGetClipBox(HDC hDC, PRECTL rc) -{ - INT retval; - PDC dc; - PROSRGNDATA pRgnNew, pRgn = NULL; - - if (!(dc = DC_LockDc(hDC))) - { - return ERROR; - } - - if (dc->fs & DC_FLAG_DIRTY_RAO) - CLIPPING_UpdateGCRegion(dc); - - /* FIXME: Rao and Vis only! */ - if (dc->prgnAPI) // APIRGN - { - pRgn = dc->prgnAPI; - } - else if (dc->dclevel.prgnMeta) // METARGN - { - pRgn = dc->dclevel.prgnMeta; - } - else if (dc->dclevel.prgnClip) // CLIPRGN - { - pRgn = dc->dclevel.prgnClip; - } - - if (pRgn) - { - pRgnNew = IntSysCreateRectpRgn( 0, 0, 0, 0 ); - - if (!pRgnNew) - { - DC_UnlockDc(dc); - return ERROR; - } - - IntGdiCombineRgn(pRgnNew, dc->prgnVis, pRgn, RGN_AND); - - retval = REGION_GetRgnBox(pRgnNew, rc); - - REGION_Delete(pRgnNew); - - DC_UnlockDc(dc); - return retval; - } - - retval = REGION_GetRgnBox(dc->prgnVis, rc); - - DC_UnlockDc(dc); - - return retval; -} - -INT APIENTRY -NtGdiGetAppClipBox(HDC hDC, PRECTL rc) -{ - INT Ret; - NTSTATUS Status = STATUS_SUCCESS; - RECTL Saferect; - - Ret = GdiGetClipBox(hDC, &Saferect); - - _SEH2_TRY - { - ProbeForWrite(rc, - sizeof(RECT), - 1); - *rc = Saferect; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return ERROR; - } - - return Ret; +INT +FASTCALL +GdiGetClipBox( + _In_ HDC hdc, + _Out_ LPRECT prc) +{ + PDC pdc; + INT iComplexity; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + return ERROR; + } + + /* Update RAO region if necessary */ + if (pdc->fs & DC_FLAG_DIRTY_RAO) + CLIPPING_UpdateGCRegion(pdc); + + /* Check if we have a RAO region (intersection of API and VIS region) */ + if (pdc->prgnRao) + { + /* We have a RAO region, use it */ + iComplexity = REGION_GetRgnBox(pdc->prgnRao, prc); + } + else + { + /* No RAO region means no API region, so use the VIS region */ + ASSERT(pdc->prgnVis); + iComplexity = REGION_GetRgnBox(pdc->prgnVis, prc); + } + + /* Unlock the DC */ + DC_UnlockDc(pdc); + + /* Convert the rect to logical coordinates */ + IntDPtoLP(pdc, (LPPOINT)prc, 2); + + /* Return the complexity */ + return iComplexity; +} + +INT +APIENTRY +NtGdiGetAppClipBox( + _In_ HDC hdc, + _Out_ LPRECT prc) +{ + RECT rect; + INT iComplexity; + + /* Call the internal function */ + iComplexity = GdiGetClipBox(hdc, &rect); + + if (iComplexity != ERROR) + { + _SEH2_TRY + { + ProbeForWrite(prc, sizeof(RECT), 1); + *prc = rect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + iComplexity = ERROR; + } + _SEH2_END + } + + /* Return the complexity */ + return iComplexity; } int APIENTRY NtGdiExcludeClipRect(HDC hDC, Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.h [iso-8859-1] Tue Sep 23 19:32:38 2014 @@ -1,6 +1,11 @@ #pragma once -INT FASTCALL GdiGetClipBox(HDC hDC, RECTL *rc); +INT +FASTCALL +GdiGetClipBox( + _In_ HDC hdc, + _Out_ LPRECT prc); + VOID FASTCALL GdiSelectVisRgn(HDC hdc, PREGION prgn); INT FASTCALL IntGdiExtSelectClipRgn (PDC dc, PREGION prgn, int fnMode); VOID FASTCALL CLIPPING_UpdateGCRegion(DC* Dc);

1 0

[spetreolle] 64246: [ADVAPI32] Addendum to r29929 : Services have 30 seconds to start. Fixes VMware Tools service startup.
by spetreolle＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: spetreolle Date: Tue Sep 23 18:53:42 2014 New Revision: 64246 URL: http://svn.reactos.org/svn/reactos?rev=64246&view=rev Log: [ADVAPI32] Addendum to r29929 : Services have 30 seconds to start. Fixes VMware Tools service startup. Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Tue Sep 23 18:53:42 2014 @@ -240,7 +240,7 @@ swprintf(NtControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%u", dwServiceCurrent); - if (!WaitNamedPipeW(NtControlPipeName, 15000)) + if (!WaitNamedPipeW(NtControlPipeName, 30000)) { ERR("WaitNamedPipe(%S) failed (Error %lu)\n", NtControlPipeName, GetLastError()); return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT;

1 0

[akhaldi] 64245: [MSI_WINETEST] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: akhaldi Date: Tue Sep 23 18:33:25 2014 New Revision: 64245 URL: http://svn.reactos.org/svn/reactos?rev=64245&view=rev Log: [MSI_WINETEST] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/rostests/winetests/msi/action.c trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/package.c Modified: trunk/rostests/winetests/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/action.c?re… ============================================================================== --- trunk/rostests/winetests/msi/action.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/action.c [iso-8859-1] Tue Sep 23 18:33:25 2014 @@ -2251,20 +2251,22 @@ static BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; + PSID Group = NULL; BOOL IsInGroup; HANDLE token; if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || !pCheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); + FreeSid(Group); return FALSE; } + FreeSid(Group); + if (!IsInGroup) { /* Only administrators have enough privileges for these tests */ Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… ============================================================================== --- trunk/rostests/winetests/msi/automation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/automation.c [iso-8859-1] Tue Sep 23 18:33:25 2014 @@ -229,20 +229,22 @@ static BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; + PSID Group = NULL; BOOL IsInGroup; HANDLE token; if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || !pCheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); + FreeSid(Group); return FALSE; } + FreeSid(Group); + if (!IsInGroup) { /* Only administrators have enough privileges for these tests */ Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Tue Sep 23 18:33:25 2014 @@ -1086,7 +1086,11 @@ "s72\ti2\tl255\tL255\tL0\ts72\n" "Registry\tRegistry\n" "regdata1\t2\tSOFTWARE\\Wine\\msitest\ttest1\t\tcomp1\n" - "regdata2\t2\tSOFTWARE\\Wine\\msitest\ttest2\t\tcomp2\n"; + "regdata2\t2\tSOFTWARE\\Wine\\msitest\ttest2\t\tcomp2\n" + "regdata3\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\t\tCLSID_Winetest32\tcomp1\n" + "regdata4\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32\t\twinetest32.dll\tcomp1\n" + "regdata5\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\t\tCLSID_Winetest64\tcomp2\n" + "regdata6\t0\tCLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32\t\twinetest64.dll\tcomp2\n"; static const char mixed_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -2041,20 +2045,22 @@ static BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; + PSID Group = NULL; BOOL IsInGroup; HANDLE token; if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || !pCheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); + FreeSid(Group); return FALSE; } + FreeSid(Group); + if (!IsInGroup) { /* Only administrators have enough privileges for these tests */ @@ -5674,6 +5680,8 @@ UINT r; LONG res; HKEY hkey; + char value[MAX_PATH]; + DWORD size; if (is_process_limited()) { @@ -5697,16 +5705,42 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(!res, "can't open 32-bit component key\n"); + ok(!res, "can't open 32-bit component key, got %d\n", res); res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); - ok(!res, "value test1 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); + res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); - ok(!res, "can't open 64-bit component key\n"); + ok(!res, "can't open 64-bit component key, got %d\n", res); + res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); - ok(!res, "value test2 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); RegCloseKey(hkey); + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + todo_wine ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest32.dll"), "got %s\n", value); + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest64.dll"), "got %s\n", value); + RegCloseKey(hkey); + } r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5717,6 +5751,16 @@ res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n"); + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "32-bit CLSID key not removed\n"); + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "64-bit CLSID key not removed\n"); + DeleteFileA( msifile ); create_database_template(msifile, mixed_tables, sizeof(mixed_tables)/sizeof(msi_table), 200, "Intel;1033"); @@ -5724,16 +5768,42 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(!res, "can't open 32-bit component key\n"); + ok(!res, "can't open 32-bit component key, got %d\n", res); res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); - ok(!res, "value test1 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); + res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); - ok(!res, "can't open 64-bit component key\n"); + ok(!res, "can't open 64-bit component key, got %d\n", res); + res = RegQueryValueExA(hkey, "test1", NULL, NULL, NULL, NULL); + ok(res, "expected RegQueryValueEx to fail, got %d\n", res); res = RegQueryValueExA(hkey, "test2", NULL, NULL, NULL, NULL); - ok(!res, "value test2 not found\n"); + ok(!res, "expected RegQueryValueEx to succeed, got %d\n", res); RegCloseKey(hkey); + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + todo_wine ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest32.dll"), "got %s\n", value); + RegCloseKey(hkey); + } + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_SUCCESS, "can't open 64-bit CLSID key, got %d\n", res); + if (res == ERROR_SUCCESS) { + size = sizeof(value); + res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); + ok(!strcmp(value, "winetest64.dll"), "got %s\n", value); + RegCloseKey(hkey); + } r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5743,6 +5813,16 @@ res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n"); + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "32-bit CLSID key not removed\n"); + + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, + "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}", + 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "64-bit CLSID key not removed\n"); error: DeleteFileA( msifile ); Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=6… ============================================================================== --- trunk/rostests/winetests/msi/msi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/msi.c [iso-8859-1] Tue Sep 23 18:33:25 2014 @@ -173,20 +173,22 @@ static BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; + PSID Group = NULL; BOOL IsInGroup; HANDLE token; if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || !pCheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); + FreeSid(Group); return FALSE; } + FreeSid(Group); + if (!IsInGroup) { /* Only administrators have enough privileges for these tests */ @@ -3004,11 +3006,25 @@ create_file("C:\\imapath", "C:\\imapath", 11); /* file exists */ + path[0] = 'a'; + size = 0; + state = MsiGetComponentPathA(prodcode, component, path, &size); + ok(state == INSTALLSTATE_MOREDATA, "Expected INSTALLSTATE_MOREDATA, got %d\n", state); + ok(path[0] == 'a', "got %s\n", path); + ok(size == 10, "Expected 10, got %d\n", size); + path[0] = 0; size = MAX_PATH; state = MsiGetComponentPathA(prodcode, component, path, &size); ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); ok(!lstrcmpA(path, "C:\\imapath"), "Expected C:\\imapath, got %s\n", path); + ok(size == 10, "Expected 10, got %d\n", size); + + size = 0; + path[0] = 'a'; + state = MsiLocateComponentA(component, path, &size); + ok(state == INSTALLSTATE_MOREDATA, "Expected INSTALLSTATE_MOREDATA, got %d\n", state); + ok(path[0] == 'a', "got %s\n", path); ok(size == 10, "Expected 10, got %d\n", size); path[0] = 0; Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… ============================================================================== --- trunk/rostests/winetests/msi/package.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/package.c [iso-8859-1] Tue Sep 23 18:33:25 2014 @@ -88,20 +88,22 @@ static BOOL is_process_limited(void) { SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY}; - PSID Group; + PSID Group = NULL; BOOL IsInGroup; HANDLE token; if (!pCheckTokenMembership || !pOpenProcessToken) return FALSE; if (!AllocateAndInitializeSid(&NtAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, - DOMAIN_ALIAS_RID_ADMINS, - 0, 0, 0, 0, 0, 0, &Group) || + DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &Group) || !pCheckTokenMembership(NULL, Group, &IsInGroup)) { trace("Could not check if the current user is an administrator\n"); + FreeSid(Group); return FALSE; } + FreeSid(Group); + if (!IsInGroup) { if (!AllocateAndInitializeSid(&NtAuthority, 2, @@ -933,6 +935,11 @@ trace("Failed to remove the restore point : %08x\n", res); } +static BOOL is_root(const char *path) +{ + return (isalpha(path[0]) && path[1] == ':' && path[2] == '\\' && !path[3]); +} + static void test_createpackage(void) { MSIHANDLE hPackage = 0; @@ -1137,6 +1144,12 @@ r = MsiDoActionA( hpkg, "CostFinalize"); ok( r == ERROR_SUCCESS, "cost finalize failed\n"); + + buffer[0] = 0; + sz = sizeof(buffer); + r = MsiGetPropertyA( hpkg, "OutOfNoRbDiskSpace", buffer, &sz ); + ok( r == ERROR_SUCCESS, "MsiGetProperty returned %u\n", r ); + trace( "OutOfNoRbDiskSpace = \"%s\"\n", buffer ); r = MsiSetTargetPathA( 0, NULL, NULL ); ok( r == ERROR_INVALID_PARAMETER, "wrong return val\n"); @@ -2687,6 +2700,7 @@ {'w','i','n','e','t','e','s','t','3','-','p','a','c','k','a','g','e','.','m','s','i',0}; static const WCHAR msifile4W[] = {'w','i','n','e','t','e','s','t','4','-','p','a','c','k','a','g','e','.','m','s','i',0}; + INSTALLSTATE state; MSIHANDLE hpkg; UINT r; MSIHANDLE hdb; @@ -2897,6 +2911,17 @@ r = add_component_entry( hdb, "'psi', '{A06B23B5-746B-427A-8A6E-FD6AC8F46A95}', 'TARGETDIR', 1, '', 'psi_file'" ); ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + /* high install level */ + r = add_feature_entry( hdb, "'twelve', '', '', '', 2, 2, '', 0" ); + ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + + r = add_component_entry( hdb, "'upsilon', '{557e0c04-ceba-4c58-86a9-4a73352e8cf6}', 'TARGETDIR', 1, '', 'upsilon_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + + /* msidbFeatureAttributesFollowParent */ + r = add_feature_entry( hdb, "'thirteen', '', '', '', 2, 2, '', 2" ); + ok( r == ERROR_SUCCESS, "cannot add feature: %d\n", r ); + r = create_feature_components_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create FeatureComponents table: %d\n", r ); @@ -2967,6 +2992,12 @@ ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); r = add_feature_components_entry( hdb, "'eleven', 'psi'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + + r = add_feature_components_entry( hdb, "'twelve', 'upsilon'" ); + ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); + + r = add_feature_components_entry( hdb, "'thirteen', 'upsilon'" ); ok( r == ERROR_SUCCESS, "cannot add feature components: %d\n", r ); r = create_file_table( hdb ); @@ -3037,6 +3068,9 @@ ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); r = add_file_entry( hdb, "'psi_file', 'psi', 'psi.txt', 100, '', '1033', 8192, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + + r = add_file_entry( hdb, "'upsilon_file', 'upsilon', 'upsilon.txt', 0, '', '1033', 16384, 1" ); ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); MsiDatabaseCommit(hdb); @@ -3103,6 +3137,8 @@ test_feature_states( __LINE__, hpkg, "nine", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); test_feature_states( __LINE__, hpkg, "ten", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); test_feature_states( __LINE__, hpkg, "eleven", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); + test_feature_states( __LINE__, hpkg, "twelve", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); + test_feature_states( __LINE__, hpkg, "thirteen", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "alpha", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_LOCAL, FALSE ); test_component_states( __LINE__, hpkg, "beta", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_SOURCE, FALSE ); @@ -3126,6 +3162,7 @@ test_component_states( __LINE__, hpkg, "phi", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "chi", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "psi", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); + test_component_states( __LINE__, hpkg, "upsilon", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); MsiCloseHandle( hpkg ); @@ -3185,6 +3222,8 @@ test_feature_states( __LINE__, hpkg, "nine", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); test_feature_states( __LINE__, hpkg, "ten", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); test_feature_states( __LINE__, hpkg, "eleven", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); + test_feature_states( __LINE__, hpkg, "twelve", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); + test_feature_states( __LINE__, hpkg, "thirteen", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "alpha", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, FALSE ); test_component_states( __LINE__, hpkg, "beta", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_SOURCE, FALSE ); @@ -3208,6 +3247,7 @@ test_component_states( __LINE__, hpkg, "phi", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "chi", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "psi", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); + test_component_states( __LINE__, hpkg, "upsilon", ERROR_SUCCESS, INSTALLSTATE_ABSENT, INSTALLSTATE_UNKNOWN, FALSE ); MsiCloseHandle(hpkg); @@ -3215,15 +3255,25 @@ r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); + ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "twelve"); + ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state); + /* all features installed locally */ r = MsiInstallProductA(msifile2, "ADDLOCAL=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); + ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "twelve"); + ok(state == INSTALLSTATE_LOCAL, "state = %d\n", state); + r = MsiOpenDatabaseW(msifile2W, MSIDBOPEN_DIRECT, &hdb); ok(r == ERROR_SUCCESS, "failed to open database: %d\n", r); /* these properties must not be in the saved msi file */ - r = add_property_entry( hdb, "'ADDLOCAL', 'one,two,three,four,five,six,seven,eight,nine,ten'"); + r = add_property_entry( hdb, "'ADDLOCAL', 'one,two,three,four,five,six,seven,eight,nine,ten,twelve'"); ok( r == ERROR_SUCCESS, "cannot add property: %d\n", r ); r = package_from_db( hdb, &hpkg ); @@ -3252,6 +3302,8 @@ test_feature_states( __LINE__, hpkg, "nine", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_SOURCE, TRUE ); test_feature_states( __LINE__, hpkg, "ten", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_SOURCE, TRUE ); test_feature_states( __LINE__, hpkg, "eleven", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, TRUE ); + test_feature_states( __LINE__, hpkg, "twelve", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, FALSE ); + test_feature_states( __LINE__, hpkg, "thirteen", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "alpha", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, FALSE ); test_component_states( __LINE__, hpkg, "beta", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_SOURCE, FALSE ); @@ -3275,6 +3327,7 @@ test_component_states( __LINE__, hpkg, "phi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, TRUE ); test_component_states( __LINE__, hpkg, "chi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, TRUE ); test_component_states( __LINE__, hpkg, "psi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); + test_component_states( __LINE__, hpkg, "upsilon", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, FALSE ); MsiCloseHandle(hpkg); @@ -3285,6 +3338,11 @@ /* all features installed from source */ r = MsiInstallProductA(msifile3, "ADDSOURCE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); + ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "twelve"); + ok(state == INSTALLSTATE_LOCAL, "state = %d\n", state); r = MsiOpenDatabaseW(msifile3W, MSIDBOPEN_DIRECT, &hdb); ok(r == ERROR_SUCCESS, "failed to open database: %d\n", r); @@ -3325,6 +3383,8 @@ test_feature_states( __LINE__, hpkg, "nine", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_SOURCE, FALSE ); test_feature_states( __LINE__, hpkg, "ten", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_SOURCE, FALSE ); test_feature_states( __LINE__, hpkg, "eleven", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, TRUE ); + test_feature_states( __LINE__, hpkg, "twelve", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_UNKNOWN, FALSE ); + test_feature_states( __LINE__, hpkg, "thirteen", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "alpha", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, FALSE ); test_component_states( __LINE__, hpkg, "beta", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); @@ -3348,12 +3408,18 @@ test_component_states( __LINE__, hpkg, "phi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "chi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "psi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); + test_component_states( __LINE__, hpkg, "upsilon", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, TRUE ); MsiCloseHandle(hpkg); /* reinstall the product */ r = MsiInstallProductA(msifile3, "REINSTALL=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); + ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state); + state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "twelve"); + ok(state == INSTALLSTATE_LOCAL, "state = %d\n", state); r = MsiOpenDatabaseW(msifile4W, MSIDBOPEN_DIRECT, &hdb); ok(r == ERROR_SUCCESS, "failed to open database: %d\n", r); @@ -3394,6 +3460,8 @@ test_feature_states( __LINE__, hpkg, "nine", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_SOURCE, FALSE ); test_feature_states( __LINE__, hpkg, "ten", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_SOURCE, FALSE ); test_feature_states( __LINE__, hpkg, "eleven", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, TRUE ); + test_feature_states( __LINE__, hpkg, "twelve", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_UNKNOWN, FALSE ); + test_feature_states( __LINE__, hpkg, "thirteen", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "alpha", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, FALSE ); test_component_states( __LINE__, hpkg, "beta", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); @@ -3417,6 +3485,7 @@ test_component_states( __LINE__, hpkg, "phi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "chi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); test_component_states( __LINE__, hpkg, "psi", ERROR_SUCCESS, INSTALLSTATE_SOURCE, INSTALLSTATE_UNKNOWN, FALSE ); + test_component_states( __LINE__, hpkg, "upsilon", ERROR_SUCCESS, INSTALLSTATE_LOCAL, INSTALLSTATE_LOCAL, TRUE ); MsiCloseHandle(hpkg); @@ -3687,6 +3756,8 @@ MSIHANDLE hdb; CHAR prop[MAX_PATH]; DWORD size; + HKEY hkey; + const char reg_expand_value[] = "%systemroot%\\system32\\notepad.exe"; hdb = create_package_db(); ok ( hdb, "failed to create package database\n" ); @@ -3700,12 +3771,23 @@ r = add_appsearch_entry( hdb, "'NOTEPAD', 'NewSignature2'" ); ok( r == ERROR_SUCCESS, "cannot add entry: %d\n", r ); + r = add_appsearch_entry( hdb, "'REGEXPANDVAL', 'NewSignature3'" ); + ok( r == ERROR_SUCCESS, "cannot add entry: %d\n", r ); + r = create_reglocator_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); r = add_reglocator_entry( hdb, "NewSignature1", 0, "htmlfile\\shell\\open\\command", "", 1 ); ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + r = RegCreateKeyExA(HKEY_CURRENT_USER, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); + r = RegSetValueExA(hkey, NULL, 0, REG_EXPAND_SZ, (const BYTE*)reg_expand_value, strlen(reg_expand_value) + 1); + ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); + RegCloseKey(hkey); + r = add_reglocator_entry( hdb, "NewSignature3", 1, "Software\\Winetest_msi", "", 1 ); + ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + r = create_drlocator_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create DrLocator table: %d\n", r ); @@ -3719,6 +3801,9 @@ ok( r == ERROR_SUCCESS, "cannot add signature: %d\n", r ); r = add_signature_entry( hdb, "'NewSignature2', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); + ok( r == ERROR_SUCCESS, "cannot add signature: %d\n", r ); + + r = add_signature_entry( hdb, "'NewSignature3', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); ok( r == ERROR_SUCCESS, "cannot add signature: %d\n", r ); r = package_from_db( hdb, &hpkg ); @@ -3747,16 +3832,21 @@ r = MsiGetPropertyA( hpkg, "NOTEPAD", prop, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + size = sizeof(prop); + r = MsiGetPropertyA( hpkg, "REGEXPANDVAL", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + done: MsiCloseHandle( hpkg ); DeleteFileA(msifile); + RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Winetest_msi"); } static void test_appsearch_complocator(void) { MSIHANDLE hpkg, hdb; - CHAR path[MAX_PATH]; - CHAR prop[MAX_PATH]; + char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; LPSTR usersid; DWORD size; UINT r; @@ -3947,44 +4037,47 @@ r = MsiDoActionA(hpkg, "AppSearch"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - size = MAX_PATH; - sprintf(path, "%s\\FileName1", CURR_DIR); + strcpy(expected, CURR_DIR); + if (is_root(CURR_DIR)) expected[2] = 0; + + size = MAX_PATH; + sprintf(path, "%s\\FileName1", expected); r = MsiGetPropertyA(hpkg, "SIGPROP1", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - sprintf(path, "%s\\FileName2", CURR_DIR); + sprintf(path, "%s\\FileName2", expected); r = MsiGetPropertyA(hpkg, "SIGPROP2", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - sprintf(path, "%s\\FileName3", CURR_DIR); + sprintf(path, "%s\\FileName3", expected); r = MsiGetPropertyA(hpkg, "SIGPROP3", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - sprintf(path, "%s\\FileName4", CURR_DIR); + sprintf(path, "%s\\FileName4", expected); r = MsiGetPropertyA(hpkg, "SIGPROP4", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\FileName5", CURR_DIR); + sprintf(path, "%s\\FileName5", expected); r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - sprintf(path, "%s\\", CURR_DIR); + sprintf(path, "%s\\", expected); r = MsiGetPropertyA(hpkg, "SIGPROP6", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - sprintf(path, "%s\\", CURR_DIR); + sprintf(path, "%s\\", expected); r = MsiGetPropertyA(hpkg, "SIGPROP7", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -4000,7 +4093,7 @@ ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\FileName8.dll", CURR_DIR); + sprintf(path, "%s\\FileName8.dll", expected); r = MsiGetPropertyA(hpkg, "SIGPROP10", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -4011,7 +4104,7 @@ ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\FileName10.dll", CURR_DIR); + sprintf(path, "%s\\FileName10.dll", expected); r = MsiGetPropertyA(hpkg, "SIGPROP12", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -4057,7 +4150,7 @@ static void test_appsearch_reglocator(void) { MSIHANDLE hpkg, hdb; - CHAR path[MAX_PATH], prop[MAX_PATH]; + char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; DWORD binary[2], size, val; BOOL space, version, is_64bit = sizeof(void *) > sizeof(int); HKEY hklm, classes, hkcu, users; @@ -4147,18 +4240,21 @@ (const BYTE *)"#regszdata", 11); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + strcpy(expected, CURR_DIR); + if (is_root(CURR_DIR)) expected[2] = 0; + create_test_file("FileName1"); - sprintf(path, "%s\\FileName1", CURR_DIR); + sprintf(path, "%s\\FileName1", expected); res = RegSetValueExA(hklm, "Value9", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - sprintf(path, "%s\\FileName2", CURR_DIR); + sprintf(path, "%s\\FileName2", expected); res = RegSetValueExA(hklm, "Value10", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - lstrcpyA(path, CURR_DIR); + lstrcpyA(path, expected); res = RegSetValueExA(hklm, "Value11", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4168,30 +4264,30 @@ ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); create_file_with_version("FileName3.dll", MAKELONG(2, 1), MAKELONG(4, 3)); - sprintf(path, "%s\\FileName3.dll", CURR_DIR); + sprintf(path, "%s\\FileName3.dll", expected); res = RegSetValueExA(hklm, "Value13", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); create_file_with_version("FileName4.dll", MAKELONG(1, 2), MAKELONG(3, 4)); - sprintf(path, "%s\\FileName4.dll", CURR_DIR); + sprintf(path, "%s\\FileName4.dll", expected); res = RegSetValueExA(hklm, "Value14", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); create_file_with_version("FileName5.dll", MAKELONG(2, 1), MAKELONG(4, 3)); - sprintf(path, "%s\\FileName5.dll", CURR_DIR); + sprintf(path, "%s\\FileName5.dll", expected); res = RegSetValueExA(hklm, "Value15", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - sprintf(path, "\"%s\\FileName1\" -option", CURR_DIR); + sprintf(path, "\"%s\\FileName1\" -option", expected); res = RegSetValueExA(hklm, "value16", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", res); - space = strchr(CURR_DIR, ' ') != NULL; - sprintf(path, "%s\\FileName1 -option", CURR_DIR); + space = strchr(expected, ' ') != NULL; + sprintf(path, "%s\\FileName1 -option", expected); res = RegSetValueExA(hklm, "value17", 0, REG_SZ, (const BYTE *)path, lstrlenA(path) + 1); ok( res == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", res); @@ -4470,11 +4566,13 @@ r = add_signature_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ptr = strrchr(CURR_DIR, '\\') + 1; - sprintf(path, "'NewSignature26', '%s', '', '', '', '', '', '', ''", ptr); - r = add_signature_entry(hdb, path); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - + if (!is_root(CURR_DIR)) + { + ptr = strrchr(expected, '\\') + 1; + sprintf(path, "'NewSignature26', '%s', '', '', '', '', '', '', ''", ptr); + r = add_signature_entry(hdb, path); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + } str = "'NewSignature27', 'FileName2', '', '', '', '', '', '', ''"; r = add_signature_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -4562,7 +4660,7 @@ "Expected \"##regszdata\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\FileName1", CURR_DIR); + sprintf(path, "%s\\FileName1", expected); r = MsiGetPropertyA(hpkg, "SIGPROP9", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -4573,7 +4671,7 @@ ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\", CURR_DIR); + sprintf(path, "%s\\", expected); r = MsiGetPropertyA(hpkg, "SIGPROP11", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -4584,7 +4682,7 @@ ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\", CURR_DIR); + sprintf(path, "%s\\", expected); r = MsiGetPropertyA(hpkg, "SIGPROP13", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -4634,7 +4732,7 @@ if (version) { size = MAX_PATH; - sprintf(path, "%s\\FileName3.dll", CURR_DIR); + sprintf(path, "%s\\FileName3.dll", expected); r = MsiGetPropertyA(hpkg, "SIGPROP21", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -4645,49 +4743,54 @@ ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\FileName5.dll", CURR_DIR); + sprintf(path, "%s\\FileName5.dll", expected); r = MsiGetPropertyA(hpkg, "SIGPROP23", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); } - size = MAX_PATH; - lstrcpyA(path, CURR_DIR); - ptr = strrchr(path, '\\') + 1; - *ptr = '\0'; - r = MsiGetPropertyA(hpkg, "SIGPROP24", prop, &size); + if (!is_root(CURR_DIR)) + { + size = MAX_PATH; + lstrcpyA(path, expected); + ptr = strrchr(path, '\\') + 1; + *ptr = '\0'; + r = MsiGetPropertyA(hpkg, "SIGPROP24", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + } + size = MAX_PATH; + sprintf(path, "%s\\", expected); + r = MsiGetPropertyA(hpkg, "SIGPROP25", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - sprintf(path, "%s\\", CURR_DIR); - r = MsiGetPropertyA(hpkg, "SIGPROP25", prop, &size); + r = MsiGetPropertyA(hpkg, "SIGPROP26", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + if (is_root(CURR_DIR)) + ok(!lstrcmpA(prop, CURR_DIR), "Expected \"%s\", got \"%s\"\n", CURR_DIR, prop); + else + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP27", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP28", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + + size = MAX_PATH; + sprintf(path, "%s\\FileName1", expected); + r = MsiGetPropertyA(hpkg, "SIGPROP29", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - r = MsiGetPropertyA(hpkg, "SIGPROP26", prop, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); - - size = MAX_PATH; - r = MsiGetPropertyA(hpkg, "SIGPROP27", prop, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); - - size = MAX_PATH; - r = MsiGetPropertyA(hpkg, "SIGPROP28", prop, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); - - size = MAX_PATH; - sprintf(path, "%s\\FileName1", CURR_DIR); - r = MsiGetPropertyA(hpkg, "SIGPROP29", prop, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - - size = MAX_PATH; - sprintf(path, "%s\\FileName1", CURR_DIR); + sprintf(path, "%s\\FileName1", expected); r = MsiGetPropertyA(hpkg, "SIGPROP30", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); if (space) @@ -4750,8 +4853,7 @@ static void test_appsearch_inilocator(void) { MSIHANDLE hpkg, hdb; - CHAR path[MAX_PATH]; - CHAR prop[MAX_PATH]; + char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; BOOL version; LPCSTR str; LPSTR ptr; @@ -4766,25 +4868,28 @@ WritePrivateProfileStringA("Section", "Key", "keydata,field2", "IniFile.ini"); + strcpy(expected, CURR_DIR); + if (is_root(CURR_DIR)) expected[2] = 0; + create_test_file("FileName1"); - sprintf(path, "%s\\FileName1", CURR_DIR); + sprintf(path, "%s\\FileName1", expected); WritePrivateProfileStringA("Section", "Key2", path, "IniFile.ini"); - WritePrivateProfileStringA("Section", "Key3", CURR_DIR, "IniFile.ini"); - - sprintf(path, "%s\\IDontExist", CURR_DIR); + WritePrivateProfileStringA("Section", "Key3", expected, "IniFile.ini"); + + sprintf(path, "%s\\IDontExist", expected); WritePrivateProfileStringA("Section", "Key4", path, "IniFile.ini"); create_file_with_version("FileName2.dll", MAKELONG(2, 1), MAKELONG(4, 3)); - sprintf(path, "%s\\FileName2.dll", CURR_DIR); + sprintf(path, "%s\\FileName2.dll", expected); WritePrivateProfileStringA("Section", "Key5", path, "IniFile.ini"); create_file_with_version("FileName3.dll", MAKELONG(1, 2), MAKELONG(3, 4)); - sprintf(path, "%s\\FileName3.dll", CURR_DIR); + sprintf(path, "%s\\FileName3.dll", expected); WritePrivateProfileStringA("Section", "Key6", path, "IniFile.ini"); create_file_with_version("FileName4.dll", MAKELONG(2, 1), MAKELONG(4, 3)); - sprintf(path, "%s\\FileName4.dll", CURR_DIR); + sprintf(path, "%s\\FileName4.dll", expected); WritePrivateProfileStringA("Section", "Key7", path, "IniFile.ini"); hdb = create_package_db(); @@ -4940,7 +5045,7 @@ "Expected \"keydata,field2\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\FileName1", CURR_DIR); + sprintf(path, "%s\\FileName1", expected); r = MsiGetPropertyA(hpkg, "SIGPROP4", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -4951,25 +5056,27 @@ ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\", CURR_DIR); + sprintf(path, "%s\\", expected); r = MsiGetPropertyA(hpkg, "SIGPROP6", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - sprintf(path, "%s\\", CURR_DIR); + sprintf(path, "%s\\", expected); r = MsiGetPropertyA(hpkg, "SIGPROP7", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - size = MAX_PATH; - lstrcpyA(path, CURR_DIR); - ptr = strrchr(path, '\\'); - *(ptr + 1) = '\0'; - r = MsiGetPropertyA(hpkg, "SIGPROP8", prop, &size); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - + if (!is_root(CURR_DIR)) + { + size = MAX_PATH; + lstrcpyA(path, expected); + ptr = strrchr(path, '\\'); + *(ptr + 1) = 0; + r = MsiGetPropertyA(hpkg, "SIGPROP8", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + } size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP9", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -4978,7 +5085,7 @@ if (version) { size = MAX_PATH; - sprintf(path, "%s\\FileName2.dll", CURR_DIR); + sprintf(path, "%s\\FileName2.dll", expected); r = MsiGetPropertyA(hpkg, "SIGPROP10", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -4989,7 +5096,7 @@ ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\FileName4.dll", CURR_DIR); + sprintf(path, "%s\\FileName4.dll", expected); r = MsiGetPropertyA(hpkg, "SIGPROP12", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -5045,8 +5152,7 @@ static void test_appsearch_drlocator(void) { MSIHANDLE hpkg, hdb; - CHAR path[MAX_PATH]; - CHAR prop[MAX_PATH]; + char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; BOOL version; LPCSTR str; DWORD size; @@ -5113,33 +5219,36 @@ r = create_drlocator_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + strcpy(expected, CURR_DIR); + if (is_root(CURR_DIR)) expected[2] = 0; + /* no parent, full path, depth 0, signature */ - sprintf(path, "'NewSignature1', '', '%s', 0", CURR_DIR); + sprintf(path, "'NewSignature1', '', '%s', 0", expected); r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* no parent, full path, depth 0, no signature */ - sprintf(path, "'NewSignature2', '', '%s', 0", CURR_DIR); + sprintf(path, "'NewSignature2', '', '%s', 0", expected); r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* no parent, relative path, depth 0, no signature */ - sprintf(path, "'NewSignature3', '', '%s', 0", CURR_DIR + 3); + sprintf(path, "'NewSignature3', '', '%s', 0", expected + 3); r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* no parent, full path, depth 2, signature */ - sprintf(path, "'NewSignature4', '', '%s', 2", CURR_DIR); + sprintf(path, "'NewSignature4', '', '%s', 2", expected); r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* no parent, full path, depth 3, signature */ - sprintf(path, "'NewSignature5', '', '%s', 3", CURR_DIR); + sprintf(path, "'NewSignature5', '', '%s', 3", expected); r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* no parent, full path, depth 1, signature is dir */ - sprintf(path, "'NewSignature6', '', '%s', 1", CURR_DIR); + sprintf(path, "'NewSignature6', '', '%s', 1", expected); r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -5149,17 +5258,17 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* no parent, full path, depth 0, signature w/ version */ - sprintf(path, "'NewSignature8', '', '%s', 0", CURR_DIR); + sprintf(path, "'NewSignature8', '', '%s', 0", expected); r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* no parent, full path, depth 0, signature w/ version, ver > max */ - sprintf(path, "'NewSignature9', '', '%s', 0", CURR_DIR); + sprintf(path, "'NewSignature9', '', '%s', 0", expected); r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); /* no parent, full path, depth 0, signature w/ version, sig->name not ignored */ - sprintf(path, "'NewSignature10', '', '%s', 0", CURR_DIR); + sprintf(path, "'NewSignature10', '', '%s', 0", expected); r = add_drlocator_entry(hdb, path); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -5229,19 +5338,19 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); size = MAX_PATH; - sprintf(path, "%s\\FileName1", CURR_DIR); + sprintf(path, "%s\\FileName1", expected); r = MsiGetPropertyA(hpkg, "SIGPROP1", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - sprintf(path, "%s\\", CURR_DIR); + sprintf(path, "%s\\", expected); r = MsiGetPropertyA(hpkg, "SIGPROP2", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; - search_absolute_directory(path, CURR_DIR + 3); + search_absolute_directory(path, expected + 3); r = MsiGetPropertyA(hpkg, "SIGPROP3", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpiA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -5252,7 +5361,7 @@ ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\one\\two\\three\\FileName2", CURR_DIR); + sprintf(path, "%s\\one\\two\\three\\FileName2", expected); r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -5263,7 +5372,7 @@ ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; - sprintf(path, "%s\\one\\two\\three\\FileName2", CURR_DIR); + sprintf(path, "%s\\one\\two\\three\\FileName2", expected); r = MsiGetPropertyA(hpkg, "SIGPROP7", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -5271,7 +5380,7 @@ if (version) { size = MAX_PATH; - sprintf(path, "%s\\FileName3.dll", CURR_DIR); + sprintf(path, "%s\\FileName3.dll", expected); r = MsiGetPropertyA(hpkg, "SIGPROP8", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); @@ -5579,8 +5688,8 @@ if (is_wow64) access |= KEY_WOW64_64KEY; - GetCurrentDirectoryA(MAX_PATH, path); - lstrcatA(path, "\\"); + lstrcpyA(path, CURR_DIR); + if (!is_root(CURR_DIR)) lstrcatA(path, "\\"); lstrcatA(path, msifile); uilevel = MsiSetInternalUI(INSTALLUILEVEL_BASIC|INSTALLUILEVEL_SOURCERESONLY, NULL); @@ -6249,7 +6358,8 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); lstrcpyA(expected, CURR_DIR); - lstrcatA(expected, "\\abelisaurus"); + if (!is_root(CURR_DIR)) lstrcatA(expected, "\\"); + lstrcatA(expected, "abelisaurus"); ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""), "Expected %s or empty string, got %s\n", expected, prop); @@ -6273,7 +6383,7 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); lstrcpyA(expected, CURR_DIR); - lstrcatA(expected, "\\"); + if (!is_root(CURR_DIR)) lstrcatA(expected, "\\"); ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""), "Expected %s or empty string, got %s\n", expected, prop); @@ -6317,7 +6427,7 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); lstrcpyA(expected, CURR_DIR); - lstrcatA(expected, "\\"); + if (!is_root(CURR_DIR)) lstrcatA(expected, "\\"); ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""), "Expected %s or empty string, got %s\n", expected, prop); @@ -6326,7 +6436,8 @@ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); lstrcpyA(expected, CURR_DIR); - lstrcatA(expected, "\\neosodon\\"); + if (!is_root(CURR_DIR)) lstrcatA(expected, "\\"); + lstrcatA(expected, "neosodon\\"); ok(!lstrcmpA(prop, expected) || !lstrcmpA(prop, ""), "Expected %s or empty string, got %s\n", expected, prop); @@ -6404,7 +6515,7 @@ UINT r; lstrcpyA(cwd, CURR_DIR); - lstrcatA(cwd, "\\"); + if (!is_root(CURR_DIR)) lstrcatA(cwd, "\\"); lstrcpyA(subsrc, cwd); lstrcatA(subsrc, "subsource"); @@ -7189,7 +7300,7 @@ UINT r; lstrcpyA(cwd, CURR_DIR); - lstrcatA(cwd, "\\"); + if (!is_root(CURR_DIR)) lstrcatA(cwd, "\\"); lstrcpyA(subsrc, cwd); lstrcatA(subsrc, "long"); @@ -7532,7 +7643,7 @@ UINT r; lstrcpyA(cwd, CURR_DIR); - lstrcatA(cwd, "\\"); + if (!is_root(CURR_DIR)) lstrcatA(cwd, "\\"); lstrcpyA(subsrc, cwd); lstrcatA(subsrc, "long");

1 0

[akhaldi] 64244: [MSI] * Sync with Wine 1.7.27. Dedicated to Jérôme. CORE-8540
by akhaldi＠svn.reactos.org 23 Sep '14

23 Sep '14

Author: akhaldi Date: Tue Sep 23 18:32:48 2014 New Revision: 64244 URL: http://svn.reactos.org/svn/reactos?rev=64244&view=rev Log: [MSI] * Sync with Wine 1.7.27. Dedicated to Jérôme. CORE-8540 Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/classes.c trunk/reactos/dll/win32/msi/cond.tab.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/patch.c trunk/reactos/dll/win32/msi/sql.tab.c trunk/reactos/dll/win32/msi/sql.tab.h trunk/reactos/dll/win32/msi/table.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… Modified: trunk/reactos/dll/win32/msi/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?re… Modified: trunk/reactos/dll/win32/msi/cond.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.tab.c?r… Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=64… Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… Modified: trunk/reactos/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/patch.c?rev=… Modified: trunk/reactos/dll/win32/msi/sql.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.c?re… Modified: trunk/reactos/dll/win32/msi/sql.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.h?re… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs