wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Paul Vriens : rsaenh/tests: Fix some test failures on W2K.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 8fe8d61a627273963d9dbde1efcc49c6704361c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe8d61a627273963d9dbde1e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 18 20:58:35 2009 +0100 rsaenh/tests: Fix some test failures on W2K. --- dlls/rsaenh/tests/rsaenh.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index bf6ed0f..b56f4d4 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -72,9 +72,15 @@ static void uniquecontainer(char *unique) HKEY hkey; char guid[MAX_PATH]; DWORD size = MAX_PATH; + HRESULT ret; /* Get the MachineGUID */ - RegOpenKeyExA(HKEY_LOCAL_MACHINE, szCryptography, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, szCryptography, 0, KEY_READ | KEY_WOW64_64KEY, &hkey); + if (ret == ERROR_ACCESS_DENIED) + { + /* Windows 2000 can't handle KEY_WOW64_64KEY */ + RegOpenKeyA(HKEY_LOCAL_MACHINE, szCryptography, &hkey); + } RegQueryValueExA(hkey, szMachineGuid, NULL, NULL, (LPBYTE)guid, &size); RegCloseKey(hkey);

1 0

Nicolas Le Cam : widl: Don' t generate memset calls with zero length parameter.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: ca38b8b9515a506e89f9ef0ac3fc4e2f0da8d867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca38b8b9515a506e89f9ef0ac… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Wed Nov 18 19:39:08 2009 +0100 widl: Don't generate memset calls with zero length parameter. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index fdb2379..68e9da1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3298,7 +3298,7 @@ void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, size = 0; } - if (phase == PHASE_MARSHAL) + if (phase == PHASE_MARSHAL && alignment > 1) print_file(file, indent, "MIDL_memset(__frame->_StubMsg.Buffer, 0, (0x%x - (ULONG_PTR)__frame->_StubMsg.Buffer) & 0x%x);\n", alignment, alignment - 1); print_file(file, indent, "__frame->_StubMsg.Buffer = (unsigned char *)(((ULONG_PTR)__frame->_StubMsg.Buffer + %u) & ~0x%x);\n", alignment - 1, alignment - 1);

1 0

Piotr Caban : msxml3: Remove test that fails on some systems.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 6633001d6edf348e922521daea069ec36ac9b3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6633001d6edf348e922521dae… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 19:02:30 2009 +0100 msxml3: Remove test that fails on some systems. --- dlls/msxml3/tests/domdoc.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f84d748..20c6a9f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4066,18 +4066,9 @@ static void test_NodeTypeValue(void) ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { - VARIANT hlp_in, hlp_out; - V_VT(&hlp_in) = VT_BSTR; - V_BSTR(&hlp_in) = _bstr_("7322.9371"); - V_VT(&hlp_out) = VT_CY; - ok(VariantChangeType(&hlp_out, &hlp_in, 0, VT_CY) == S_OK, "VariantChangeType failed\n"); - VariantClear(&hlp_in); - hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&v) == VT_CY, "incorrect type\n"); - ok(VarCyCmp(V_CY(&v), V_CY(&hlp_out)) == VARCMP_EQ, "incorrect value\n"); - VariantClear(&hlp_out); VariantClear(&v); IXMLDOMNode_Release(pNode);

1 0

Piotr Caban : oleaut32: Ignore milliseconds in VarDateFromUdate implementation.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 1f7a07ebe397fbef6fbb0aac1ade7c21db11f8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f7a07ebe397fbef6fbb0aac1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 19:02:21 2009 +0100 oleaut32: Ignore milliseconds in VarDateFromUdate implementation. --- dlls/msi/tests/automation.c | 3 +-- dlls/oleaut32/tests/vartest.c | 3 +++ dlls/oleaut32/variant.c | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 4af37aa..29a7cd2 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1506,8 +1506,7 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_LASTSAVE_DTM, &varresult, V_VT(&var)); ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); - /* FIXME: Off by one second */ - todo_wine ok(V_DATE(&var) == V_DATE(&varresult), "SummaryInfo_PropertyGet expected %lf, but returned %lf\n", V_DATE(&var), V_DATE(&varresult)); + ok(V_DATE(&var) == V_DATE(&varresult), "SummaryInfo_PropertyGet expected %lf, but returned %lf\n", V_DATE(&var), V_DATE(&varresult)); VariantClear(&varresult); VariantClear(&var); diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 68a4edf..05f4be3 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1646,6 +1646,9 @@ static void test_VarDateFromUdate(void) UD2T(31,12,9999,0,0,0,0,0,0,0,S_OK,2958465.0); /* 31 Dec 9999 - Max */ UD2T(1,1,10000,0,0,0,0,0,0,0,E_INVALIDARG,0.0); /* > 31 Dec 9999 => err */ + UD2T(30,12,1899,0,0,0,0,0,0,0,S_OK,0.0); /* 30 Dec 1899 0:00:00 */ + UD2T(30,12,1899,0,0,0,999,0,0,0,S_OK,0.0); /* Ignore milliseconds */ + UD2T(1,1,1980,18,1,16,0,2,1,0,S_OK,29221.75087962963); /* 6:18:02 PM */ todo_wine UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled hours */ todo_wine UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled minutes */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index cd99814..10bc8ed 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1388,7 +1388,6 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT dateVal += ud.st.wHour / 24.0; dateVal += ud.st.wMinute / 1440.0; dateVal += ud.st.wSecond / 86400.0; - dateVal += ud.st.wMilliseconds / 86400000.0; TRACE("Returning %g\n", dateVal); *pDateOut = dateVal;

1 0

Piotr Caban : msxml3: Ignore nanoseconds in xmlnode_get_nodeTypedValue.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 5f26c60982631ec1c180caafc56f467071728ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f26c60982631ec1c180caafc… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 19:02:15 2009 +0100 msxml3: Ignore nanoseconds in xmlnode_get_nodeTypedValue. --- dlls/msxml3/node.c | 9 --------- dlls/msxml3/tests/domdoc.c | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b949037..1ddbc07 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -999,16 +999,7 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) if(*p == '.') { - int ms; - p++; - ms = (*(p++) - '0') * 10; - if(isdigitW(*p)) ms += *(p++) - '0'; - ms *= 10; - if(isdigitW(*p)) ms += *(p++) - '0'; - - st.wMilliseconds = ms; - while(isdigitW(*p)) p++; } } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6e08ca9..f84d748 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4103,7 +4103,7 @@ static void test_NodeTypeValue(void) hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&v) == VT_DATE, "incorrect type\n"); - double_eq(40135.13996666666, V_DATE(&v)); + double_eq(40135.13996527778, V_DATE(&v)); VariantClear( &v ); IXMLDOMNode_Release(pNode); @@ -4142,7 +4142,7 @@ static void test_NodeTypeValue(void) hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&v) == VT_DATE, "incorrect type\n"); - double_eq(0.581392511574074, V_DATE(&v)); + double_eq(0.5813888888888888, V_DATE(&v)); VariantClear( &v ); IXMLDOMNode_Release(pNode); @@ -4155,7 +4155,7 @@ static void test_NodeTypeValue(void) hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&v) == VT_DATE, "incorrect type\n"); - double_eq(1.112513078703703, V_DATE(&v)); + double_eq(1.112511574074074, V_DATE(&v)); VariantClear( &v ); IXMLDOMNode_Release(pNode);

1 0

Huw Davies : wineps.drv: Add support for top-down dibs.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: eed649a5e18aaabef42e58da0e7a557046b665dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed649a5e18aaabef42e58da0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 18 16:39:27 2009 +0000 wineps.drv: Add support for top-down dibs. --- dlls/wineps.drv/bitmap.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 9f5f11d..c450bca 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -242,6 +242,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w if (!get_bitmap_info( info, &fullSrcWidth, &fullSrcHeight, &bpp, &compression )) return FALSE; stride = get_dib_width_bytes(fullSrcWidth, bpp); + if(fullSrcHeight < 0) stride = -stride; /* top-down */ TRACE("full size=%dx%d bpp=%d compression=%d rop=%08x\n", fullSrcWidth, fullSrcHeight, bpp, compression, dwRop); @@ -272,6 +273,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageMaskHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); if(xSrc & 7) FIXME("This won't work...\n"); @@ -287,6 +289,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); if(xSrc & 1) FIXME("This won't work...\n"); @@ -302,6 +305,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); @@ -318,6 +322,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); @@ -350,6 +355,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); @@ -372,6 +378,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; + if(stride < 0) src_ptr += (fullSrcHeight + 1) * stride; src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size);

1 0

Piotr Caban : msxml3: Implemented xmlnode_get_nodeTypedValue 'i1' data type handling.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: f4f7198610efcac150dd8373c9fd9a4e30c40d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f7198610efcac150dd8373c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 19:02:07 2009 +0100 msxml3: Implemented xmlnode_get_nodeTypedValue 'i1' data type handling. --- dlls/msxml3/node.c | 2 ++ dlls/msxml3/tests/domdoc.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 4910605..b949037 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1035,6 +1035,8 @@ inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) V_VT(v) = VT_CY; else if(!lstrcmpiW(type, szBoolean)) V_VT(v) = VT_BOOL; + else if(!lstrcmpiW(type, szI1)) + V_VT(v) = VT_I1; else { FIXME("Type handling not yet implemented\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7c8fddf..6e08ca9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -161,6 +161,7 @@ static const CHAR szTypeValueXML[] = " <date dt:dt=\"date\">3721-11-01</date>\n" " <time dt:dt=\"time\">13:57:12.31321</time>\n" " <timetz dt:dt=\"time.tz\">23:21:01.13+03:21</timetz>\n" +" <i1 dt:dt=\"i1\">-13</i1>\n" "</root>"; static const CHAR szBasicTransformSSXMLPart1[] = @@ -4159,6 +4160,19 @@ static void test_NodeTypeValue(void) IXMLDOMNode_Release(pNode); } + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/i1"), &pNode); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(V_VT(&v) == VT_I1, "incorrect type\n"); + ok(V_I1(&v) == -13, "incorrect value\n"); + VariantClear( &v ); + + IXMLDOMNode_Release(pNode); + } } IXMLDOMDocument2_Release(doc);

1 0

Huw Davies : wineps.drv: Rename variable to stride.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 05472017fef284d53a7c7d34a0c68832ed7bffe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05472017fef284d53a7c7d34a… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 18 12:20:17 2009 +0000 wineps.drv: Rename variable to stride. --- dlls/wineps.drv/bitmap.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 0c350d2..9f5f11d 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -228,7 +228,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w const BITMAPINFO *info, UINT wUsage, DWORD dwRop ) { LONG fullSrcWidth, fullSrcHeight; - INT widthbytes; + INT stride; WORD bpp, compression; INT line; POINT pt[2]; @@ -241,7 +241,7 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w if (!get_bitmap_info( info, &fullSrcWidth, &fullSrcHeight, &bpp, &compression )) return FALSE; - widthbytes = get_dib_width_bytes(fullSrcWidth, bpp); + stride = get_dib_width_bytes(fullSrcWidth, bpp); TRACE("full size=%dx%d bpp=%d compression=%d rop=%08x\n", fullSrcWidth, fullSrcHeight, bpp, compression, dwRop); @@ -272,12 +272,12 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageMaskHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); if(xSrc & 7) FIXME("This won't work...\n"); bitmap_size = heightSrc * ((widthSrc + 7) / 8); dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes, dst_ptr += ((widthSrc + 7) / 8)) + for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += ((widthSrc + 7) / 8)) memcpy(dst_ptr, src_ptr + xSrc / 8, (widthSrc + 7) / 8); break; @@ -287,12 +287,12 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); if(xSrc & 1) FIXME("This won't work...\n"); bitmap_size = heightSrc * ((widthSrc + 1) / 2); dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes, dst_ptr += ((widthSrc + 1) / 2)) + for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += ((widthSrc + 1) / 2)) memcpy(dst_ptr, src_ptr + xSrc/2, (widthSrc+1)/2); break; @@ -302,10 +302,10 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w PSDRV_WriteImageHeader(physDev, info, xDst, yDst, widthDst, heightDst, widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes, dst_ptr += widthSrc) + for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += widthSrc) memcpy(dst_ptr, src_ptr + xSrc, widthSrc); break; @@ -318,11 +318,11 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes) { + for(line = 0; line < heightSrc; line++, src_ptr += stride) { const WORD *words = (const WORD *)src_ptr + xSrc; int i; for(i = 0; i < widthSrc; i++) { @@ -350,10 +350,10 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes) { + for(line = 0; line < heightSrc; line++, src_ptr += stride) { const BYTE *byte = src_ptr + xSrc * 3; int i; for(i = 0; i < widthSrc; i++) { @@ -372,10 +372,10 @@ INT CDECL PSDRV_StretchDIBits( PSDRV_PDEVICE *physDev, INT xDst, INT yDst, INT w widthSrc, heightSrc); src_ptr = bits; - src_ptr += (ySrc * widthbytes); + src_ptr += (ySrc * stride); bitmap_size = heightSrc * widthSrc * 3; dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += widthbytes) { + for(line = 0; line < heightSrc; line++, src_ptr += stride) { const BYTE *byte = src_ptr + xSrc * 4; int i; for(i = 0; i < widthSrc; i++) {

1 0

Maarten Lankhorst : include: Fix timer APC callback definition.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 6e0e0dc605d93d709947ced745a8187d9dcf2bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e0e0dc605d93d709947ced74… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 18 12:11:36 2009 +0100 include: Fix timer APC callback definition. --- include/winternl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index fe77359..d38f49c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1782,7 +1782,7 @@ typedef struct _KEY_MULTIPLE_VALUE_INFORMATION typedef VOID (CALLBACK *PRTL_OVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPVOID); -typedef VOID (*PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG ); +typedef VOID (CALLBACK *PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG ); typedef enum _EVENT_TYPE { NotificationEvent,

1 0

Roderick Colenbrander : wgl: Add support for WGL_ARB_create_context_profile which is required for OpenGL 3 .2.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 9a8542638989c6ced3393e8a225810eff59a26da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8542638989c6ced3393e8a2… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Nov 17 11:50:25 2009 +0100 wgl: Add support for WGL_ARB_create_context_profile which is required for OpenGL 3.2. --- dlls/winex11.drv/opengl.c | 7 +++++++ include/wine/wgl.h | 9 +++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index de56bd9..19e3fe3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2249,6 +2249,10 @@ HGLRC X11DRV_wglCreateContextAttribsARB(X11DRV_PDEVICE *physDev, HGLRC hShareCon pContextAttribList[0] = GLX_CONTEXT_FLAGS_ARB; pContextAttribList[1] = pAttribList[1]; break; + case WGL_CONTEXT_PROFILE_MASK_ARB: + pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; + pContextAttribList[1] = pAttribList[1]; + break; default: ERR("Unhandled attribList pair: %#x %#x\n", pAttribList[0], pAttribList[1]); } @@ -3540,6 +3544,9 @@ static void X11DRV_WineGL_LoadExtensions(void) if(glxRequireExtension("GLX_ARB_create_context")) { register_extension(&WGL_ARB_create_context); + + if(glxRequireExtension("GLX_ARB_create_context_profile")) + register_extension_string("WGL_ARB_create_context_profile"); } if(glxRequireExtension("GLX_ARB_fbconfig_float")) diff --git a/include/wine/wgl.h b/include/wine/wgl.h index a102109..7a99de2 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -200,7 +200,11 @@ #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 #define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 #define WGL_CONTEXT_FLAGS_ARB 0x2094 +#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 +#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 #define ERROR_INVALID_VERSION_ARB 0x2095 +#define ERROR_INVALID_PROFILE_ARB 0x2096 #ifndef GLX_ARB_create_context #define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 @@ -208,6 +212,11 @@ #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 #define GLX_CONTEXT_FLAGS_ARB 0x2094 #endif +#ifndef GLX_ARB_create_context_profile +#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 +#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 +#endif /** * WGL_ATI_pixel_format_float / WGL_ARB_color_buffer_float

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009