Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 60789: [NTVDM] Save the error code returned by applications.
by aandrejevic＠svn.reactos.org 29 Oct '13

29 Oct '13

Author: aandrejevic Date: Tue Oct 29 00:10:14 2013 New Revision: 60789 URL: http://svn.reactos.org/svn/reactos?rev=60789&view=rev Log: [NTVDM] Save the error code returned by applications. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Oct 29 00:10:14 2013 @@ -28,6 +28,7 @@ static WORD DosSftRefCount[DOS_SFT_SIZE]; static BYTE DosAllocStrategy = DOS_ALLOC_BEST_FIT; static BOOLEAN DosUmbLinked = FALSE; +static BYTE DosErrorLevel = 0; /* PRIVATE FUNCTIONS **********************************************************/ @@ -1259,6 +1260,9 @@ if (CurrentPsp == SYSTEM_PSP) VdmRunning = FALSE; } + /* Save the return code */ + DosErrorLevel = ReturnCode; + /* Return control to the parent process */ EmulatorExecute(HIWORD(PspBlock->TerminateAddress), LOWORD(PspBlock->TerminateAddress));

1 0

[tkreuzer] 60788: [WIN32K] Several fixes and improvements to NtGdiSetDIBitsToDeviceInternal and GreCreateDIBitmapInternal [GDI32] "Fix" behavior of SetDIBitsToDevice, based on how (broken) Windows ...
by tkreuzer＠svn.reactos.org 28 Oct '13

28 Oct '13

Author: tkreuzer Date: Mon Oct 28 20:59:54 2013 New Revision: 60788 URL: http://svn.reactos.org/svn/reactos?rev=60788&view=rev Log: [WIN32K] Several fixes and improvements to NtGdiSetDIBitsToDeviceInternal and GreCreateDIBitmapInternal [GDI32] "Fix" behavior of SetDIBitsToDevice, based on how (broken) Windows actually behaves All tests for SetDIBitsToDevice now pass, except one, but this seems to be an Mm problem (looks like we commit ridiculously large user mode stacks instead of growing them on demand) Modified: branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c Modified: branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/gdi32/o… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Mon Oct 28 20:59:54 2013 @@ -505,8 +505,9 @@ PBITMAPINFO pConvertedInfo; UINT ConvertedInfoSize; INT LinesCopied = 0; - UINT cjBmpScanSize = 0; + UINT cMaxScans, cjBmpScanSize = 0; BOOL Hit = FALSE; + LONG yMax; PVOID pvAlignedBits = (PVOID)pvBits; if ( !cScanLines || !lpbmi || !pvBits ) @@ -519,6 +520,16 @@ &ConvertedInfoSize, FALSE); if (!pConvertedInfo) return 0; + + /* Calculate the max y coordinate that will be used */ + yMax = YSrc + Height; + + /* Calculate the maximum scan lines. NOTE: Yes, this is broken, since + biHeight can be negative, but Windows actually seems to do this! */ + cMaxScans = min(yMax, lpbmi->bmiHeader.biHeight); + + /* Limit the scan lines to the maximum we calculated, even if it's wrong */ + cScanLines = min(cScanLines, cMaxScans - uStartScan); #if 0 // Handle something other than a normal dc object. @@ -592,7 +603,7 @@ if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_HANDLE); goto cleanup; } Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] Mon Oct 28 20:59:54 2013 @@ -647,24 +647,59 @@ if (fInit & CBM_CREATDIB) { if (iUsage == 2) goto cleanup; + if (!pbmi) goto cleanup; if (!psurfDIB) goto cleanup; /* Need a DC for DIB_PAL_COLORS */ if ((iUsage == DIB_PAL_COLORS) && !pdc) goto cleanup; - - iFormat = psurfDIB->SurfObj.iBitmapFormat; +#if 0 + /* Create an empty DIB bitmap */ + psurfBmp = DibCreateDIBSurface(pbmi, pdc, iUsage, 0, NULL, 0); + if (psurfBmp == NULL) + { + goto cleanup; + } + + iFormat = psurfBmp->SurfObj.iBitmapFormat; if (iFormat > BMF_32BPP) goto cleanup; - +#else if (psurfDIB) { ppalBmp = psurfDIB->ppal; GDIOBJ_vReferenceObjectByPointer(&ppalBmp->BaseObject); + iFormat = psurfDIB->SurfObj.iBitmapFormat; + if (iFormat > BMF_32BPP) goto cleanup; } else { + ULONG cBitsPixel; ppalBmp = CreateDIBPalette(pbmi, pdc, iUsage); + if (pbmi->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) + { + PBITMAPCOREHEADER pbch = (PBITMAPCOREHEADER)pbmi; + cBitsPixel = pbch->bcBitCount * pbch->bcPlanes; } + else + { + cBitsPixel = pbmi->bmiHeader.biBitCount * pbmi->bmiHeader.biPlanes; + if (pbmi->bmiHeader.biCompression != BI_RGB) goto cleanup; } + + iFormat = BitmapFormat(cBitsPixel, BI_RGB); + } + + /* Allocate a surface for the bitmap */ + psurfBmp = SURFACE_AllocSurface(STYPE_BITMAP, cx, cy, iFormat, 0, 0, NULL); + if (psurfBmp == NULL) + { + goto cleanup; + } + + /* Set new palette for the bitmap */ + SURFACE_vSetPalette(psurfBmp, ppalBmp); + ppalBmp = NULL; +#endif + } else { if (psurfDC) @@ -681,15 +716,21 @@ } GDIOBJ_vReferenceObjectByPointer(&ppalBmp->BaseObject); - } /* Allocate a surface for the bitmap */ psurfBmp = SURFACE_AllocSurface(STYPE_BITMAP, cx, cy, iFormat, 0, 0, NULL); - if (psurfBmp) - { + if (psurfBmp == NULL) + { + goto cleanup; + } + /* Set new palette for the bitmap */ SURFACE_vSetPalette(psurfBmp, ppalBmp); ppalBmp = NULL; + } + + if (psurfBmp) + { if (pjInit) { @@ -1294,6 +1335,7 @@ * to. A value of 0 refers to the pixel row in the dib with the highest * y coordinate. * + * */ INT APIENTRY @@ -1305,11 +1347,11 @@ _In_ DWORD cy, _In_ INT xSrc, _In_ INT ySrc, - _In_ DWORD iStartScan, + _In_ DWORD uStartScan, _In_ DWORD cNumScan, _In_ LPBYTE pjBits, _In_ LPBITMAPINFO pbmiUser, - _In_ DWORD iUsage, + _In_ DWORD uUsage, _In_ UINT cjMaxBits, _In_ UINT cjMaxInfo, _In_ BOOL bTransformCoordinates, @@ -1317,8 +1359,8 @@ { PBITMAPINFO pbmi; HANDLE hSecure; - ULONG cyDIB; - INT yTop, iResult; + ULONG cyFullDIB, cyBand; + INT yDIB, iResult; //__debugbreak(); /* Check if parameters are valid */ if ((cNumScan == 0) || (cx >= INT_MAX) || (cy >= INT_MAX)) @@ -1333,7 +1375,7 @@ } /* Capture a safe copy of the bitmap info */ - pbmi = DibProbeAndCaptureBitmapInfo(pbmiUser, iUsage, &cjMaxInfo); + pbmi = DibProbeAndCaptureBitmapInfo(pbmiUser, uUsage, &cjMaxInfo); if (!pbmi) { /* Could not get bitmapinfo, fail. */ @@ -1344,51 +1386,54 @@ hSecure = EngSecureMemForRead(pjBits, cjMaxBits); if (!hSecure) { - iResult = 0; + cNumScan = 0; goto leave; } - /* Even when nothing is copied, the function returns the scanlines */ - iResult = cNumScan; - /* Get the absolute height of the DIB */ - cyDIB = abs(pbmi->bmiHeader.biHeight); + cyFullDIB = abs(pbmi->bmiHeader.biHeight); /* Bail out if the scanlines are outside of the DIB */ - if (iStartScan >= cyDIB) goto leave; + if (uStartScan >= cyFullDIB) goto leave; + NT_ASSERT(cyFullDIB != 0); /* Limit the number of scanlines to the DIB size */ - cNumScan = min(cNumScan, cyDIB - iStartScan); + cyBand = min(cNumScan, cyFullDIB - uStartScan); + NT_ASSERT(cyBand != 0); /* Calculate the y-origin of the given DIB data */ - yTop = cyDIB - (iStartScan + cNumScan); + yDIB = cyFullDIB - (uStartScan + cyBand); /* Bail out if the intersecion between scanlines and copy area is empty */ - if ((ySrc > yTop + (INT)cNumScan) || (ySrc + (INT)cy < yTop)) goto leave; - - /* Check if the copy area starts below or at the topmost scanline */ - if (ySrc >= yTop) - { - /* Compensate the source y-origin for the scanline offset */ - ySrc -= yTop; - } - else + if ((ySrc >= yDIB + (INT)cyBand) || (ySrc + (INT)cy <= yDIB)) goto leave; + + /* Check if the copy area starts below the y origin of the DIB */ + if (ySrc < yDIB) { /* Start at the top-most scanline in the buffer, adjust the destination coordinates and crop the size accordingly. */ - yDst += (yTop - ySrc); - cy -= (yTop - ySrc); + yDst += (yDIB - ySrc); + cy -= (yDIB - ySrc); ySrc = 0; + } + else + { + /* Compensate the source y-origin for the scanline offset */ + ySrc -= yDIB; } /* Check if the DIB is top-down */ if (pbmi->bmiHeader.biHeight < 0) { - pbmi->bmiHeader.biHeight = -(LONG)cNumScan; - } - else - { - pbmi->bmiHeader.biHeight = cNumScan; + /* Set negative band height */ + pbmi->bmiHeader.biHeight = -(LONG)cyBand; + NT_ASSERT(pbmi->bmiHeader.biHeight < 0); + } + else + { + /* Set positive band height */ + pbmi->bmiHeader.biHeight = cyBand; + NT_ASSERT(pbmi->bmiHeader.biHeight > 0); } /* Call the internal function with the secure pointers */ @@ -1403,12 +1448,14 @@ cy, pjBits, pbmi, - iUsage, + uUsage, MAKEROP4(SRCCOPY, SRCCOPY), cjMaxInfo, cjMaxBits, bTransformCoordinates, hcmXform); + if (iResult == 0) + cNumScan = 0; /* Unsecure the memory */ EngUnsecureMem(hSecure); @@ -1418,7 +1465,7 @@ DibFreeBitmapInfo(pbmi); /* Return the result */ - return iResult; + return cNumScan; }

1 0

[tkreuzer] 60787: [GDI32_APITEST] - Add more tests for CreateDIBitmap and SetDIBitsToDevice
by tkreuzer＠svn.reactos.org 28 Oct '13

28 Oct '13

Author: tkreuzer Date: Mon Oct 28 20:39:26 2013 New Revision: 60787 URL: http://svn.reactos.org/svn/reactos?rev=60787&view=rev Log: [GDI32_APITEST] - Add more tests for CreateDIBitmap and SetDIBitsToDevice Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBi… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] Mon Oct 28 20:39:26 2013 @@ -65,7 +65,7 @@ return FALSE; } - if ((fdwInit & CBM_INIT)) + if (fdwInit & CBM_INIT) { if (!lpbInit || (lpbInit == (PVOID)0xC0000000)) return FALSE; } @@ -74,26 +74,26 @@ { return FALSE; } - - return TRUE; - } - - if ((lpbmih == NULL) || - (lpbmih == (PVOID)0xC0000000) || - (lpbmih->biSize == 0)) - { - return FALSE; - } - - if (hdc == (HDC)-1) - { - *pdwError = ERROR_INVALID_PARAMETER; - return FALSE; - } - - - if (lpbmi == (PVOID)0xc0000000) return FALSE; - + } + else + { + + if ((lpbmih == NULL) || + (lpbmih == (PVOID)0xC0000000) || + (lpbmih->biSize == 0)) + { + return FALSE; + } + + if (hdc == (HDC)-1) + { + *pdwError = ERROR_INVALID_PARAMETER; + return FALSE; + } + + + if (lpbmi == (PVOID)0xc0000000) return FALSE; + } return TRUE; } @@ -400,7 +400,7 @@ PackedDIB.bmiHeader.biSizeImage = 0; hbmp = CreateDIBitmap(hdc, &PackedDIB.bmiHeader, CBM_INIT, &PackedDIB.ajBuffer, (PVOID)&PackedDIB, DIB_PAL_COLORS); - ok(hbmp == 0, "CreateDIBitmap succeeded, expeted failure\n"); + ok(hbmp == 0, "CreateDIBitmap succeeded, expected failure\n"); ok_err(0xbadbad00); /* Test a line that is too long */ @@ -420,14 +420,33 @@ HBITMAP hbmp, hbmpOld; HDC hdc; BITMAPINFO bmi = - {{sizeof(BITMAPINFOHEADER), 4, 4, 1, 8, BI_RGB, 0, 1, 1, 1, 0}, {{0,0,0,0}}}; - BYTE ajBits[10]; + {{sizeof(BITMAPINFOHEADER), 4, 4, 1, 8, BI_RGB, 0, 1, 1, 1, 0}, {{0,1,2,3}}}; + BYTE ajBits[10] = {0,1,2,3,4,5,6,7,8,9}; BITMAP bitmap; + struct + { + BITMAPINFOHEADER bmiHeader; + WORD wColors[4]; + } bmiRLE = + { + {sizeof(BITMAPINFOHEADER), 8, 2, 1, 8, BI_RLE8, 20, 1, 1, 4, 0}, + {0, 1, 2, 7} + }; + BYTE ajBitsRLE[] = {4,0, 0,2,0,1,0,2,3,1, 2,1, 2,2, 1,3,1,0,1,2, }; hdc = CreateCompatibleDC(0); - ok(hdc != 0, "failed\n"); - - hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_CREATDIB, ajBits, &bmi, DIB_PAL_COLORS); + if (hdc == NULL) + { + ok(0, "CreateCompatibleDC failed. Skipping tests!\n"); + return; + } + + SetLastError(0xbadbad00); + hbmp = CreateDIBitmap(hdc, NULL, CBM_CREATDIB, ajBits, NULL, DIB_RGB_COLORS); + ok(hbmp == 0, "CreateDIBitmap should fail.\n"); + ok_int(GetLastError(), 0xbadbad00); + + hbmp = CreateDIBitmap(hdc, NULL, CBM_CREATDIB, ajBits, &bmi, DIB_RGB_COLORS); ok(hbmp != 0, "CreateDIBitmap failed.\n"); ok_long(GetObject(hbmp, sizeof(DIBSECTION), &bitmap), sizeof(BITMAP)); @@ -441,8 +460,72 @@ hbmpOld = SelectObject(hdc, hbmp); ok(hbmpOld != NULL, "Couldn't select the bitmap.\n"); + + /* Copy it on a dib section */ + memset(pulDIB32Bits, 0x77, 64); + ok_long(BitBlt(ghdcDIB32, 0, 0, 4, 4, hdc, 0, 0, SRCCOPY), 1); + ok_long(pulDIB32Bits[0], 0x20100); + ok_long(pulDIB32Bits[1], 0x20100); + ok_long(pulDIB32Bits[2], 0x20100); + ok_long(pulDIB32Bits[3], 0x20100); + SelectObject(hdc, hbmpOld); DeleteObject(hbmp); + + hbmp = CreateDIBitmap(hdc, NULL, CBM_CREATDIB | CBM_INIT, ajBits, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed.\n"); + + ok_long(GetObject(hbmp, sizeof(DIBSECTION), &bitmap), sizeof(BITMAP)); + ok_int(bitmap.bmType, 0); + ok_int(bitmap.bmWidth, 4); + ok_int(bitmap.bmHeight, 4); + ok_int(bitmap.bmWidthBytes, 4); + ok_int(bitmap.bmPlanes, 1); + ok_int(bitmap.bmBitsPixel, 8); + ok_ptr(bitmap.bmBits, 0); + + /* Even with CBM_INIT and lpbmih != 0, pbmi is used for the dimensions */ + hbmp = CreateDIBitmap(hdc, &bmiRLE.bmiHeader, CBM_CREATDIB | CBM_INIT, ajBits, &bmi, DIB_PAL_COLORS); + ok(hbmp != 0, "CreateDIBitmap failed.\n"); + + ok_long(GetObject(hbmp, sizeof(DIBSECTION), &bitmap), sizeof(BITMAP)); + ok_int(bitmap.bmType, 0); + ok_int(bitmap.bmWidth, 4); + ok_int(bitmap.bmHeight, 4); + ok_int(bitmap.bmWidthBytes, 4); + ok_int(bitmap.bmPlanes, 1); + ok_int(bitmap.bmBitsPixel, 8); + ok_ptr(bitmap.bmBits, 0); + + hbmpOld = SelectObject(hdc, hbmp); + ok(hbmpOld != NULL, "Couldn't select the bitmap.\n"); + + /* Copy it on a dib section */ + memset(pulDIB32Bits, 0x77, 64); + ok_long(BitBlt(ghdcDIB32, 0, 0, 4, 4, hdc, 0, 0, SRCCOPY), 1); + ok_long(pulDIB32Bits[0], 0); + ok_long(pulDIB32Bits[1], 0); + ok_long(pulDIB32Bits[2], 0); + ok_long(pulDIB32Bits[3], 0); + + SelectObject(hdc, hbmpOld); + DeleteObject(hbmp); + + hbmp = CreateDIBitmap(hdc, NULL, CBM_CREATDIB, ajBitsRLE, (PVOID)&bmiRLE, DIB_PAL_COLORS); + ok(hbmp == 0, "CreateDIBitmap should fail.\n"); + hbmp = CreateDIBitmap(hdc, NULL, CBM_INIT | CBM_CREATDIB, ajBitsRLE, (PVOID)&bmiRLE, DIB_PAL_COLORS); + ok(hbmp == 0, "CreateDIBitmap should fail.\n"); + + /* Check if a 0 pixel bitmap results in the DEFAULT_BITMAP being returned */ + bmi.bmiHeader.biWidth = 0; + bmi.bmiHeader.biHeight = 4; + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_CREATDIB, ajBits, &bmi, DIB_PAL_COLORS); + ok(hbmp == GetStockObject(21), "CreateDIBitmap didn't return the default bitmap.\n"); + bmi.bmiHeader.biWidth = 23; + bmi.bmiHeader.biHeight = 0; + hbmp = CreateDIBitmap(hdc, &bmi.bmiHeader, CBM_CREATDIB, ajBits, &bmi, DIB_PAL_COLORS); + ok(hbmp == GetStockObject(21), "CreateDIBitmap didn't return the default bitmap.\n"); + DeleteDC(hdc); } Modified: trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/SetDIBitsT… ============================================================================== --- trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/SetDIBitsToDevice.c [iso-8859-1] Mon Oct 28 20:39:26 2013 @@ -12,6 +12,444 @@ static void Test_SetDIBitsToDevice_Params() +{ + UCHAR ajBmiBuffer[sizeof(BITMAPINFO) + 4]; + PBITMAPINFO pbmi = (PBITMAPINFO)ajBmiBuffer; + ULONG aulBits[16]; + INT ret; + + /* Setup the bitmap info */ + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = 2; + pbmi->bmiHeader.biHeight = -4; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biBitCount = 32; + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 0; + pbmi->bmiHeader.biYPelsPerMeter = 0; + pbmi->bmiHeader.biClrUsed = 0; + pbmi->bmiHeader.biClrImportant = 0; + + /* Test a normal operation */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + /* Test hdc == NULL */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(NULL, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 0); + ok_err(ERROR_INVALID_HANDLE); + + /* Test truncated hdc */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice((HDC)((ULONG_PTR)ghdcDIB32 & 0xFFFF), + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 0); + ok_err(ERROR_INVALID_HANDLE); + + /* Test invalid ColorUse */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + 7); + ok_dec(ret, 0); + ok_err(0xdeadc0de); + + /* test unaligned buffer */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + (BYTE*)aulBits + 1, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + /* test unaligned and huge scanline buffer */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 20000000, // cScanLines, + (BYTE*)aulBits + 1, // lpvBits, + pbmi, + DIB_RGB_COLORS); + todo_ros ok_dec(ret, 0); + ok_err(0xdeadc0de); + + /* test unaligned illegal buffer */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + (BYTE*)0x7fffffff, // lpvBits, + pbmi, + DIB_RGB_COLORS); + todo_ros ok_dec(ret, 0); + ok_err(0xdeadc0de); + + /* Test negative XDest */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + -100, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + /* Test huge XDest */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + LONG_MAX, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + /* Test XSrc outside of the DIB */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 100, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + /* Test YSrc outside of the DIB */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 100, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + /* Test uStartScan outside of the DIB */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 100, // uStartScan, + 5, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 5); + ok_err(0xdeadc0de); + + /* Test cScanLines larger than the DIB */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 7, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + todo_ros ok_dec(ret, 7); + ok_err(0xdeadc0de); + + /* Test large cScanlines */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2000, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + todo_ros ok_dec(ret, 0); + ok_err(0xdeadc0de); + + /* Test uStartScan and cScanLines larger than the DIB */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 100, // uStartScan, + 7, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 7); + ok_err(0xdeadc0de); + + /* Test lpvBits == NULL */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + NULL, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 0); + ok_err(0xdeadc0de); + + /* Test pbmi == NULL */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + NULL, + DIB_RGB_COLORS); + ok_dec(ret, 0); + ok_err(0xdeadc0de); + + /* Test huge positive DIB height, result is limited to dwHeight */ + pbmi->bmiHeader.biHeight = 10000; + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 1, // YDest, + 2, // dwWidth, + 3, // dwHeight, + 0, // XSrc, + 1, // YSrc, + 0, // uStartScan, + 7, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 4); + ok_err(0xdeadc0de); + + /* Test huge negative DIB height */ + pbmi->bmiHeader.biHeight = -10000; + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 7, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 7); + ok_err(0xdeadc0de); + + /* Test what happens when we cause an integer overflow */ + pbmi->bmiHeader.biHeight = LONG_MIN; + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 2); + ok_err(0xdeadc0de); + + /* Now also test a huge value of uStartScan */ + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + abs(pbmi->bmiHeader.biHeight) - 3, // uStartScan, + 9, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 3); + ok_err(0xdeadc0de); + + /* Now also test a huge value of uStartScan */ + pbmi->bmiHeader.biHeight = LONG_MIN + 1; + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + abs(pbmi->bmiHeader.biHeight) - 3, // uStartScan, + 9, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 5); + ok_err(0xdeadc0de); + + /* Now also test a huge value of uStartScan */ + pbmi->bmiHeader.biHeight = LONG_MIN + 7; + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + abs(pbmi->bmiHeader.biHeight) - 3, // uStartScan, + 32, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 17); + ok_err(0xdeadc0de); + + /* Test invalid bitmap info header */ + pbmi->bmiHeader.biSize = 0; + SetLastError(0xdeadc0de); + ret = SetDIBitsToDevice(ghdcDIB32, + 0, // XDest, + 0, // YDest, + 2, // dwWidth, + 2, // dwHeight, + 0, // XSrc, + 0, // YSrc, + 0, // uStartScan, + 2, // cScanLines, + aulBits, // lpvBits, + pbmi, + DIB_RGB_COLORS); + ok_dec(ret, 0); + ok_err(0xdeadc0de); + +} + + +static void +Test_SetDIBitsToDevice() { UCHAR ajBmiBuffer[sizeof(BITMAPINFO) + 4]; PBITMAPINFO pbmi = (PBITMAPINFO)ajBmiBuffer; @@ -31,260 +469,6 @@ pbmi->bmiHeader.biClrUsed = 0; pbmi->bmiHeader.biClrImportant = 0; - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 2, // cScanLines, - aulBits, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 2); - ok_err(0xdeadc0de); - - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 2, // cScanLines, - NULL, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 0); - ok_err(0xdeadc0de); - - /* test unaligned buffer */ - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 2, // cScanLines, - (BYTE*)aulBits + 1, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 2); - ok_err(0xdeadc0de); - - /* test unaligned and huge scanline buffer */ - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 2000000, // cScanLines, - (BYTE*)aulBits + 1, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 0); - ok_err(0xdeadc0de); - - /* test unaligned illegal buffer */ - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 2, // cScanLines, - (BYTE*)0x7fffffff, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 0); - ok_err(0xdeadc0de); - - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - -100, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 2, // cScanLines, - aulBits, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 2); - ok_err(0xdeadc0de); - - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - LONG_MAX, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 2, // cScanLines, - aulBits, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 2); - ok_err(0xdeadc0de); - - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 100, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 2, // cScanLines, - aulBits, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 2); - ok_err(0xdeadc0de); - - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 100, // YSrc, - 0, // uStartScan, - 2, // cScanLines, - aulBits, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 2); - ok_err(0xdeadc0de); - - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 66, // cScanLines, - aulBits, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 66); - ok_err(0xdeadc0de); - - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 200, // cScanLines, - aulBits, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 0); - ok_err(0xdeadc0de); - - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 2000, // uStartScan, - 66, // cScanLines, - aulBits, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 66); - ok_err(0xdeadc0de); - - /* Test pbmi == NULL */ - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 2, // cScanLines, - aulBits, // lpvBits, - NULL, - DIB_RGB_COLORS); - ok_dec(ret, 0); - ok_err(0xdeadc0de); - - /* Test illegal bitmap info */ - pbmi->bmiHeader.biSize = 0; - SetLastError(0xdeadc0de); - ret = SetDIBitsToDevice(ghdcDIB32, - 0, // XDest, - 0, // YDest, - 2, // dwWidth, - 2, // dwHeight, - 0, // XSrc, - 0, // YSrc, - 0, // uStartScan, - 2, // cScanLines, - aulBits, // lpvBits, - pbmi, - DIB_RGB_COLORS); - ok_dec(ret, 0); - ok_err(0xdeadc0de); - -} - - -static void -Test_SetDIBitsToDevice() -{ - UCHAR ajBmiBuffer[sizeof(BITMAPINFO) + 4]; - PBITMAPINFO pbmi = (PBITMAPINFO)ajBmiBuffer; - ULONG aulBits[16]; - INT ret; - - /* Setup the bitmap info */ - pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbmi->bmiHeader.biWidth = 2; - pbmi->bmiHeader.biHeight = -2; - pbmi->bmiHeader.biPlanes = 1; - pbmi->bmiHeader.biBitCount = 32; - pbmi->bmiHeader.biCompression = BI_RGB; - pbmi->bmiHeader.biSizeImage = 0; - pbmi->bmiHeader.biXPelsPerMeter = 0; - pbmi->bmiHeader.biYPelsPerMeter = 0; - pbmi->bmiHeader.biClrUsed = 0; - pbmi->bmiHeader.biClrImportant = 0; - /* Set pixels */ aulBits[0] = 0x11000000; aulBits[1] = 0x00000011; @@ -359,12 +543,12 @@ DIB_RGB_COLORS); ok_dec(ret, 1); - ok_hex(pulDIB32Bits[0], 0x00000000); - ok_hex(pulDIB32Bits[1], 0x00000000); - ok_hex(pulDIB32Bits[2], 0x00000000); - ok_hex(pulDIB32Bits[3], 0x00000000); - ok_hex(pulDIB32Bits[4], 0x11000000); - ok_hex(pulDIB32Bits[5], 0x00000011); + todo_ros ok_hex(pulDIB32Bits[0], 0x00000000); + todo_ros ok_hex(pulDIB32Bits[1], 0x00000000); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + todo_ros ok_hex(pulDIB32Bits[4], 0x11000000); + todo_ros ok_hex(pulDIB32Bits[5], 0x00000011); ok_hex(pulDIB32Bits[6], 0x00000000); ok_hex(pulDIB32Bits[7], 0x00000000); @@ -384,12 +568,12 @@ DIB_RGB_COLORS); ok_dec(ret, 1); - ok_hex(pulDIB32Bits[0], 0x11000000); - ok_hex(pulDIB32Bits[1], 0x00000011); - ok_hex(pulDIB32Bits[2], 0x00000000); - ok_hex(pulDIB32Bits[3], 0x00000000); - ok_hex(pulDIB32Bits[4], 0x00000000); - ok_hex(pulDIB32Bits[5], 0x00000000); + todo_ros ok_hex(pulDIB32Bits[0], 0x11000000); + todo_ros ok_hex(pulDIB32Bits[1], 0x00000011); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + todo_ros ok_hex(pulDIB32Bits[4], 0x00000000); + todo_ros ok_hex(pulDIB32Bits[5], 0x00000000); ok_hex(pulDIB32Bits[6], 0x00000000); ok_hex(pulDIB32Bits[7], 0x00000000); @@ -465,12 +649,12 @@ DIB_RGB_COLORS); ok_dec(ret, 1); - ok_hex(pulDIB32Bits[0], 0x00000000); - ok_hex(pulDIB32Bits[1], 0x00000000); - ok_hex(pulDIB32Bits[2], 0x00000000); - ok_hex(pulDIB32Bits[3], 0x00000000); - ok_hex(pulDIB32Bits[4], 0x11000000); - ok_hex(pulDIB32Bits[5], 0x00000011); + todo_ros ok_hex(pulDIB32Bits[0], 0x00000000); + todo_ros ok_hex(pulDIB32Bits[1], 0x00000000); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + todo_ros ok_hex(pulDIB32Bits[4], 0x11000000); + todo_ros ok_hex(pulDIB32Bits[5], 0x00000011); ok_hex(pulDIB32Bits[6], 0x00000000); ok_hex(pulDIB32Bits[7], 0x00000000); @@ -490,12 +674,12 @@ DIB_RGB_COLORS); ok_dec(ret, 1); - ok_hex(pulDIB32Bits[0], 0x11000000); - ok_hex(pulDIB32Bits[1], 0x00000011); - ok_hex(pulDIB32Bits[2], 0x00000000); - ok_hex(pulDIB32Bits[3], 0x00000000); - ok_hex(pulDIB32Bits[4], 0x00000000); - ok_hex(pulDIB32Bits[5], 0x00000000); + todo_ros ok_hex(pulDIB32Bits[0], 0x11000000); + todo_ros ok_hex(pulDIB32Bits[1], 0x00000011); + ok_hex(pulDIB32Bits[2], 0x00000000); + ok_hex(pulDIB32Bits[3], 0x00000000); + todo_ros ok_hex(pulDIB32Bits[4], 0x00000000); + todo_ros ok_hex(pulDIB32Bits[5], 0x00000000); ok_hex(pulDIB32Bits[6], 0x00000000); ok_hex(pulDIB32Bits[7], 0x00000000);

1 0

[tkreuzer] 60786: [WIN32K] - Add missing DC_vPrepareDCsForBlit / DC_vFinishBlit - Save and restore floating point state in some functions
by tkreuzer＠svn.reactos.org 28 Oct '13

28 Oct '13

Author: tkreuzer Date: Mon Oct 28 20:26:08 2013 New Revision: 60786 URL: http://svn.reactos.org/svn/reactos?rev=60786&view=rev Log: [WIN32K] - Add missing DC_vPrepareDCsForBlit / DC_vFinishBlit - Save and restore floating point state in some functions Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c Modified: trunk/reactos/win32ss/gdi/ntgdi/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/arc.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/arc.c [iso-8859-1] Mon Oct 28 20:26:08 2013 @@ -316,6 +316,7 @@ DC *pDC; BOOL Ret = FALSE; gxf_long worker, worker1; + KFLOATING_SAVE FloatSave; pDC = DC_LockDc (hDC); if(!pDC) @@ -329,6 +330,9 @@ /* Yes, Windows really returns TRUE in this case */ return TRUE; } + + KeSaveFloatingPointState(&FloatSave); + worker.l = dwStartAngle; worker1.l = dwSweepAngle; DC_vPrepareDCsForBlit(pDC, pDC->rosdc.CombinedClip->rclBounds, @@ -340,6 +344,9 @@ Ret = IntGdiAngleArc( pDC, x, y, dwRadius, worker.f, worker1.f); DC_vFinishBlit(pDC, NULL); DC_UnlockDc( pDC ); + + KeRestoreFloatingPointState(&FloatSave); + return Ret; } @@ -359,6 +366,7 @@ { DC *dc; BOOL Ret; + KFLOATING_SAVE FloatSave; dc = DC_LockDc (hDC); if(!dc) @@ -381,6 +389,8 @@ if (dc->pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) DC_vUpdateLineBrush(dc); + + KeSaveFloatingPointState(&FloatSave); Ret = IntGdiArcInternal( arctype, @@ -394,6 +404,7 @@ XEndArc, YEndArc); + KeRestoreFloatingPointState(&FloatSave); DC_vFinishBlit(dc, NULL); DC_UnlockDc( dc ); return Ret; Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Mon Oct 28 20:26:08 2013 @@ -306,6 +306,9 @@ //tmpFillBrushObj.ptOrigin.y += RectBounds.top - Top; tmpFillBrushObj.ptOrigin.x += dc->ptlDCOrig.x; tmpFillBrushObj.ptOrigin.y += dc->ptlDCOrig.y; + + DC_vPrepareDCsForBlit(dc, RectBounds, NULL, RectBounds); + ret = IntFillEllipse( dc, CenterX - RadiusX, CenterY - RadiusY, @@ -313,15 +316,19 @@ RadiusY*2, // Height &tmpFillBrushObj); BRUSH_ShareUnlockBrush(pFillBrushObj); - } - - if (ret) - ret = IntDrawEllipse( dc, - CenterX - RadiusX, - CenterY - RadiusY, - RadiusX*2, // Width - RadiusY*2, // Height - pbrush); + + if (ret) + { + ret = IntDrawEllipse( dc, + CenterX - RadiusX, + CenterY - RadiusY, + RadiusX*2, // Width + RadiusY*2, // Height + pbrush); + } + + DC_vFinishBlit(dc, NULL); + } pbrush->ptPenWidth.x = PenOrigWidth; PEN_ShareUnlockPen(pbrush); @@ -788,6 +795,9 @@ } else { + + DC_vPrepareDCsForBlit(dc, RectBounds, NULL, RectBounds); + RtlCopyMemory(&brushTemp, pbrFill, sizeof(brushTemp)); brushTemp.ptOrigin.x += RectBounds.left - Left; brushTemp.ptOrigin.y += RectBounds.top - Top; @@ -800,17 +810,22 @@ yCurveDiameter, &brushTemp); BRUSH_ShareUnlockBrush(pbrFill); - } - - if (ret) - ret = IntDrawRoundRect( dc, - RectBounds.left, - RectBounds.top, - RectBounds.right, - RectBounds.bottom, - xCurveDiameter, - yCurveDiameter, - pbrLine); + + if (ret) + { + ret = IntDrawRoundRect( dc, + RectBounds.left, + RectBounds.top, + RectBounds.right, + RectBounds.bottom, + xCurveDiameter, + yCurveDiameter, + pbrLine); + } + + DC_vFinishBlit(dc, NULL); + } + pbrLine->ptPenWidth.x = PenOrigWidth; PEN_ShareUnlockPen(pbrLine); @@ -1094,6 +1109,8 @@ else goto cleanup; + DC_vPrepareDCsForBlit(dc, DestRect, NULL, DestRect); + psurf = dc->dclevel.pSurface; if (!psurf) { @@ -1113,6 +1130,7 @@ EXLATEOBJ_vCleanup(&exlo); cleanup: + DC_vFinishBlit(dc, NULL); DC_UnlockDc(dc); return Ret; }

1 0

[jimtabor] 60785: - Sync wine to 1.7.5.
by jimtabor＠svn.reactos.org 28 Oct '13

28 Oct '13

Author: jimtabor Date: Mon Oct 28 05:12:48 2013 New Revision: 60785 URL: http://svn.reactos.org/svn/reactos?rev=60785&view=rev Log: - Sync wine to 1.7.5. Modified: trunk/rostests/winetests/user32/sysparams.c Modified: trunk/rostests/winetests/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/sysparam… ============================================================================== --- trunk/rostests/winetests/user32/sysparams.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/sysparams.c [iso-8859-1] Mon Oct 28 05:12:48 2013 @@ -16,17 +16,16 @@ * 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 <assert.h> -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> - #undef _WIN32_WINNT #define _WIN32_WINNT 0x0600 /* For SPI_GETMOUSEHOVERWIDTH and more */ //#define _WIN32_IE 0x0700 #undef WINVER #define WINVER 0x0600 /* For COLOR_MENUBAR, NONCLIENTMETRICS with padding */ + +#include <assert.h> +#include <stdlib.h> +#include <stdarg.h> +#include <stdio.h> #include "wine/test.h" #include "windef.h" @@ -729,8 +728,8 @@ INT frame; NONCLIENTMETRICSA ncm; - ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); - rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); if( usesetborder) { rc=SystemParametersInfoA( SPI_SETBORDER, curr_val, 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); @@ -754,7 +753,7 @@ /* minimum border width is 1 */ if (curr_val == 0) curr_val = 1; /* should be the same as the non client metrics */ - rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); eq( (UINT)ncm.iBorderWidth, curr_val, "NonClientMetric.iBorderWidth", "%d"); /* and from SPI_GETBORDER */ @@ -774,12 +773,12 @@ { BOOL rc; UINT old_border; - NONCLIENTMETRICS ncmsave; + NONCLIENTMETRICSA ncmsave; INT CaptionWidth, PaddedBorderWidth; - ncmsave.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); - rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncmsave, 0); + ncmsave.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncmsave, 0); if( !rc) { win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); return; @@ -1470,7 +1469,7 @@ trace("testing SPI_{GET,SET}NONCLIENTMETRICS\n"); change_counter = 0; SetLastError(0xdeadbeef); - rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmorig, FALSE ); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmorig, FALSE ); if (!test_error_msg(rc,"SPI_{GET,SET}NONCLIENTMETRICS")) return; Ncmstart = Ncmorig; @@ -1518,7 +1517,7 @@ ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); test_change_message( SPI_SETNONCLIENTMETRICS, 1 ); /* get them back */ - rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmcur, FALSE ); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmcur, FALSE ); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); /* test registry entries */ TEST_NONCLIENTMETRICS_REG( Ncmcur) @@ -1543,7 +1542,7 @@ /* raw values are in registry */ TEST_NONCLIENTMETRICS_REG( Ncmnew) /* get them back */ - rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmcur, FALSE ); + rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmcur, FALSE ); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); /* cooked values are returned */ expect = max( Ncmnew.iMenuHeight, 2 + get_tmheight( &Ncmnew.lfMenuFont, 1)); @@ -1567,7 +1566,7 @@ /* test the system metrics with these settings */ test_GetSystemMetrics(); /* restore */ - rc=SystemParametersInfoA( SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), + rc=SystemParametersInfoA( SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmorig, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); test_change_message( SPI_SETNONCLIENTMETRICS, 0 ); ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError()); @@ -2449,7 +2448,7 @@ static void test_WM_DISPLAYCHANGE(void) { - DEVMODE mode, startmode; + DEVMODEA mode, startmode; int start_bpp, last_set_bpp = 0; int test_bpps[] = {8, 16, 24, 32}, i; LONG change_ret; @@ -2465,10 +2464,10 @@ memset(&startmode, 0, sizeof(startmode)); startmode.dmSize = sizeof(startmode); - EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &startmode); + EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &startmode); start_bpp = startmode.dmBitsPerPel; - displaychange_sem = CreateSemaphore(NULL, 0, 1, NULL); + displaychange_sem = CreateSemaphoreW(NULL, 0, 1, NULL); for(i = 0; i < sizeof(test_bpps)/sizeof(test_bpps[0]); i++) { last_bpp = -1; @@ -2660,37 +2659,37 @@ UINT IconSpacing, IconVerticalSpacing; BOOL rc; - HDC hdc = CreateIC( "Display", 0, 0, 0); + HDC hdc = CreateICA( "Display", 0, 0, 0); UINT avcwCaption; INT CaptionWidthfromreg; MINIMIZEDMETRICS minim; - NONCLIENTMETRICS ncm; + NONCLIENTMETRICSA ncm; SIZE screen; assert(sizeof(ncm) == 344); - ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); - rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth); + rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(rc, "SystemParametersInfoA failed\n"); - ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth) - 1; - rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth) - 1; + rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(!rc, "SystemParametersInfoA should fail\n"); - ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth) + 1; - SetLastError(0xdeadbeef); - rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth) + 1; + SetLastError(0xdeadbeef); + rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(!rc, "SystemParametersInfoA should fail\n"); ncm.cbSize = sizeof(ncm); /* Vista added padding */ SetLastError(0xdeadbeef); - rc = SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(rc || broken(!rc) /* before Vista */, "SystemParametersInfoA failed\n"); minim.cbSize = sizeof( minim); - ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, iPaddedBorderWidth); - SystemParametersInfo( SPI_GETMINIMIZEDMETRICS, 0, &minim, 0); - rc = SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth); + SystemParametersInfoA( SPI_GETMINIMIZEDMETRICS, 0, &minim, 0); + rc = SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); if( !rc) { win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); return; @@ -2839,14 +2838,14 @@ static void test_EnumDisplaySettings(void) { - DEVMODE devmode; + DEVMODEA devmode; DWORD val; HDC hdc; DWORD num; memset(&devmode, 0, sizeof(devmode)); /* Win95 doesn't handle ENUM_CURRENT_SETTINGS correctly */ - EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); + EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); hdc = GetDC(0); val = GetDeviceCaps(hdc, BITSPIXEL); @@ -2867,7 +2866,7 @@ num = 1; while (1) { SetLastError (0xdeadbeef); - if (!EnumDisplaySettings(NULL, num++, &devmode)) { + if (!EnumDisplaySettingsA(NULL, num++, &devmode)) { DWORD le = GetLastError(); ok(le == ERROR_NO_MORE_FILES || le == 0xdeadbeef, /* XP, 2003 */ @@ -2937,8 +2936,8 @@ wc.lpfnWndProc = SysParamsTestWndProc; wc.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW; wc.hInstance = hInstance; - wc.hIcon = LoadIconA( 0, IDI_APPLICATION ); - wc.hCursor = LoadCursorA( 0, IDC_ARROW ); + wc.hIcon = LoadIconA( 0, (LPCSTR)IDI_APPLICATION ); + wc.hCursor = LoadCursorA( 0, (LPCSTR)IDC_ARROW ); wc.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 ); wc.lpszMenuName = 0; wc.cbClsExtra = 0;

1 0

[jimtabor] 60784: - Fis SysParams WM_SETTINGCHANGE.
by jimtabor＠svn.reactos.org 28 Oct '13

28 Oct '13

Author: jimtabor Date: Mon Oct 28 05:00:16 2013 New Revision: 60784 URL: http://svn.reactos.org/svn/reactos?rev=60784&view=rev Log: - Fis SysParams WM_SETTINGCHANGE. Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Mon Oct 28 05:00:16 2013 @@ -128,6 +128,7 @@ { WM_SETTEXT, MMS_SIZE_LPARAMSZ, MMS_FLAG_READ }, { WM_STYLECHANGED, sizeof(STYLESTRUCT), MMS_FLAG_READ }, { WM_STYLECHANGING, sizeof(STYLESTRUCT), MMS_FLAG_READWRITE }, + { WM_SETTINGCHANGE, MMS_SIZE_LPARAMSZ, MMS_FLAG_READWRITE }, { WM_COPYDATA, MMS_SIZE_SPECIAL, MMS_FLAG_READ }, { WM_COPYGLOBALDATA, MMS_SIZE_WPARAM, MMS_FLAG_READ }, { WM_WINDOWPOSCHANGED, sizeof(WINDOWPOS), MMS_FLAG_READ },

1 0

[aandrejevic] 60783: [NTVDM] Improve performance by computing the resolution required by the PIT, and then using the standard tick count instead of performance counters when that resolution is low.
by aandrejevic＠svn.reactos.org 28 Oct '13

28 Oct '13

Author: aandrejevic Date: Mon Oct 28 02:25:54 2013 New Revision: 60783 URL: http://svn.reactos.org/svn/reactos?rev=60783&view=rev Log: [NTVDM] Improve performance by computing the resolution required by the PIT, and then using the standard tick count instead of performance counters when that resolution is low. Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/timer.c branches/ntvdm/subsystems/ntvdm/timer.h Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Mon Oct 28 02:25:54 2013 @@ -151,19 +151,37 @@ /* Main loop */ while (VdmRunning) { + /* Get the resolution of the system timer */ + DWORD TimerResolution = PitGetResolution(); + /* Get the current number of ticks */ CurrentTickCount = GetTickCount(); - /* Get the current performance counter value */ - QueryPerformanceCounter(&Counter); - - /* Get the number of PIT ticks that have passed */ - TimerTicks = ((Counter.QuadPart - LastTimerTick.QuadPart) - * PIT_BASE_FREQUENCY) / Frequency.QuadPart; + if (TimerResolution > 1000) + { + /* Get the current performance counter value */ + QueryPerformanceCounter(&Counter); + + /* Get the number of PIT ticks that have passed */ + TimerTicks = ((Counter.QuadPart - LastTimerTick.QuadPart) + * PIT_BASE_FREQUENCY) / Frequency.QuadPart; + } + else + { + /* Use the standard tick count */ + Counter.QuadPart = CurrentTickCount; + + /* Get the number of PIT ticks that have passed */ + TimerTicks = ((Counter.QuadPart - LastTimerTick.QuadPart) + * PIT_BASE_FREQUENCY) / 1000; + } /* Update the PIT */ - for (i = 0; i < TimerTicks; i++) PitDecrementCount(); - LastTimerTick = Counter; + if (TimerTicks > 0) + { + for (i = 0; i < TimerTicks; i++) PitDecrementCount(); + LastTimerTick = Counter; + } /* Check for vertical retrace */ if ((CurrentTickCount - LastVerticalRefresh) >= 16) Modified: branches/ntvdm/subsystems/ntvdm/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] Mon Oct 28 02:25:54 2013 @@ -233,4 +233,23 @@ } } +DWORD PitGetResolution(VOID) +{ + INT i; + DWORD MinReloadValue = 65536; + + for (i = 0; i < PIT_CHANNELS; i++) + { + DWORD ReloadValue = PitChannels[i].ReloadValue; + + /* 0 means 65536 */ + if (ReloadValue == 0) ReloadValue = 65536; + + if (ReloadValue < MinReloadValue) MinReloadValue = ReloadValue; + } + + /* Return the frequency resolution */ + return PIT_BASE_FREQUENCY / MinReloadValue; +} + /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.h [iso-8859-1] Mon Oct 28 02:25:54 2013 @@ -49,6 +49,7 @@ BYTE PitReadData(BYTE Channel); VOID PitWriteData(BYTE Channel, BYTE Value); VOID PitDecrementCount(); +DWORD PitGetResolution(VOID); #endif // _TIMER_H_

1 0

[hbelusca] 60782: Code formatting only.
by hbelusca＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: hbelusca Date: Sun Oct 27 23:42:16 2013 New Revision: 60782 URL: http://svn.reactos.org/svn/reactos?rev=60782&view=rev Log: Code formatting only. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sun Oct 27 23:42:16 2013 @@ -1148,22 +1148,22 @@ Bda->KeybdShiftFlags = 0; /* Set the appropriate flags based on the state */ - if (BiosKeyboardMap[VK_RSHIFT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_RSHIFT; - if (BiosKeyboardMap[VK_LSHIFT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LSHIFT; - if (BiosKeyboardMap[VK_CONTROL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CTRL; - if (BiosKeyboardMap[VK_MENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_ALT; - if (BiosKeyboardMap[VK_SCROLL] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_SCROLL_ON; - if (BiosKeyboardMap[VK_NUMLOCK] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_NUMLOCK_ON; - if (BiosKeyboardMap[VK_CAPITAL] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CAPSLOCK_ON; - if (BiosKeyboardMap[VK_INSERT] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_INSERT_ON; - if (BiosKeyboardMap[VK_RMENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_RALT; - if (BiosKeyboardMap[VK_LMENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LALT; + if (BiosKeyboardMap[VK_RSHIFT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_RSHIFT; + if (BiosKeyboardMap[VK_LSHIFT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LSHIFT; + if (BiosKeyboardMap[VK_CONTROL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CTRL; + if (BiosKeyboardMap[VK_MENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_ALT; + if (BiosKeyboardMap[VK_SCROLL] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_SCROLL_ON; + if (BiosKeyboardMap[VK_NUMLOCK] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_NUMLOCK_ON; + if (BiosKeyboardMap[VK_CAPITAL] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CAPSLOCK_ON; + if (BiosKeyboardMap[VK_INSERT] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_INSERT_ON; + if (BiosKeyboardMap[VK_RMENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_RALT; + if (BiosKeyboardMap[VK_LMENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LALT; if (BiosKeyboardMap[VK_SNAPSHOT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_SYSRQ; - if (BiosKeyboardMap[VK_PAUSE] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_PAUSE; - if (BiosKeyboardMap[VK_SCROLL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_SCROLL; - if (BiosKeyboardMap[VK_NUMLOCK] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_NUMLOCK; - if (BiosKeyboardMap[VK_CAPITAL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CAPSLOCK; - if (BiosKeyboardMap[VK_INSERT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_INSERT; + if (BiosKeyboardMap[VK_PAUSE] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_PAUSE; + if (BiosKeyboardMap[VK_SCROLL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_SCROLL; + if (BiosKeyboardMap[VK_NUMLOCK] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_NUMLOCK; + if (BiosKeyboardMap[VK_CAPITAL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CAPSLOCK; + if (BiosKeyboardMap[VK_INSERT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_INSERT; break; }

1 0

[hbelusca] 60781: [NTVDM] - DOS: the DOS file attributes are one byte. - BIOS: don't use hardcoded values; use the SEG_OFF_TO_PTR macro introduced earlier; use get/setAX instead of EmulatorGet/SetR...
by hbelusca＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: hbelusca Date: Sun Oct 27 23:39:52 2013 New Revision: 60781 URL: http://svn.reactos.org/svn/reactos?rev=60781&view=rev Log: [NTVDM] - DOS: the DOS file attributes are one byte. - BIOS: don't use hardcoded values; use the SEG_OFF_TO_PTR macro introduced earlier; use get/setAX instead of EmulatorGet/SetRegister. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sun Oct 27 23:39:52 2013 @@ -270,7 +270,7 @@ static BOOLEAN BiosKbdBufferPush(WORD Data) { /* Get the location of the element after the tail */ - WORD NextElement = Bda->KeybdBufferTail + 2; + WORD NextElement = Bda->KeybdBufferTail + sizeof(WORD); /* Wrap it around if it's at or beyond the end */ if (NextElement >= Bda->KeybdBufferEnd) NextElement = Bda->KeybdBufferStart; @@ -455,11 +455,11 @@ { INT i; WORD Offset = 0; - LPWORD IntVecTable = (LPWORD)((ULONG_PTR)BaseAddress); - LPBYTE BiosCode = (LPBYTE)((ULONG_PTR)BaseAddress + TO_LINEAR(BIOS_SEGMENT, 0)); + LPWORD IntVecTable = (LPWORD)BaseAddress; + LPBYTE BiosCode = (LPBYTE)SEG_OFF_TO_PTR(BIOS_SEGMENT, 0); /* Initialize the BDA */ - Bda = (PBIOS_DATA_AREA)((ULONG_PTR)BaseAddress + TO_LINEAR(BDA_SEGMENT, 0)); + Bda = (PBIOS_DATA_AREA)SEG_OFF_TO_PTR(BDA_SEGMENT, 0); Bda->EquipmentList = BIOS_EQUIPMENT_LIST; Bda->KeybdBufferStart = FIELD_OFFSET(BIOS_DATA_AREA, KeybdBuffer); Bda->KeybdBufferEnd = Bda->KeybdBufferStart + BIOS_KBD_BUFFER_SIZE * sizeof(WORD); @@ -594,8 +594,8 @@ WORD BiosPeekCharacter(VOID) { - WORD CharacterData; - + WORD CharacterData = 0; + /* Get the key from the queue, but don't remove it */ if (BiosKbdBufferTop(&CharacterData)) return CharacterData; else return 0xFFFF; @@ -777,17 +777,12 @@ VOID BiosVideoService(LPWORD Stack) { - DWORD Eax = EmulatorGetRegister(EMULATOR_REG_AX); - DWORD Ecx = EmulatorGetRegister(EMULATOR_REG_CX); - DWORD Edx = EmulatorGetRegister(EMULATOR_REG_DX); - DWORD Ebx = EmulatorGetRegister(EMULATOR_REG_BX); - - switch (HIBYTE(Eax)) + switch (getAH()) { /* Set Video Mode */ case 0x00: { - BiosSetVideoMode(LOBYTE(Eax)); + BiosSetVideoMode(getAL()); VgaClearMemory(); break; } @@ -796,8 +791,8 @@ case 0x01: { /* Update the BDA */ - Bda->CursorStartLine = HIBYTE(Ecx); - Bda->CursorEndLine = LOBYTE(Ecx); + Bda->CursorStartLine = getCH(); + Bda->CursorEndLine = getCL(); /* Modify the CRTC registers */ VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_START_REG); @@ -811,7 +806,7 @@ /* Set Cursor Position */ case 0x02: { - BiosSetCursorPosition(HIBYTE(Edx), LOBYTE(Edx), HIBYTE(Ebx)); + BiosSetCursorPosition(getDH(), getDL(), getBH()); break; } @@ -819,14 +814,12 @@ case 0x03: { /* Make sure the selected video page exists */ - if (HIBYTE(Ebx) >= BIOS_MAX_PAGES) break; + if (getBH() >= BIOS_MAX_PAGES) break; /* Return the result */ - EmulatorSetRegister(EMULATOR_REG_AX, 0); - EmulatorSetRegister(EMULATOR_REG_CX, - (Bda->CursorStartLine << 8) | Bda->CursorEndLine); - EmulatorSetRegister(EMULATOR_REG_DX, Bda->CursorPosition[HIBYTE(Ebx)]); - + setAX(0); + setCX(MAKEWORD(Bda->CursorEndLine, Bda->CursorStartLine)); + setDX(Bda->CursorPosition[getBH()]); break; } @@ -837,14 +830,14 @@ * On modern BIOSes, this function returns 0 * so that we can ignore the other registers. */ - EmulatorSetRegister(EMULATOR_REG_AX, 0); + setAX(0); break; } /* Select Active Display Page */ case 0x05: { - BiosSetVideoPage(LOBYTE(Eax)); + BiosSetVideoPage(getAL()); break; } @@ -852,21 +845,15 @@ case 0x06: case 0x07: { - SMALL_RECT Rectangle = - { - LOBYTE(Ecx), - HIBYTE(Ecx), - LOBYTE(Edx), - HIBYTE(Edx) - }; + SMALL_RECT Rectangle = { getCL(), getCH(), getDL(), getDH() }; /* Call the internal function */ - BiosScrollWindow((HIBYTE(Eax) == 0x06) ? SCROLL_DIRECTION_UP - : SCROLL_DIRECTION_DOWN, - LOBYTE(Eax), + BiosScrollWindow((getAH() == 0x06) ? SCROLL_DIRECTION_UP + : SCROLL_DIRECTION_DOWN, + getAL(), Rectangle, Bda->VideoPage, - HIBYTE(Ebx)); + getBH()); break; } @@ -876,19 +863,19 @@ case 0x09: case 0x0A: { - WORD CharacterData = MAKEWORD(LOBYTE(Eax), LOBYTE(Ebx)); - BYTE Page = HIBYTE(Ebx); + WORD CharacterData = MAKEWORD(getAL(), getBL()); + BYTE Page = getBH(); DWORD Offset; /* Check if the page exists */ if (Page >= BIOS_MAX_PAGES) break; /* Find the offset of the character */ - Offset = Page * Bda->VideoPageSize - + (HIBYTE(Bda->CursorPosition[Page]) * Bda->ScreenColumns - + LOBYTE(Bda->CursorPosition[Page])) * 2; - - if (HIBYTE(Eax) == 0x08) + Offset = Page * Bda->VideoPageSize + + (HIBYTE(Bda->CursorPosition[Page]) * Bda->ScreenColumns + + LOBYTE(Bda->CursorPosition[Page])) * 2; + + if (getAH() == 0x08) { /* Read from the video memory */ VgaReadMemory(TO_LINEAR(TEXT_VIDEO_SEG, Offset), @@ -896,14 +883,14 @@ sizeof(WORD)); /* Return the character in AX */ - EmulatorSetRegister(EMULATOR_REG_AX, CharacterData); + setAX(CharacterData); } else { /* Write to video memory */ VgaWriteMemory(TO_LINEAR(TEXT_VIDEO_SEG, Offset), (LPVOID)&CharacterData, - (HIBYTE(Ebx) == 0x09) ? sizeof(WORD) : sizeof(BYTE)); + (getBH() == 0x09) ? sizeof(WORD) : sizeof(BYTE)); } break; @@ -912,35 +899,26 @@ /* Teletype Output */ case 0x0E: { - BiosPrintCharacter(LOBYTE(Eax), LOBYTE(Ebx), HIBYTE(Ebx)); + BiosPrintCharacter(getAL(), getBL(), getBH()); break; } /* Get Current Video Mode */ case 0x0F: { - EmulatorSetRegister(EMULATOR_REG_AX, - MAKEWORD(Bda->VideoMode, Bda->ScreenColumns)); - EmulatorSetRegister(EMULATOR_REG_BX, - MAKEWORD(LOBYTE(Ebx), Bda->VideoPage)); - + setAX(MAKEWORD(Bda->VideoMode, Bda->ScreenColumns)); + setBX(MAKEWORD(getBL(), Bda->VideoPage)); break; } /* Scroll Window */ case 0x12: { - SMALL_RECT Rectangle = - { - LOBYTE(Ecx), - HIBYTE(Ecx), - LOBYTE(Edx), - HIBYTE(Edx) - }; + SMALL_RECT Rectangle = { getCL(), getCH(), getDL(), getDH() }; /* Call the internal function */ - BiosScrollWindow(LOBYTE(Ebx), - LOBYTE(Eax), + BiosScrollWindow(getBL(), + getAL(), Rectangle, Bda->VideoPage, DEFAULT_ATTRIBUTE); @@ -951,11 +929,11 @@ /* Display combination code */ case 0x1A: { - switch(LOBYTE(Eax)) + switch(getAL()) { case 0x00: /* Get Display combiantion code */ - EmulatorSetRegister(EMULATOR_REG_AX, MAKEWORD(0x1A, 0x1A)); - EmulatorSetRegister(EMULATOR_REG_BX, MAKEWORD(0x08, 0x0)); /* VGA w/ color analog display */ + setAX(MAKEWORD(0x1A, 0x1A)); + setBX(MAKEWORD(0x08, 0x00)); /* VGA w/ color analog display */ break; case 0x01: /* Set Display combination code */ DPRINT1("Set Display combination code - Unsupported\n"); @@ -969,16 +947,14 @@ default: { DPRINT1("BIOS Function INT 10h, AH = 0x%02X NOT IMPLEMENTED\n", - HIBYTE(Eax)); + getAH()); } } } VOID BiosKeyboardService(LPWORD Stack) { - DWORD Eax = EmulatorGetRegister(EMULATOR_REG_AX); - - switch (HIBYTE(Eax)) + switch (getAH()) { /* Wait for keystroke and read */ case 0x00: @@ -986,7 +962,7 @@ case 0x10: // FIXME: Temporarily do the same as INT 16h, 00h { /* Read the character (and wait if necessary) */ - EmulatorSetRegister(EMULATOR_REG_AX, BiosGetCharacter()); + setAX(BiosGetCharacter()); break; } @@ -1000,8 +976,8 @@ if (Data != 0xFFFF) { /* There is a character, clear ZF and return it */ - EmulatorSetRegister(EMULATOR_REG_AX, Data); Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_ZF; + setAX(Data); } else { @@ -1053,29 +1029,23 @@ default: { DPRINT1("BIOS Function INT 16h, AH = 0x%02X NOT IMPLEMENTED\n", - HIBYTE(Eax)); + getAH()); } } } VOID BiosTimeService(LPWORD Stack) { - DWORD Eax = EmulatorGetRegister(EMULATOR_REG_AX); - DWORD Ecx = EmulatorGetRegister(EMULATOR_REG_CX); - DWORD Edx = EmulatorGetRegister(EMULATOR_REG_DX); - - switch (HIBYTE(Eax)) + switch (getAH()) { case 0x00: { /* Set AL to 1 if midnight had passed, 0 otherwise */ - Eax &= 0xFFFFFF00; - if (Bda->MidnightPassed) Eax |= 1; + setAL(Bda->MidnightPassed ? 0x01 : 0x00); /* Return the tick count in CX:DX */ - EmulatorSetRegister(EMULATOR_REG_AX, Eax); - EmulatorSetRegister(EMULATOR_REG_CX, HIWORD(Bda->TickCounter)); - EmulatorSetRegister(EMULATOR_REG_DX, LOWORD(Bda->TickCounter)); + setCX(HIWORD(Bda->TickCounter)); + setDX(LOWORD(Bda->TickCounter)); /* Reset the midnight flag */ Bda->MidnightPassed = FALSE; @@ -1086,7 +1056,7 @@ case 0x01: { /* Set the tick count to CX:DX */ - Bda->TickCounter = MAKELONG(LOWORD(Edx), LOWORD(Ecx)); + Bda->TickCounter = MAKELONG(getDX(), getCX()); /* Reset the midnight flag */ Bda->MidnightPassed = FALSE; @@ -1097,7 +1067,7 @@ default: { DPRINT1("BIOS Function INT 1Ah, AH = 0x%02X NOT IMPLEMENTED\n", - HIBYTE(Eax)); + getAH()); } } } @@ -1111,7 +1081,7 @@ VOID BiosEquipmentService(LPWORD Stack) { /* Return the equipment list */ - EmulatorSetRegister(EMULATOR_REG_AX, Bda->EquipmentList); + setAX(Bda->EquipmentList); } VOID BiosHandleIrq(BYTE IrqNumber, LPWORD Stack) @@ -1123,7 +1093,6 @@ { /* Perform the system timer interrupt */ EmulatorInterrupt(BIOS_SYS_TIMER_INTERRUPT); - break; } @@ -1144,15 +1113,15 @@ if (!(ScanCode & (1 << 7))) { /* Key press */ - if (VirtualKey == VK_NUMLOCK - || VirtualKey == VK_CAPITAL - || VirtualKey == VK_SCROLL - || VirtualKey == VK_INSERT) + if (VirtualKey == VK_NUMLOCK || + VirtualKey == VK_CAPITAL || + VirtualKey == VK_SCROLL || + VirtualKey == VK_INSERT) { /* For toggle keys, toggle the lowest bit in the keyboard map */ BiosKeyboardMap[VirtualKey] ^= ~(1 << 0); } - + /* Set the highest bit */ BiosKeyboardMap[VirtualKey] |= (1 << 7); Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Sun Oct 27 23:39:52 2013 @@ -1886,8 +1886,7 @@ /* Return the attributes that DOS can understand */ Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; - // setCL(LOBYTE(Attributes)); - setCX(LOWORD(Attributes)); + setCL(LOBYTE(Attributes)); } else if (getAL() == 0x01) {

1 0

[jimtabor] 60780: - Sync wine to 1.7.5.
by jimtabor＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: jimtabor Date: Sun Oct 27 23:22:00 2013 New Revision: 60780 URL: http://svn.reactos.org/svn/reactos?rev=60780&view=rev Log: - Sync wine to 1.7.5. Modified: trunk/rostests/winetests/user32/listbox.c Modified: trunk/rostests/winetests/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/listbox.… ============================================================================== --- trunk/rostests/winetests/user32/listbox.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/listbox.c [iso-8859-1] Sun Oct 27 23:22:00 2013 @@ -53,16 +53,16 @@ INT_PTR ctl_id=0; if (parent) ctl_id=1; - handle=CreateWindow ("LISTBOX", "TestList", + handle=CreateWindowA("LISTBOX", "TestList", (LBS_STANDARD & ~LBS_SORT) | add_style, 0, 0, 100, 100, parent, (HMENU)ctl_id, NULL, 0); assert (handle); - SendMessage (handle, LB_ADDSTRING, 0, (LPARAM) strings[0]); - SendMessage (handle, LB_ADDSTRING, 0, (LPARAM) strings[1]); - SendMessage (handle, LB_ADDSTRING, 0, (LPARAM) strings[2]); - SendMessage (handle, LB_ADDSTRING, 0, (LPARAM) strings[3]); + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[0]); + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[1]); + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[2]); + SendMessageA(handle, LB_ADDSTRING, 0, (LPARAM) strings[3]); #ifdef VISIBLE ShowWindow (handle, SW_SHOW); @@ -91,10 +91,10 @@ static void listbox_query (HWND handle, struct listbox_stat *results) { - results->selected = SendMessage (handle, LB_GETCURSEL, 0, 0); - results->anchor = SendMessage (handle, LB_GETANCHORINDEX, 0, 0); - results->caret = SendMessage (handle, LB_GETCARETINDEX, 0, 0); - results->selcount = SendMessage (handle, LB_GETSELCOUNT, 0, 0); + results->selected = SendMessageA(handle, LB_GETCURSEL, 0, 0); + results->anchor = SendMessageA(handle, LB_GETANCHORINDEX, 0, 0); + results->caret = SendMessageA(handle, LB_GETCARETINDEX, 0, 0); + results->selcount = SendMessageA(handle, LB_GETSELCOUNT, 0, 0); } static void @@ -103,8 +103,8 @@ LPARAM lp=x+(y<<16); WAIT; - SendMessage (handle, WM_LBUTTONDOWN, MK_LBUTTON, lp); - SendMessage (handle, WM_LBUTTONUP, 0, lp); + SendMessageA(handle, WM_LBUTTONDOWN, MK_LBUTTON, lp); + SendMessageA(handle, WM_LBUTTONUP, 0, lp); REDRAW; } @@ -114,8 +114,8 @@ LPARAM lp=1+(scancode<<16)+(extended?KEYEVENTF_EXTENDEDKEY:0); WAIT; - SendMessage (handle, WM_KEYDOWN, keycode, lp); - SendMessage (handle, WM_KEYUP , keycode, lp | 0xc000000); + SendMessageA(handle, WM_KEYDOWN, keycode, lp); + SendMessageA(handle, WM_KEYUP , keycode, lp | 0xc000000); REDRAW; } @@ -146,7 +146,7 @@ listbox_query (hLB, &answer); listbox_ok (test, init, answer); - SendMessage (hLB, LB_GETITEMRECT, 1, (LPARAM) &second_item); + SendMessageA(hLB, LB_GETITEMRECT, 1, (LPARAM) &second_item); buttonpress(hLB, (WORD)second_item.left, (WORD)second_item.top); listbox_query (hLB, &answer); @@ -160,12 +160,12 @@ DestroyWindow (hLB); hLB=create_listbox (test.prop.add_style, 0); - SendMessage (hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 2)); + SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 2)); listbox_query (hLB, &answer); listbox_ok (test, sel, answer); for (i=0;i<4;i++) { - DWORD size = SendMessage (hLB, LB_GETTEXTLEN, i, 0); + DWORD size = SendMessageA(hLB, LB_GETTEXTLEN, i, 0); CHAR *txt; WCHAR *txtw; int resA, resW; @@ -189,13 +189,13 @@ } /* Confirm the count of items, and that an invalid delete does not remove anything */ - res = SendMessage (hLB, LB_GETCOUNT, 0, 0); + res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); ok((res==4), "Expected 4 items, got %d\n", res); - res = SendMessage (hLB, LB_DELETESTRING, -1, 0); + res = SendMessageA(hLB, LB_DELETESTRING, -1, 0); ok((res==LB_ERR), "Expected LB_ERR items, got %d\n", res); - res = SendMessage (hLB, LB_DELETESTRING, 4, 0); + res = SendMessageA(hLB, LB_DELETESTRING, 4, 0); ok((res==LB_ERR), "Expected LB_ERR items, got %d\n", res); - res = SendMessage (hLB, LB_GETCOUNT, 0, 0); + res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); ok((res==4), "Expected 4 items, got %d\n", res); WAIT; @@ -207,29 +207,29 @@ HWND hLB; HDC hdc; HFONT font; - TEXTMETRIC tm; + TEXTMETRICA tm; INT itemHeight; hLB = create_listbox (0, 0); ok ((hdc = GetDCEx( hLB, 0, DCX_CACHE )) != 0, "Can't get hdc\n"); ok ((font = GetCurrentObject(hdc, OBJ_FONT)) != 0, "Can't get the current font\n"); - ok (GetTextMetrics( hdc, &tm ), "Can't read font metrics\n"); + ok (GetTextMetricsA( hdc, &tm ), "Can't read font metrics\n"); ReleaseDC( hLB, hdc); - ok (SendMessage(hLB, WM_SETFONT, (WPARAM)font, 0) == 0, "Can't set font\n"); - - itemHeight = SendMessage(hLB, LB_GETITEMHEIGHT, 0, 0); + ok (SendMessageA(hLB, WM_SETFONT, (WPARAM)font, 0) == 0, "Can't set font\n"); + + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); ok (itemHeight == tm.tmHeight, "Item height wrong, got %d, expecting %d\n", itemHeight, tm.tmHeight); DestroyWindow (hLB); - hLB = CreateWindow ("LISTBOX", "TestList", LBS_OWNERDRAWVARIABLE, + hLB = CreateWindowA("LISTBOX", "TestList", LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, NULL, NULL, NULL, 0); - itemHeight = SendMessage(hLB, LB_GETITEMHEIGHT, 0, 0); + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); ok(itemHeight == tm.tmHeight, "itemHeight %d\n", itemHeight); - itemHeight = SendMessage(hLB, LB_GETITEMHEIGHT, 5, 0); + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 5, 0); ok(itemHeight == tm.tmHeight, "itemHeight %d\n", itemHeight); - itemHeight = SendMessage(hLB, LB_GETITEMHEIGHT, -5, 0); + itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, -5, 0); ok(itemHeight == tm.tmHeight, "itemHeight %d\n", itemHeight); DestroyWindow (hLB); } @@ -260,7 +260,7 @@ trace("rcItem (%d,%d-%d,%d)\n", dis->rcItem.left, dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom); - SendMessage(dis->hwndItem, LB_GETITEMRECT, dis->itemID, (LPARAM)&rc_item); + SendMessageA(dis->hwndItem, LB_GETITEMRECT, dis->itemID, (LPARAM)&rc_item); trace("item rect (%d,%d-%d,%d)\n", rc_item.left, rc_item.top, rc_item.right, rc_item.bottom); ok(EqualRect(&dis->rcItem, &rc_item), "item rects are not equal\n"); @@ -271,12 +271,12 @@ break; } - return DefWindowProc(hwnd, msg, wparam, lparam); + return DefWindowProcA(hwnd, msg, wparam, lparam); } static HWND create_parent( void ) { - WNDCLASS cls; + WNDCLASSA cls; HWND parent; static ATOM class; @@ -286,20 +286,20 @@ cls.lpfnWndProc = main_window_proc; cls.cbClsExtra = 0; cls.cbWndExtra = 0; - cls.hInstance = GetModuleHandle(0); + cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursor(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "main_window_class"; - class = RegisterClass( &cls ); - } - - parent = CreateWindowEx(0, "main_window_class", NULL, + class = RegisterClassA( &cls ); + } + + parent = CreateWindowExA(0, "main_window_class", NULL, WS_POPUP | WS_VISIBLE, 100, 100, 400, 400, GetDesktopWindow(), 0, - GetModuleHandle(0), NULL); + GetModuleHandleA(NULL), NULL); return parent; } @@ -319,16 +319,16 @@ UpdateWindow(hLB); /* make height short enough */ - SendMessage(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); SetWindowPos(hLB, 0, 0, 0, 100, rc.bottom - rc.top + 1, SWP_NOZORDER | SWP_NOMOVE); /* make 0 item invisible */ - SendMessage(hLB, LB_SETTOPINDEX, 1, 0); - ret = SendMessage(hLB, LB_GETTOPINDEX, 0, 0); + SendMessageA(hLB, LB_SETTOPINDEX, 1, 0); + ret = SendMessageA(hLB, LB_GETTOPINDEX, 0, 0); ok(ret == 1, "wrong top index %d\n", ret); - SendMessage(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); + SendMessageA(hLB, LB_GETITEMRECT, 0, (LPARAM)&rc); trace("item 0 rect (%d,%d-%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom); ok(!IsRectEmpty(&rc), "empty item rect\n"); ok(rc.top < 0, "rc.top is not negative (%d)\n", rc.top); @@ -361,61 +361,61 @@ listbox_query(hLB, &answer); listbox_test_query(test_nosel, answer); - ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 2)); + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, 2)); ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); listbox_query(hLB, &answer); listbox_test_query(test_1, answer); - SendMessage(hLB, LB_SETSEL, FALSE, -1); + SendMessageA(hLB, LB_SETSEL, FALSE, -1); listbox_query(hLB, &answer); listbox_test_query(test_nosel, answer); - ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(0, 4)); + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(0, 4)); ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); listbox_query(hLB, &answer); listbox_test_query(test_3, answer); - SendMessage(hLB, LB_SETSEL, FALSE, -1); + SendMessageA(hLB, LB_SETSEL, FALSE, -1); listbox_query(hLB, &answer); listbox_test_query(test_nosel, answer); - ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(-5, 5)); + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(-5, 5)); ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); listbox_query(hLB, &answer); listbox_test_query(test_nosel, answer); - SendMessage(hLB, LB_SETSEL, FALSE, -1); + SendMessageA(hLB, LB_SETSEL, FALSE, -1); listbox_query(hLB, &answer); listbox_test_query(test_nosel, answer); - ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(2, 10)); + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(2, 10)); ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); listbox_query(hLB, &answer); listbox_test_query(test_1, answer); - SendMessage(hLB, LB_SETSEL, FALSE, -1); + SendMessageA(hLB, LB_SETSEL, FALSE, -1); listbox_query(hLB, &answer); listbox_test_query(test_nosel, answer); - ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(4, 10)); + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(4, 10)); ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); listbox_query(hLB, &answer); listbox_test_query(test_nosel, answer); - SendMessage(hLB, LB_SETSEL, FALSE, -1); + SendMessageA(hLB, LB_SETSEL, FALSE, -1); listbox_query(hLB, &answer); listbox_test_query(test_nosel, answer); - ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(10, 1)); + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(10, 1)); ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); listbox_query(hLB, &answer); listbox_test_query(test_2, answer); - SendMessage(hLB, LB_SETSEL, FALSE, -1); + SendMessageA(hLB, LB_SETSEL, FALSE, -1); listbox_query(hLB, &answer); listbox_test_query(test_nosel, answer); - ret = SendMessage(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, -1)); + ret = SendMessageA(hLB, LB_SELITEMRANGE, TRUE, MAKELPARAM(1, -1)); ok(ret == LB_OKAY, "LB_SELITEMRANGE returned %d instead of LB_OKAY\n", ret); listbox_query(hLB, &answer); listbox_test_query(test_2, answer); @@ -428,35 +428,35 @@ HWND hList; int r, id; - hList = CreateWindow( "ListBox", "list test", 0, + hList = CreateWindowA( "ListBox", "list test", 0, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); ok( hList != NULL, "failed to create listbox\n"); - id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); ok( id == 0, "item id wrong\n"); - r = SendMessage( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 20, 0 )); + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 20, 0 )); ok( r == 0, "send message failed\n"); - r = SendMessage(hList, LB_GETITEMHEIGHT, 0, 0 ); + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); ok( r == 20, "height wrong\n"); - r = SendMessage( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0, 30 )); + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0, 30 )); ok( r == -1, "send message failed\n"); - r = SendMessage(hList, LB_GETITEMHEIGHT, 0, 0 ); + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); ok( r == 20, "height wrong\n"); - r = SendMessage( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0x100, 0 )); + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0x100, 0 )); ok( r == -1, "send message failed\n"); - r = SendMessage(hList, LB_GETITEMHEIGHT, 0, 0 ); + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); ok( r == 20, "height wrong\n"); - r = SendMessage( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0xff, 0 )); + r = SendMessageA( hList, LB_SETITEMHEIGHT, 0, MAKELPARAM( 0xff, 0 )); ok( r == 0, "send message failed\n"); - r = SendMessage(hList, LB_GETITEMHEIGHT, 0, 0 ); + r = SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0 ); ok( r == 0xff, "height wrong\n"); DestroyWindow( hList ); @@ -468,81 +468,81 @@ without caption). LBS_NOINTEGRALHEIGHT is required in order to test behavior of partially-displayed item. */ - HWND hList = CreateWindow( "ListBox", "list test", + HWND hList = CreateWindowA( "ListBox", "list test", WS_VISIBLE|WS_POPUP|LBS_NOINTEGRALHEIGHT, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); ULONG r, id; RECT rc; /* For an empty listbox win2k returns 0x1ffff, win98 returns 0x10000, nt4 returns 0xffffffff */ - r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); - r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 700, 30 )); + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 700, 30 )); ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); - r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 30, 300 )); + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 30, 300 )); ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); - id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); ok( id == 0, "item id wrong\n"); - id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi1"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi1"); ok( id == 1, "item id wrong\n"); - r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); ok( r == 0x1, "ret %x\n", r ); - r = SendMessage(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 601 )); + r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 601 )); ok( r == 0x10001 || broken(r == 1), /* nt4 */ "ret %x\n", r ); /* Resize control so that below assertions about sizes are valid */ - r = SendMessage( hList, LB_GETITEMRECT, 0, (LPARAM)&rc); + r = SendMessageA( hList, LB_GETITEMRECT, 0, (LPARAM)&rc); ok( r == 1, "ret %x\n", r); r = MoveWindow(hList, 1, 1, 600, (rc.bottom - rc.top + 1) * 9 / 2, TRUE); ok( r != 0, "ret %x\n", r); - id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi2"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi2"); ok( id == 2, "item id wrong\n"); - id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi3"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi3"); ok( id == 3, "item id wrong\n"); - id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi4"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi4"); ok( id == 4, "item id wrong\n"); - id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi5"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi5"); ok( id == 5, "item id wrong\n"); - id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi6"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi6"); ok( id == 6, "item id wrong\n"); - id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi7"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi7"); ok( id == 7, "item id wrong\n"); /* Set the listbox up so that id 1 is at the top, this leaves 5 partially visible at the bottom and 6, 7 are invisible */ - SendMessage( hList, LB_SETTOPINDEX, 1, 0); - r = SendMessage( hList, LB_GETTOPINDEX, 0, 0); + SendMessageA( hList, LB_SETTOPINDEX, 1, 0); + r = SendMessageA( hList, LB_GETTOPINDEX, 0, 0); ok( r == 1, "top %d\n", r); - r = SendMessage( hList, LB_GETITEMRECT, 5, (LPARAM)&rc); + r = SendMessageA( hList, LB_GETITEMRECT, 5, (LPARAM)&rc); ok( r == 1, "ret %x\n", r); - r = SendMessage( hList, LB_GETITEMRECT, 6, (LPARAM)&rc); + r = SendMessageA( hList, LB_GETITEMRECT, 6, (LPARAM)&rc); ok( r == 0, "ret %x\n", r); - r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(/* x */ 10, /* y */ 10) ); + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(/* x */ 10, /* y */ 10) ); ok( r == 1, "ret %x\n", r); - r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(1000, 10) ); + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(1000, 10) ); ok( r == 0x10001 || broken(r == 1), /* nt4 */ "ret %x\n", r ); - r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, -10) ); + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, -10) ); ok( r == 0x10001 || broken(r == 1), /* nt4 */ "ret %x\n", r ); - r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 100) ); + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 100) ); ok( r == 0x10005 || broken(r == 5), /* nt4 */ "item %x\n", r ); - r = SendMessage( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 200) ); + r = SendMessageA( hList, LB_ITEMFROMPOINT, 0, MAKELPARAM(10, 200) ); ok( r == 0x10005 || broken(r == 5), /* nt4 */ "item %x\n", r ); @@ -554,17 +554,17 @@ HWND hList; int r, id; - hList = CreateWindow( "ListBox", "list test", 0, + hList = CreateWindowA( "ListBox", "list test", 0, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); ok( hList != NULL, "failed to create listbox\n"); - id = SendMessage( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); + id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); ok( id == 0, "item id wrong\n"); - r = SendMessage( hList, LB_SETITEMDATA, 0, MAKELPARAM( 20, 0 )); + r = SendMessageA( hList, LB_SETITEMDATA, 0, MAKELPARAM( 20, 0 )); ok(r == TRUE, "LB_SETITEMDATA returned %d instead of TRUE\n", r); - r = SendMessage( hList, LB_GETITEMDATA, 0, 0); + r = SendMessageA( hList, LB_GETITEMDATA, 0, 0); ok( r == 20, "get item data failed\n"); DestroyWindow( hList ); @@ -594,7 +594,7 @@ one file that fits the wildcard w*.c . Normally, the test directory itself satisfies both conditions. */ - hList = CreateWindow( "ListBox", "list test", WS_VISIBLE|WS_POPUP, + hList = CreateWindowA( "ListBox", "list test", WS_VISIBLE|WS_POPUP, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); assert(hList); @@ -602,18 +602,18 @@ /* This should list all the files in the test directory. */ strcpy(pathBuffer, wildcard); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, 0, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); if (res == -1) /* "*" wildcard doesn't work on win9x */ { wildcard = "*.*"; strcpy(pathBuffer, wildcard); - res = SendMessage(hList, LB_DIR, 0, (LPARAM)pathBuffer); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); } ok (res >= 0, "SendMessage(LB_DIR, 0, *) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount > 0, "SendMessage(LB_DIR) did NOT fill the listbox!\n"); itemCount_allFiles = itemCount; ok(res + 1 == itemCount, @@ -622,12 +622,12 @@ /* This tests behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, 0, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); ok (res == -1, "SendMessage(LB_DIR, 0, %s) returned %d, expected -1\n", BAD_EXTENSION, res); /* There should be NO content in the listbox */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == 0, "SendMessage(LB_DIR) DID fill the listbox!\n"); @@ -635,8 +635,8 @@ * As of this writing, this includes win.c, winstation.c, wsprintf.c */ strcpy(pathBuffer, "w*.c"); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, 0, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, 0, (LPARAM)pathBuffer); ok (res >= 0, "SendMessage(LB_DIR, 0, w*.c) failed - 0x%08x\n", GetLastError()); /* Path specification does NOT converted to uppercase */ @@ -644,7 +644,7 @@ "expected no change to pathBuffer, got %s\n", pathBuffer); /* There should be some content in the listbox */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount > 0, "SendMessage(LB_DIR) did NOT fill the listbox!\n"); itemCount_justFiles = itemCount; ok(res + 1 == itemCount, @@ -654,7 +654,7 @@ /* Every single item in the control should start with a w and end in .c */ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); - SendMessage(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); p = pathBuffer + strlen(pathBuffer); ok(((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && (*(p-1) == 'c' || *(p-1) == 'C') && @@ -663,14 +663,14 @@ /* Test DDL_DIRECTORY */ strcpy(pathBuffer, wildcard); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY, *) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox. * All files plus "[..]" */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); itemCount_allDirs = itemCount - itemCount_allFiles; ok (itemCount > itemCount_allFiles, "SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with %d entries, expected > %d\n", @@ -681,25 +681,25 @@ /* This tests behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); ok (res == -1, "SendMessage(LB_DIR, DDL_DIRECTORY, %s) returned %d, expected -1\n", BAD_EXTENSION, res); /* There should be NO content in the listbox */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == 0, "SendMessage(LB_DIR) DID fill the listbox!\n"); /* Test DDL_DIRECTORY */ strcpy(pathBuffer, "w*.c"); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY, (LPARAM)pathBuffer); ok (res >= 0, "SendMessage(LB_DIR, DDL_DIRECTORY, w*.c) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox. Since the parent directory does not * fit w*.c, there should be exactly the same number of items as without DDL_DIRECTORY */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justFiles, "SendMessage(LB_DIR, DDL_DIRECTORY, w*.c) filled with %d entries, expected %d\n", itemCount, itemCount_justFiles); @@ -710,7 +710,7 @@ /* Every single item in the control should start with a w and end in .c. */ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); - SendMessage(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); p = pathBuffer + strlen(pathBuffer); ok( ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && @@ -721,8 +721,8 @@ /* Test DDL_DRIVES|DDL_EXCLUSIVE */ strcpy(pathBuffer, wildcard); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res >= 0, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, *) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox. In particular, there should @@ -730,7 +730,7 @@ * have been added. Depending on the user setting, more drives might have * been added. */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount >= 1, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, *) filled with %d entries, expected at least %d\n", itemCount, 1); @@ -741,7 +741,7 @@ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; - SendMessage(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); ok( strlen(pathBuffer) == 5, "Length of drive string is not 5\n" ); ok( sscanf(pathBuffer, "[-%c-]", &driveletter) == 1, "Element %d (%s) does not fit [-X-]\n", i, pathBuffer); ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); @@ -754,12 +754,12 @@ /* This tests behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DRIVES|DDL_EXCLUSIVE, %s) returned %d, expected %d\n", BAD_EXTENSION, res, itemCount_justDrives -1); - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justDrives, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, itemCount_justDrives); @@ -768,8 +768,8 @@ /* Test DDL_DRIVES. */ strcpy(pathBuffer, wildcard); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); ok (res > 0, "SendMessage(LB_DIR, DDL_DRIVES, *) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox. In particular, there should @@ -777,7 +777,7 @@ * have been added. Depending on the user setting, more drives might have * been added. */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justDrives + itemCount_allFiles, "SendMessage(LB_DIR, DDL_DRIVES, *) filled with %d entries, expected %d\n", itemCount, itemCount_justDrives + itemCount_allFiles); @@ -785,19 +785,19 @@ /* This tests behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DRIVES, %s) returned %d, expected %d\n", BAD_EXTENSION, res, itemCount_justDrives -1); - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); /* Test DDL_DRIVES. */ strcpy(pathBuffer, "w*.c"); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DRIVES, (LPARAM)pathBuffer); ok (res > 0, "SendMessage(LB_DIR, DDL_DRIVES, w*.c) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox. In particular, there should @@ -805,7 +805,7 @@ * have been added. Depending on the user setting, more drives might have * been added. */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justDrives + itemCount_justFiles, "SendMessage(LB_DIR, DDL_DRIVES, w*.c) filled with %d entries, expected %d\n", itemCount, itemCount_justDrives + itemCount_justFiles); @@ -815,7 +815,7 @@ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; - SendMessage(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); p = pathBuffer + strlen(pathBuffer); if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) { ok( strlen(pathBuffer) == 5, "Length of drive string is not 5\n" ); @@ -831,14 +831,14 @@ /* Test DDL_DIRECTORY|DDL_DRIVES. This does *not* imply DDL_EXCLUSIVE */ strcpy(pathBuffer, wildcard); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, *) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox. In particular, there should * be exactly the number of plain files, plus the number of mapped drives. */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_allFiles + itemCount_justDrives + itemCount_allDirs, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES) filled with %d entries, expected %d\n", itemCount, itemCount_allFiles + itemCount_justDrives + itemCount_allDirs); @@ -851,7 +851,7 @@ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; - SendMessage(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) { ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); } @@ -859,26 +859,26 @@ /* This tests behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, %s) returned %d, expected %d\n", BAD_EXTENSION, res, itemCount_justDrives -1); - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); /* Test DDL_DIRECTORY|DDL_DRIVES. */ strcpy(pathBuffer, "w*.c"); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES, (LPARAM)pathBuffer); ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES, w*.c) failed - 0x%08x\n", GetLastError()); /* There should be some content in the listbox. In particular, there should * be exactly the number of plain files, plus the number of mapped drives. */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justFiles + itemCount_justDrives, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES) filled with %d entries, expected %d\n", itemCount, itemCount_justFiles + itemCount_justDrives); @@ -891,7 +891,7 @@ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; - SendMessage(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); p = pathBuffer + strlen(pathBuffer); if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) { ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); @@ -905,11 +905,11 @@ /* Test DDL_DIRECTORY|DDL_EXCLUSIVE. */ strcpy(pathBuffer, wildcard); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res != -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err %u\n", GetLastError()); - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_allDirs, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", itemCount, itemCount_allDirs); @@ -918,41 +918,41 @@ if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ { memset(pathBuffer, 0, MAX_PATH); - SendMessage(hList, LB_GETTEXT, 0, (LPARAM)pathBuffer); + SendMessageA(hList, LB_GETTEXT, 0, (LPARAM)pathBuffer); ok( !strcmp(pathBuffer, "[..]"), "First element is not [..]\n"); } /* This tests behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res == -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, %s) returned %d, expected %d\n", BAD_EXTENSION, res, -1); - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); /* Test DDL_DIRECTORY|DDL_EXCLUSIVE. */ strcpy(pathBuffer, "w*.c"); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res == LB_ERR, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, w*.c) returned %d expected %d\n", res, LB_ERR); /* There should be no elements, since "[..]" does not fit w*.c */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", itemCount, 0); /* Test DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE. */ strcpy(pathBuffer, wildcard); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res > 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c,) failed - 0x%08x\n", GetLastError()); /* There should be no plain files on the listbox */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justDrives + itemCount_allDirs, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", itemCount, itemCount_justDrives + itemCount_allDirs); @@ -961,7 +961,7 @@ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; - SendMessage(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) { ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); } else { @@ -972,22 +972,22 @@ /* This tests behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res == itemCount_justDrives -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, %s) returned %d, expected %d\n", BAD_EXTENSION, res, itemCount_justDrives -1); - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == res + 1, "SendMessage(LB_DIR) returned %d expected %d\n", itemCount, res + 1); /* Test DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE. */ strcpy(pathBuffer, "w*.c"); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - res = SendMessage(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); + SendMessageA(hList, LB_RESETCONTENT, 0, 0); + res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, (LPARAM)pathBuffer); ok (res >= 0, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE, w*.c,) failed - 0x%08x\n", GetLastError()); /* There should be no plain files on the listbox, and no [..], since it does not fit w*.c */ - itemCount = SendMessage(hList, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justDrives, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", itemCount, itemCount_justDrives); @@ -996,7 +996,7 @@ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; - SendMessage(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(hList, LB_GETTEXT, i, (LPARAM)pathBuffer); ok (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1, "Element %d (%s) does not fit [-X-]\n", i, pathBuffer); ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); } @@ -1011,16 +1011,16 @@ #define ID_TEST_LABEL 1001 #define ID_TEST_LISTBOX 1002 -static BOOL on_listbox_container_create (HWND hwnd, LPCREATESTRUCT lpcs) -{ - g_label = CreateWindow( +static BOOL on_listbox_container_create (HWND hwnd, LPCREATESTRUCTA lpcs) +{ + g_label = CreateWindowA( "Static", "Contents of static control before DlgDirList.", WS_CHILD | WS_VISIBLE, 10, 10, 512, 32, hwnd, (HMENU)ID_TEST_LABEL, NULL, 0); if (!g_label) return FALSE; - g_listBox = CreateWindow( + g_listBox = CreateWindowA( "ListBox", "DlgDirList test", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER | WS_VSCROLL, @@ -1060,7 +1060,7 @@ cls.cbWndExtra = 0; cls.hInstance = hInst; cls.hIcon = NULL; - cls.hCursor = LoadCursorA (NULL, IDC_ARROW); + cls.hCursor = LoadCursorA (NULL, (LPCSTR)IDC_ARROW); cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); cls.lpszMenuName = NULL; cls.lpfnWndProc = listbox_container_window_procA; @@ -1098,7 +1098,7 @@ hInst = GetModuleHandleA(0); if (!RegisterListboxWindowClass(hInst)) assert(0); - hWnd = CreateWindow("ListboxContainerClass", "ListboxContainerClass", + hWnd = CreateWindowA("ListboxContainerClass", "ListboxContainerClass", WS_OVERLAPPEDWINDOW | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInst, 0); @@ -1107,13 +1107,13 @@ /* Test for standard usage */ /* The following should be overwritten by the directory path */ - SendMessage(g_label, WM_SETTEXT, 0, (LPARAM)"default contents"); + SendMessageA(g_label, WM_SETTEXT, 0, (LPARAM)"default contents"); /* This should list all the w*.c files in the test directory * As of this writing, this includes win.c, winstation.c, wsprintf.c */ strcpy(pathBuffer, "w*.c"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, 0); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, 0); ok (res == 1, "DlgDirList(*.c, 0) returned %d - expected 1 - 0x%08x\n", res, GetLastError()); /* Path specification gets converted to uppercase */ @@ -1121,19 +1121,19 @@ "expected conversion to uppercase, got %s\n", pathBuffer); /* Loaded path should have overwritten the label text */ - SendMessage(g_label, WM_GETTEXT, MAX_PATH, (LPARAM)pathBuffer); + SendMessageA(g_label, WM_GETTEXT, MAX_PATH, (LPARAM)pathBuffer); trace("Static control after DlgDirList: %s\n", pathBuffer); ok (strcmp("default contents", pathBuffer), "DlgDirList() did not modify static control!\n"); /* There should be some content in the listbox */ - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); ok (itemCount > 0, "DlgDirList() did NOT fill the listbox!\n"); itemCount_justFiles = itemCount; /* Every single item in the control should start with a w and end in .c */ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); - SendMessage(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); p = pathBuffer + strlen(pathBuffer); ok(((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && (*(p-1) == 'c' || *(p-1) == 'C') && @@ -1142,15 +1142,15 @@ /* Test behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, 0); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, 0); ok (res == 1, "DlgDirList(%s, 0) returned %d expected 1\n", BAD_EXTENSION, res); - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); ok (itemCount == 0, "DlgDirList() DID fill the listbox!\n"); /* Test DDL_DIRECTORY */ strcpy(pathBuffer, "w*.c"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY); ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY) failed - 0x%08x\n", GetLastError()); @@ -1158,7 +1158,7 @@ * be exactly more elements than before, since the directories should * have been added. */ - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); itemCount_allDirs = itemCount - itemCount_justFiles; ok (itemCount >= itemCount_justFiles, "DlgDirList(DDL_DIRECTORY) filled with %d entries, expected > %d\n", @@ -1169,7 +1169,7 @@ */ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); - SendMessage(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); p = pathBuffer + strlen(pathBuffer); ok( (pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']') || ((pathBuffer[0] == 'w' || pathBuffer[0] == 'W') && @@ -1179,17 +1179,17 @@ /* Test behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY); ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY) returned %d expected 1\n", BAD_EXTENSION, res); - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_allDirs, "DlgDirList() incorrectly filled the listbox! (expected %d got %d)\n", itemCount_allDirs, itemCount); for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); - SendMessage(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); ok( pathBuffer[0] == '[' && pathBuffer[strlen(pathBuffer)-1] == ']', "Element %d (%s) does not fit requested [...]\n", i, pathBuffer); } @@ -1197,7 +1197,7 @@ /* Test DDL_DRIVES. At least on WinXP-SP2, this implies DDL_EXCLUSIVE */ strcpy(pathBuffer, "w*.c"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DRIVES); ok (res == 1, "DlgDirList(*.c, DDL_DRIVES) failed - 0x%08x\n", GetLastError()); @@ -1206,7 +1206,7 @@ * have been added. Depending on the user setting, more drives might have * been added. */ - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); ok (itemCount >= 1, "DlgDirList(DDL_DRIVES) filled with %d entries, expected at least %d\n", itemCount, 1); @@ -1216,7 +1216,7 @@ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; - SendMessage(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); ok( strlen(pathBuffer) == 5, "Length of drive string is not 5\n" ); ok( sscanf(pathBuffer, "[-%c-]", &driveletter) == 1, "Element %d (%s) does not fit [-X-]\n", i, pathBuffer); ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); @@ -1229,17 +1229,17 @@ /* Test behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DRIVES); ok (res == 1, "DlgDirList(%s, DDL_DRIVES) returned %d expected 1\n", BAD_EXTENSION, res); - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justDrives, "DlgDirList() incorrectly filled the listbox!\n"); /* Test DDL_DIRECTORY|DDL_DRIVES. This does *not* imply DDL_EXCLUSIVE */ strcpy(pathBuffer, "w*.c"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES); ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY|DDL_DRIVES) failed - 0x%08x\n", GetLastError()); @@ -1247,7 +1247,7 @@ * be exactly the number of plain files, plus the number of mapped drives, * plus one "[..]" */ - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justFiles + itemCount_justDrives + itemCount_allDirs, "DlgDirList(DDL_DIRECTORY|DDL_DRIVES) filled with %d entries, expected %d\n", itemCount, itemCount_justFiles + itemCount_justDrives + itemCount_allDirs); @@ -1259,7 +1259,7 @@ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; - SendMessage(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); p = pathBuffer + strlen(pathBuffer); if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) { ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); @@ -1273,11 +1273,11 @@ /* Test behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES); ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY|DDL_DRIVES) returned %d expected 1\n", BAD_EXTENSION, res); - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justDrives + itemCount_allDirs, "DlgDirList() incorrectly filled the listbox! (expected %d got %d)\n", itemCount_justDrives + itemCount_allDirs, itemCount); @@ -1286,12 +1286,12 @@ /* Test DDL_DIRECTORY|DDL_EXCLUSIVE. */ strcpy(pathBuffer, "w*.c"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_EXCLUSIVE); ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY|DDL_EXCLUSIVE) failed - 0x%08x\n", GetLastError()); /* There should be exactly one element: "[..]" */ - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_allDirs, "DlgDirList(DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", itemCount, itemCount_allDirs); @@ -1299,28 +1299,28 @@ if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ { memset(pathBuffer, 0, MAX_PATH); - SendMessage(g_listBox, LB_GETTEXT, 0, (LPARAM)pathBuffer); + SendMessageA(g_listBox, LB_GETTEXT, 0, (LPARAM)pathBuffer); ok( !strcmp(pathBuffer, "[..]"), "First (and only) element is not [..]\n"); } /* Test behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_EXCLUSIVE); ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY|DDL_EXCLUSIVE) returned %d expected 1\n", BAD_EXTENSION, res); - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); /* Test DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE. */ strcpy(pathBuffer, "w*.c"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE); ok (res == 1, "DlgDirList(*.c, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) failed - 0x%08x\n", GetLastError()); /* There should be no plain files on the listbox */ - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justDrives + itemCount_allDirs, "DlgDirList(DDL_DIRECTORY|DDL_EXCLUSIVE) filled with %d entries, expected %d\n", itemCount, itemCount_justDrives + itemCount_allDirs); @@ -1328,7 +1328,7 @@ for (i = 0; i < itemCount; i++) { memset(pathBuffer, 0, MAX_PATH); driveletter = '\0'; - SendMessage(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)pathBuffer); if (sscanf(pathBuffer, "[-%c-]", &driveletter) == 1) { ok( driveletter >= 'a' && driveletter <= 'z', "Drive letter not in range a..z, got ascii %d\n", driveletter); } else { @@ -1339,25 +1339,25 @@ /* Test behavior when no files match the wildcard */ strcpy(pathBuffer, BAD_EXTENSION); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE); ok (res == 1, "DlgDirList(%s, DDL_DIRECTORY|DDL_DRIVES|DDL_EXCLUSIVE) returned %d expected 1\n", BAD_EXTENSION, res); - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); ok (itemCount == itemCount_justDrives + itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); /* Now test DlgDirSelectEx() in normal operation */ /* Fill with everything - drives, directory and all plain files. */ strcpy(pathBuffer, "*"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, ID_TEST_LABEL, DDL_DIRECTORY|DDL_DRIVES); ok (res != 0, "DlgDirList(*, DDL_DIRECTORY|DDL_DRIVES) failed - 0x%08x\n", GetLastError()); - SendMessage(g_listBox, LB_SETCURSEL, -1, 0); /* Unselect any current selection */ + SendMessageA(g_listBox, LB_SETCURSEL, -1, 0); /* Unselect any current selection */ memset(pathBuffer, 0, MAX_PATH); SetLastError(0xdeadbeef); - res = DlgDirSelectEx(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); ok (GetLastError() == 0xdeadbeef, "DlgDirSelectEx() with no selection modified last error code from 0xdeadbeef to 0x%08x\n", GetLastError()); @@ -1367,19 +1367,19 @@ ok (strlen(pathBuffer) == 0, "DlgDirSelectEx() with no selection filled buffer with %s\n", pathBuffer); */ /* Test proper drive/dir/file recognition */ - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); for (i = 0; i < itemCount; i++) { memset(itemBuffer, 0, MAX_PATH); memset(pathBuffer, 0, MAX_PATH); memset(tempBuffer, 0, MAX_PATH); driveletter = '\0'; - SendMessage(g_listBox, LB_GETTEXT, i, (LPARAM)itemBuffer); - res = SendMessage(g_listBox, LB_SETCURSEL, i, 0); - ok (res == i, "SendMessage(LB_SETCURSEL, %d) failed\n", i); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)itemBuffer); + res = SendMessageA(g_listBox, LB_SETCURSEL, i, 0); + ok (res == i, "SendMessageA(LB_SETCURSEL, %d) failed\n", i); if (sscanf(itemBuffer, "[-%c-]", &driveletter) == 1) { /* Current item is a drive letter */ SetLastError(0xdeadbeef); - res = DlgDirSelectEx(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); ok (GetLastError() == 0xdeadbeef, "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", i, GetLastError()); @@ -1391,7 +1391,7 @@ } else if (itemBuffer[0] == '[') { /* Current item is the parent directory */ SetLastError(0xdeadbeef); - res = DlgDirSelectEx(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); ok (GetLastError() == 0xdeadbeef, "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", i, GetLastError()); @@ -1402,13 +1402,13 @@ ok (*(p-1) == '\\', "DlgDirSelectEx did NOT tack on a backslash to dir, got %s\n", pathBuffer); tempBuffer[0] = '['; - strncpy(tempBuffer + 1, pathBuffer, strlen(pathBuffer) - 1); + lstrcpynA(tempBuffer + 1, pathBuffer, strlen(pathBuffer)); strcat(tempBuffer, "]"); ok (!strcmp(tempBuffer, itemBuffer), "Formatted directory should be %s, got %s\n", tempBuffer, itemBuffer); } else { /* Current item is a plain file */ SetLastError(0xdeadbeef); - res = DlgDirSelectEx(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); ok (GetLastError() == 0xdeadbeef, "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", i, GetLastError()); @@ -1427,22 +1427,22 @@ /* Now test DlgDirSelectEx() in abnormal operation */ /* Fill list with bogus entries, that look somewhat valid */ - SendMessage(g_listBox, LB_RESETCONTENT, 0, 0); - SendMessage(g_listBox, LB_ADDSTRING, 0, (LPARAM)"[notexist.dir]"); - SendMessage(g_listBox, LB_ADDSTRING, 0, (LPARAM)"notexist.fil"); - itemCount = SendMessage(g_listBox, LB_GETCOUNT, 0, 0); + SendMessageA(g_listBox, LB_RESETCONTENT, 0, 0); + SendMessageA(g_listBox, LB_ADDSTRING, 0, (LPARAM)"[notexist.dir]"); + SendMessageA(g_listBox, LB_ADDSTRING, 0, (LPARAM)"notexist.fil"); + itemCount = SendMessageA(g_listBox, LB_GETCOUNT, 0, 0); for (i = 0; i < itemCount; i++) { memset(itemBuffer, 0, MAX_PATH); memset(pathBuffer, 0, MAX_PATH); memset(tempBuffer, 0, MAX_PATH); driveletter = '\0'; - SendMessage(g_listBox, LB_GETTEXT, i, (LPARAM)itemBuffer); - res = SendMessage(g_listBox, LB_SETCURSEL, i, 0); + SendMessageA(g_listBox, LB_GETTEXT, i, (LPARAM)itemBuffer); + res = SendMessageA(g_listBox, LB_SETCURSEL, i, 0); ok (res == i, "SendMessage(LB_SETCURSEL, %d) failed\n", i); if (sscanf(itemBuffer, "[-%c-]", &driveletter) == 1) { /* Current item is a drive letter */ SetLastError(0xdeadbeef); - res = DlgDirSelectEx(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); ok (GetLastError() == 0xdeadbeef, "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", i, GetLastError()); @@ -1454,7 +1454,7 @@ } else if (itemBuffer[0] == '[') { /* Current item is the parent directory */ SetLastError(0xdeadbeef); - res = DlgDirSelectEx(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); ok (GetLastError() == 0xdeadbeef, "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", i, GetLastError()); @@ -1465,13 +1465,13 @@ ok (*(p-1) == '\\', "DlgDirSelectEx did NOT tack on a backslash to dir, got %s\n", pathBuffer); tempBuffer[0] = '['; - strncpy(tempBuffer + 1, pathBuffer, strlen(pathBuffer) - 1); + lstrcpynA(tempBuffer + 1, pathBuffer, strlen(pathBuffer)); strcat(tempBuffer, "]"); ok (!strcmp(tempBuffer, itemBuffer), "Formatted directory should be %s, got %s\n", tempBuffer, itemBuffer); } else { /* Current item is a plain file */ SetLastError(0xdeadbeef); - res = DlgDirSelectEx(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); + res = DlgDirSelectExA(hWnd, pathBuffer, MAX_PATH, ID_TEST_LISTBOX); ok (GetLastError() == 0xdeadbeef, "DlgDirSelectEx() with selection at %d modified last error code from 0xdeadbeef to 0x%08x\n", i, GetLastError()); @@ -1488,13 +1488,13 @@ /* Test behavior when loading folders from root with and without wildcard */ strcpy(pathBuffer, "C:\\"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); strcpy(pathBuffer, "C:\\*"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\* folders\n"); ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); @@ -1502,7 +1502,7 @@ /* Try loading files from an invalid folder */ SetLastError(0xdeadbeef); strcpy(pathBuffer, "C:\\INVALID$$DIR"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, "GetLastError should return 0x589, got 0x%X\n",GetLastError()); @@ -1523,9 +1523,9 @@ GetUpdateRect( listbox, &r, TRUE ); ok( IsRectEmpty( &r ), "got non-empty rect\n"); - ret = SendMessage( listbox, LB_SETCOUNT, 100, 0 ); + ret = SendMessageA( listbox, LB_SETCOUNT, 100, 0 ); ok( ret == 0, "got %d\n", ret ); - ret = SendMessage( listbox, LB_GETCOUNT, 0, 0 ); + ret = SendMessageA( listbox, LB_GETCOUNT, 0, 0 ); ok( ret == 100, "got %d\n", ret ); GetUpdateRect( listbox, &r, TRUE ); @@ -1535,7 +1535,7 @@ GetUpdateRect( listbox, &r, TRUE ); ok( IsRectEmpty( &r ), "got non-empty rect\n"); - ret = SendMessage( listbox, LB_SETCOUNT, 99, 0 ); + ret = SendMessageA( listbox, LB_SETCOUNT, 99, 0 ); ok( ret == 0, "got %d\n", ret ); GetUpdateRect( listbox, &r, TRUE ); @@ -1564,7 +1564,7 @@ WNDPROC oldproc; DWORD ret; - pGetListBoxInfo = (void*)GetProcAddress(GetModuleHandle("user32"), "GetListBoxInfo"); + pGetListBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetListBoxInfo"); if (!pGetListBoxInfo) {

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