wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Nikolay Sivov : comdlg32: Simplify some internal helpers.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 489707f9e3f3a690ac957a384b6b2737fb92bfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=489707f9e3f3a690ac957a384… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 09:38:09 2013 +0400 comdlg32: Simplify some internal helpers. --- dlls/comdlg32/colordlg.c | 187 +++++++++++++++++++++++---------------------- 1 files changed, 96 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=489707f9e3f3a690ac957…

1 0

Nikolay Sivov : comdlg32: Pass full colorref to RGB -> HSL conversion function.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 1616eb6fcabdde0429819df24e13cad3a236d45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1616eb6fcabdde0429819df24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 09:03:22 2013 +0400 comdlg32: Pass full colorref to RGB -> HSL conversion function. --- dlls/comdlg32/colordlg.c | 67 ++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 35 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 1c52529..8b5d8fb 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -143,10 +143,14 @@ static COLORREF CC_HSLtoRGB(int hue, int sat, int lum) /*********************************************************************** * CC_RGBtoHSL [internal] */ -static int CC_RGBtoHSL(char c, int r, int g, int b) +static int CC_RGBtoHSL(char c, COLORREF rgb) { WORD maxi, mini, mmsum, mmdif, result = 0; - int iresult = 0; + int iresult = 0, r, g, b; + + r = GetRValue(rgb); + g = GetGValue(rgb); + b = GetBValue(rgb); maxi = max(r, b); maxi = max(maxi, g); @@ -682,23 +686,24 @@ static void CC_EditSetRGB( HWND hDlg, COLORREF cr ) /*********************************************************************** * CC_EditSetHSL [internal] */ -static void CC_EditSetHSL( HWND hDlg, int h, int s, int l ) +static void CC_EditSetHSL( HWND hDlg ) { - char buffer[10]; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); + CCPRIV *lpp = GetPropW( hDlg, szColourDialogProp ); if (IsWindowVisible( GetDlgItem(hDlg, IDC_COLOR_GRAPH) )) /* if full size */ { + char buffer[10]; + lpp->updating = TRUE; - sprintf(buffer, "%d", h); + sprintf(buffer, "%d", lpp->h); SetWindowTextA( GetDlgItem(hDlg, IDC_COLOR_EDIT_H), buffer); - sprintf(buffer, "%d", s); + sprintf(buffer, "%d", lpp->s); SetWindowTextA( GetDlgItem(hDlg, IDC_COLOR_EDIT_S), buffer); - sprintf(buffer, "%d", l); + sprintf(buffer, "%d", lpp->l); SetWindowTextA( GetDlgItem(hDlg, IDC_COLOR_EDIT_L), buffer); lpp->updating = FALSE; } - CC_PaintLumBar(hDlg, h, s); + CC_PaintLumBar(hDlg, lpp->h, lpp->s); } /*********************************************************************** @@ -707,7 +712,6 @@ static void CC_EditSetHSL( HWND hDlg, int h, int s, int l ) static void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect ) { int i; - LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); EnableWindow( GetDlgItem(hDlg, IDC_COLOR_DEFINE), FALSE); CC_PrepareColorGraph(hDlg); @@ -727,7 +731,7 @@ static void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect ) ShowWindow( GetDlgItem(hDlg, IDC_COLOR_RESULT), SW_SHOW); CC_EditSetRGB(hDlg, result); - CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); + CC_EditSetHSL(hDlg); ShowWindow( GetDlgItem( hDlg, IDC_COLOR_GRAPH), SW_SHOW); UpdateWindow( GetDlgItem(hDlg, IDC_COLOR_GRAPH) ); } @@ -932,9 +936,9 @@ static LRESULT CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) b = GetBValue(lpp->lpcc->rgbResult); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); + lpp->h = CC_RGBtoHSL('H', lpp->lpcc->rgbResult); + lpp->s = CC_RGBtoHSL('S', lpp->lpcc->rgbResult); + lpp->l = CC_RGBtoHSL('L', lpp->lpcc->rgbResult); /* Doing it the long way because CC_EditSetRGB/HSL doesn't seem to work */ SetDlgItemInt(hDlg, IDC_COLOR_EDIT_H, lpp->h, TRUE); @@ -985,10 +989,10 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif { lpp->lpcc->rgbResult = RGB(r, g, b); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); - CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); + lpp->h = CC_RGBtoHSL('H', lpp->lpcc->rgbResult); + lpp->s = CC_RGBtoHSL('S', lpp->lpcc->rgbResult); + lpp->l = CC_RGBtoHSL('L', lpp->lpcc->rgbResult); + CC_EditSetHSL(hDlg); CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); } @@ -1038,13 +1042,10 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif ReleaseDC(hDlg, hdc); CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); - r = GetRValue(lpp->lpcc->rgbResult); - g = GetGValue(lpp->lpcc->rgbResult); - b = GetBValue(lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); - CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); + lpp->h = CC_RGBtoHSL('H', lpp->lpcc->rgbResult); + lpp->s = CC_RGBtoHSL('S', lpp->lpcc->rgbResult); + lpp->l = CC_RGBtoHSL('L', lpp->lpcc->rgbResult); + CC_EditSetHSL(hDlg); CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); break; @@ -1132,7 +1133,7 @@ static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) { lpp->lpcc->rgbResult = CC_HSLtoRGB(lpp->h, lpp->s, lpp->l); CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); - CC_EditSetHSL(hDlg,lpp->h, lpp->s, lpp->l); + CC_EditSetHSL(hDlg); CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); @@ -1153,8 +1154,7 @@ static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) static LRESULT CC_WMLButtonDown( HWND hDlg, LPARAM lParam ) { LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - int r, g, b, i; - i = 0; + int i = 0; if (CC_MouseCheckPredefColorArray(lpp, hDlg, IDC_COLOR_PREDEF, 6, 8, lParam)) i = 1; @@ -1180,17 +1180,14 @@ static LRESULT CC_WMLButtonDown( HWND hDlg, LPARAM lParam ) } if ( i == 1 ) { - r = GetRValue(lpp->lpcc->rgbResult); - g = GetGValue(lpp->lpcc->rgbResult); - b = GetBValue(lpp->lpcc->rgbResult); - lpp->h = CC_RGBtoHSL('H', r, g, b); - lpp->s = CC_RGBtoHSL('S', r, g, b); - lpp->l = CC_RGBtoHSL('L', r, g, b); + lpp->h = CC_RGBtoHSL('H', lpp->lpcc->rgbResult); + lpp->s = CC_RGBtoHSL('S', lpp->lpcc->rgbResult); + lpp->l = CC_RGBtoHSL('L', lpp->lpcc->rgbResult); } if (i) { CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); - CC_EditSetHSL(hDlg,lpp->h, lpp->s, lpp->l); + CC_EditSetHSL(hDlg); CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult);

1 0

Nikolay Sivov : comdlg32: Return combined color from HSL -> RGB transform.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 31351376d110ea59b08bdb708e5d43ca853e296d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31351376d110ea59b08bdb708… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 08:48:28 2013 +0400 comdlg32: Return combined color from HSL -> RGB transform. --- dlls/comdlg32/colordlg.c | 62 ++++++++++++++++++++-------------------------- 1 files changed, 27 insertions(+), 35 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 622dc76..1c52529 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -87,21 +87,10 @@ typedef struct CCPRIVATE HWND hwndFocus; /* handle last focused item */ } CCPRIV, *LPCCPRIV; -/*********************************************************************** - * CC_HSLtoRGB [internal] - */ -static int CC_HSLtoRGB(char c, int hue, int sat, int lum) +static int hsl_to_x(int hue, int sat, int lum) { int res = 0, maxrgb; - /* hue */ - switch(c) - { - case 'R': if (hue > 80) hue -= 80; else hue += 160; break; - case 'G': if (hue > 160) hue -= 160; else hue += 80; break; - case 'B': break; - } - /* l below 120 */ maxrgb = (256 * min(120,lum)) / 120; /* 0 .. 256 */ if (hue < 80) @@ -133,6 +122,25 @@ static int CC_HSLtoRGB(char c, int hue, int sat, int lum) } /*********************************************************************** + * CC_HSLtoRGB [internal] + */ +static COLORREF CC_HSLtoRGB(int hue, int sat, int lum) +{ + int h, r, g, b; + + /* r */ + h = hue > 80 ? hue-80 : hue+160; + r = hsl_to_x(h, sat, lum); + /* g */ + h = hue > 160 ? hue-160 : hue+80; + g = hsl_to_x(h, sat, lum); + /* b */ + b = hsl_to_x(hue, sat, lum); + + return RGB(r, g, b); +} + +/*********************************************************************** * CC_RGBtoHSL [internal] */ static int CC_RGBtoHSL(char c, int r, int g, int b) @@ -555,7 +563,7 @@ static void CC_PaintCross( HWND hDlg, int x, int y) */ static void CC_PrepareColorGraph( HWND hDlg ) { - int sdif, hdif, xdif, ydif, r, g, b, hue, sat; + int sdif, hdif, xdif, ydif, hue, sat; HWND hwnd = GetDlgItem(hDlg, IDC_COLOR_GRAPH); LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); HBRUSH hbrush; @@ -580,10 +588,7 @@ static void CC_PrepareColorGraph( HWND hDlg ) for(sat = 0; sat < 240 + sdif; sat += sdif) { rect.top = rect.bottom - ydif; - r = CC_HSLtoRGB('R', hue, sat, 120); - g = CC_HSLtoRGB('G', hue, sat, 120); - b = CC_HSLtoRGB('B', hue, sat, 120); - hbrush = CreateSolidBrush( RGB(r, g, b)); + hbrush = CreateSolidBrush(CC_HSLtoRGB(hue, sat, 120)); FillRect(lpp->hdcMem, &rect, hbrush); DeleteObject(hbrush); rect.bottom = rect.top; @@ -625,7 +630,7 @@ static void CC_PaintLumBar( HWND hDlg, int hue, int sat ) { HWND hwnd = GetDlgItem(hDlg, IDC_COLOR_LUMBAR); RECT rect, client; - int lum, ldif, ydif, r, g, b; + int lum, ldif, ydif; HBRUSH hbrush; HDC hDC; @@ -640,10 +645,7 @@ static void CC_PaintLumBar( HWND hDlg, int hue, int sat ) for (lum = 0; lum < 240 + ldif; lum += ldif) { rect.top = max(0, rect.bottom - ydif); - r = CC_HSLtoRGB('R', hue, sat, lum); - g = CC_HSLtoRGB('G', hue, sat, lum); - b = CC_HSLtoRGB('B', hue, sat, lum); - hbrush = CreateSolidBrush( RGB(r, g, b) ); + hbrush = CreateSolidBrush(CC_HSLtoRGB(hue, sat, lum)); FillRect(hDC, &rect, hbrush); DeleteObject(hbrush); rect.bottom = rect.top; @@ -1008,10 +1010,7 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif } if (xx) /* something has changed */ { - r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l); - g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l); - b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l); - lpp->lpcc->rgbResult = RGB(r, g, b); + lpp->lpcc->rgbResult = CC_HSLtoRGB(lpp->h, lpp->s, lpp->l); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); CC_PaintCross(hDlg, lpp->h, lpp->s); @@ -1120,7 +1119,6 @@ static LRESULT CC_WMLButtonUp( HWND hDlg ) static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) { LPCCPRIV lpp = GetPropW( hDlg, szColourDialogProp ); - int r, g, b; if (lpp->capturedGraph) { @@ -1132,10 +1130,7 @@ static LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ) } if (CC_MouseCheckColorGraph( hDlg, lpp->capturedGraph, ptrh, ptrs, lParam)) { - r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l); - g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l); - b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l); - lpp->lpcc->rgbResult = RGB(r, g, b); + lpp->lpcc->rgbResult = CC_HSLtoRGB(lpp->h, lpp->s, lpp->l); CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); CC_EditSetHSL(hDlg,lpp->h, lpp->s, lpp->l); CC_PaintCross(hDlg, lpp->h, lpp->s); @@ -1181,10 +1176,7 @@ static LRESULT CC_WMLButtonDown( HWND hDlg, LPARAM lParam ) if ( i == 2 ) { SetCapture(hDlg); - r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l); - g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l); - b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l); - lpp->lpcc->rgbResult = RGB(r, g, b); + lpp->lpcc->rgbResult = CC_HSLtoRGB(lpp->h, lpp->s, lpp->l); } if ( i == 1 ) {

1 0

Nikolay Sivov : comdlg32: Add controls codes defines for color choosing dialog.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: adbb96fb5cc95bc87602d99ae90440521ceeb7d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adbb96fb5cc95bc87602d99ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 13 08:24:29 2013 +0400 comdlg32: Add controls codes defines for color choosing dialog. --- dlls/comdlg32/cdlg.h | 22 +++++++ dlls/comdlg32/colordlg.c | 143 ++++++++++++++++++++++----------------------- dlls/comdlg32/comdlg32.rc | 40 ++++++------ 3 files changed, 112 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adbb96fb5cc95bc87602d…

1 0

André Hentschel : d3drm/tests: Add more face tests.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 0867e377681de28fd52e3a7b70f97da44669c98b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0867e377681de28fd52e3a7b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 12 23:55:47 2013 +0200 d3drm/tests: Add more face tests. --- dlls/d3drm/tests/d3drm.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index db9d623..f82af5f 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -677,6 +677,8 @@ static void test_Face(void) IDirect3DRMFace *face1; IDirect3DRMFace2 *face2; IDirect3DRMFaceArray *array1; + D3DRMLOADMEMORY info; + D3DVECTOR v1[4], n1[4], v2[4], n2[4]; DWORD count; CHAR cname[64] = {0}; int icount; @@ -812,6 +814,88 @@ static void test_Face(void) icount = IDirect3DRMFace2_GetVertexCount(face2); ok(!icount, "wrong VertexCount: %i\n", icount); + info.lpMemory = data_ok; + info.dSize = strlen(data_ok); + hr = IDirect3DRMMeshBuilder3_Load(MeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder3_GetVertexCount(MeshBuilder3); + ok(icount == 4, "Wrong number of vertices %d (must be 4)\n", icount); + + icount = IDirect3DRMMeshBuilder3_GetNormalCount(MeshBuilder3); + ok(icount == 4, "Wrong number of normals %d (must be 4)\n", icount); + + icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3); + todo_wine + ok(icount == 4, "Wrong number of faces %d (must be 4)\n", icount); + + count = 4; + hr = IDirect3DRMMeshBuilder3_GetVertices(MeshBuilder3, 0, &count, v1); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(count == 4, "Wrong number of vertices %d (must be 4)\n", count); + + hr = IDirect3DRMMeshBuilder3_GetNormals(MeshBuilder3, 0, &count, n1); + ok(hr == D3DRM_OK, "Cannot get normals information (hr = %x)\n", hr); + ok(count == 4, "Wrong number of normals %d (must be 4)\n", count); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1); + todo_wine + ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr); + todo_wine + ok(array1 != NULL, "pArray = %p\n", array1); + if (array1) + { + IDirect3DRMFace *face; + count = IDirect3DRMFaceArray_GetSize(array1); + ok(count == 4, "count = %u\n", count); + hr = IDirect3DRMFaceArray_GetElement(array1, 1, &face); + ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); + IDirect3DRMFace_GetVertices(face, &count, v2, n2); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count); + ok(U1(v2[0]).x == U1(v1[0]).x, "Wrong component v2[0].x = %f (expected %f)\n", + U1(v2[0]).x, U1(v1[0]).x); + ok(U1(v2[0]).y == U1(v1[0]).y, "Wrong component v2[0].y = %f (expected %f)\n", + U1(v2[0]).y, U1(v1[0]).y); + ok(U1(v2[0]).z == U1(v1[0]).z, "Wrong component v2[0].z = %f (expected %f)\n", + U1(v2[0]).z, U1(v1[0]).z); + ok(U1(v2[1]).x == U1(v1[1]).x, "Wrong component v2[1].x = %f (expected %f)\n", + U1(v2[1]).x, U1(v1[1]).x); + ok(U1(v2[1]).y == U1(v1[1]).y, "Wrong component v2[1].y = %f (expected %f)\n", + U1(v2[1]).y, U1(v1[1]).y); + ok(U1(v2[1]).z == U1(v1[1]).z, "Wrong component v2[1].z = %f (expected %f)\n", + U1(v2[1]).z, U1(v1[1]).z); + ok(U1(v2[2]).x == U1(v1[2]).x, "Wrong component v2[2].x = %f (expected %f)\n", + U1(v2[2]).x, U1(v1[2]).x); + ok(U1(v2[2]).y == U1(v1[2]).y, "Wrong component v2[2].y = %f (expected %f)\n", + U1(v2[2]).y, U1(v1[2]).y); + ok(U1(v2[2]).z == U1(v1[2]).z, "Wrong component v2[2].z = %f (expected %f)\n", + U1(v2[2]).z, U1(v1[2]).z); + + ok(U1(n2[0]).x == U1(n1[0]).x, "Wrong component n2[0].x = %f (expected %f)\n", + U1(n2[0]).x, U1(n1[0]).x); + ok(U1(n2[0]).y == U1(n1[0]).y, "Wrong component n2[0].y = %f (expected %f)\n", + U1(n2[0]).y, U1(n1[0]).y); + ok(U1(n2[0]).z == U1(n1[0]).z, "Wrong component n2[0].z = %f (expected %f)\n", + U1(n2[0]).z, U1(n1[0]).z); + ok(U1(n2[1]).x == U1(n1[1]).x, "Wrong component n2[1].x = %f (expected %f)\n", + U1(n2[1]).x, U1(n1[1]).x); + ok(U1(n2[1]).y == U1(n1[1]).y, "Wrong component n2[1].y = %f (expected %f)\n", + U1(n2[1]).y, U1(n1[1]).y); + ok(U1(n2[1]).z == U1(n1[1]).z, "Wrong component n2[1].z = %f (expected %f)\n", + U1(n2[1]).z, U1(n1[1]).z); + ok(U1(n2[2]).x == U1(n1[2]).x, "Wrong component n2[2].x = %f (expected %f)\n", + U1(n2[2]).x, U1(n1[2]).x); + ok(U1(n2[2]).y == U1(n1[2]).y, "Wrong component n2[2].y = %f (expected %f)\n", + U1(n2[2]).y, U1(n1[2]).y); + ok(U1(n2[2]).z == U1(n1[2]).z, "Wrong component n2[2].z = %f (expected %f)\n", + U1(n2[2]).z, U1(n1[2]).z); + + IDirect3DRMFace_Release(face); + IDirect3DRMFaceArray_Release(array1); + } + IDirect3DRMFace2_Release(face2); IDirect3DRMMeshBuilder3_Release(MeshBuilder3); IDirect3DRM3_Release(d3drm3);

1 0

André Hentschel : d3drm: Implement IDirect3DRMMeshBuilder3_GetNormals.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 60aaed781c0c7dc5ce39aaf846bc1c3bb7d5e8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60aaed781c0c7dc5ce39aaf84… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 12 23:54:04 2013 +0200 d3drm: Implement IDirect3DRMMeshBuilder3_GetNormals. --- dlls/d3drm/meshbuilder.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 549a5dd..eecf629 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2379,13 +2379,19 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetNormals(IDirect3DRMMeshBuil } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetNormals(IDirect3DRMMeshBuilder3 *iface, - DWORD IndexFirst, DWORD *count, D3DVECTOR *vector) + DWORD IndexFirst, DWORD *ncount, D3DVECTOR *normals) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + DWORD count = This->nb_normals - IndexFirst; - FIXME("(%p)->(%u,%p,%p): stub\n", This, IndexFirst, count, vector); + TRACE("(%p)->(%u,%p,%p)\n", This, IndexFirst, ncount, normals); - return E_NOTIMPL; + if (ncount) + *ncount = count; + if (normals && This->nb_normals) + memcpy(normals, This->pNormals + IndexFirst, count * sizeof(D3DVECTOR)); + + return D3DRM_OK; } static int WINAPI IDirect3DRMMeshBuilder3Impl_GetNormalCount(IDirect3DRMMeshBuilder3* iface)

1 0

André Hentschel : d3drm: Implement IDirect3DRMMeshBuilder3_GetNormalCount.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: edacd0772e6c57f637477def8d3bd6800b752991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edacd0772e6c57f637477def8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 12 23:53:40 2013 +0200 d3drm: Implement IDirect3DRMMeshBuilder3_GetNormalCount. --- dlls/d3drm/meshbuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 07dc3fd..549a5dd 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2392,9 +2392,9 @@ static int WINAPI IDirect3DRMMeshBuilder3Impl_GetNormalCount(IDirect3DRMMeshBuil { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)->()\n", This); - return E_NOTIMPL; + return This->nb_normals; } static const struct IDirect3DRMMeshBuilder3Vtbl Direct3DRMMeshBuilder3_Vtbl =

1 0

Dmitry Timoshkov : server: Set appropriate status for a terminated thread.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: fd76b695b911ec0be12ba2a67c85f0d97174c56f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd76b695b911ec0be12ba2a67… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 13 16:43:58 2013 +0900 server: Set appropriate status for a terminated thread. --- server/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/thread.c b/server/thread.c index 18c1e08..5f9738d 100644 --- a/server/thread.c +++ b/server/thread.c @@ -481,7 +481,7 @@ static void set_thread_info( struct thread *thread, if ((req->affinity & thread->process->affinity) != req->affinity) set_error( STATUS_INVALID_PARAMETER ); else if (thread->state == TERMINATED) - set_error( STATUS_ACCESS_DENIED ); + set_error( STATUS_THREAD_IS_TERMINATING ); else if (set_thread_affinity( thread, req->affinity )) file_set_error(); }

1 0

Nikolay Sivov : comctl32: Remove unused defines.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 2e0ff5b780c9ff3bb3e62581003e66921bb829eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e0ff5b780c9ff3bb3e625810… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 12 22:28:36 2013 +0400 comctl32: Remove unused defines. --- dlls/comctl32/comctl32.h | 20 -------------------- dlls/comctl32/rebar.c | 3 +++ 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 129ab0c..b9b0574 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -38,9 +38,6 @@ extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; -/* has a value of: 0, CCS_TOP, CCS_NOMOVEY, CCS_BOTTOM */ -#define CCS_LAYOUT_MASK 0x3 - /* Property sheet / Wizard */ #define IDD_PROPSHEET 1006 #define IDD_WIZARD 1020 @@ -76,23 +73,6 @@ extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; #define IDB_HIST_SMALL 130 #define IDB_HIST_LARGE 131 - -/* Month calendar month menu popup */ -#define IDD_MCMONTHMENU 300 - -#define IDM_JAN 301 -#define IDM_FEB 302 -#define IDM_MAR 303 -#define IDM_APR 304 -#define IDM_MAY 305 -#define IDM_JUN 306 -#define IDM_JUL 307 -#define IDM_AUG 308 -#define IDM_SEP 309 -#define IDM_OCT 310 -#define IDM_NOV 311 -#define IDM_DEC 312 - #define IDM_TODAY 4163 #define IDM_GOTODAY 4164 diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 4e26c33..fa21baa 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -138,6 +138,9 @@ typedef struct HWND hwndPrevParent; } REBAR_BAND; +/* has a value of: 0, CCS_TOP, CCS_NOMOVEY, CCS_BOTTOM */ +#define CCS_LAYOUT_MASK 0x3 + /* fStatus flags */ #define HAS_GRIPPER 0x00000001 #define HAS_IMAGE 0x00000002

1 0

Nikolay Sivov : comctl32: Fix tics rectangle width/height.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: eaad1cdea8f4d265ae1d8e99e68feb9b3709356a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaad1cdea8f4d265ae1d8e99e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 12 17:27:47 2013 +0400 comctl32: Fix tics rectangle width/height. --- dlls/comctl32/trackbar.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index da11843..50c44d5 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -499,12 +499,12 @@ TRACKBAR_DrawOneTic (const TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, int fla offsetthumb = (infoPtr->rcThumb.bottom - infoPtr->rcThumb.top)/2; rcTics.left = infoPtr->rcThumb.left - 2; rcTics.right = infoPtr->rcThumb.right + 2; - rcTics.top = infoPtr->rcChannel.top + offsetthumb + 1; - rcTics.bottom = infoPtr->rcChannel.bottom - offsetthumb; + rcTics.top = infoPtr->rcChannel.top + offsetthumb; + rcTics.bottom = infoPtr->rcChannel.bottom - offsetthumb - 1; } else { offsetthumb = (infoPtr->rcThumb.right - infoPtr->rcThumb.left)/2; - rcTics.left = infoPtr->rcChannel.left + offsetthumb + 1; - rcTics.right = infoPtr->rcChannel.right - offsetthumb; + rcTics.left = infoPtr->rcChannel.left + offsetthumb; + rcTics.right = infoPtr->rcChannel.right - offsetthumb - 1; rcTics.top = infoPtr->rcThumb.top - 2; rcTics.bottom = infoPtr->rcThumb.bottom + 2; }

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
50
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 May 2013