wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Zhenbo Li : wineps.drv: Constify a few pointers.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: c3bb460d686ea653acf78a586bdbbbb16cbe506b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3bb460d686ea653acf78a586… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun Dec 29 13:31:33 2013 +0800 wineps.drv: Constify a few pointers. --- dlls/wineps.drv/type1.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c index 316bece..58fe11f 100644 --- a/dlls/wineps.drv/type1.c +++ b/dlls/wineps.drv/type1.c @@ -63,11 +63,11 @@ enum t1_cmds { (DWORD)_x1 ) #ifdef WORDS_BIGENDIAN -static inline WORD get_be_word(const void *p) { return *(WORD*)p; } -static inline DWORD get_be_dword(const void *p) { return *(DWORD*)p; } +static inline WORD get_be_word(const void *p) { return *(const WORD*)p; } +static inline DWORD get_be_dword(const void *p) { return *(const DWORD*)p; } #else -static inline WORD get_be_word(const void *p) { return RtlUshortByteSwap(*(WORD*)p); } -static inline DWORD get_be_dword(const void *p) { return RtlUlongByteSwap(*(DWORD*)p); } +static inline WORD get_be_word(const void *p) { return RtlUshortByteSwap(*(const WORD*)p); } +static inline DWORD get_be_dword(const void *p) { return RtlUlongByteSwap(*(const DWORD*)p); } #endif TYPE1 *T1_download_header(PHYSDEV dev, char *ps_name, RECT *bbox, UINT emsize) @@ -442,8 +442,8 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli } else { - arg1 = *(char*)ptr++; - arg2 = *(char*)ptr++; + arg1 = *(const char*)ptr++; + arg2 = *(const char*)ptr++; } if(flags & WE_HAVE_A_SCALE) {

1 0

Zhenbo Li : kernel32/tests: Add one more test for FindFirstFileA.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 767c09f16f1e02912a21fbe3863a24380b08a07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=767c09f16f1e02912a21fbe38… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Tue Dec 31 13:05:41 2013 +0800 kernel32/tests: Add one more test for FindFirstFileA. --- dlls/kernel32/tests/file.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3ac4be8..7101e7b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2430,6 +2430,14 @@ static void test_FindFirstFileA(void) ok ( err == ERROR_PATH_NOT_FOUND, "Bad Error number %d\n", err ); } + /* try FindFirstFileA without trailing backslash */ + SetLastError( 0xdeadbeaf ); + strcpy(buffer2, nonexistent); + handle = FindFirstFileA(buffer2, &data); + err = GetLastError(); + ok ( handle == INVALID_HANDLE_VALUE, "FindFirstFile on %s should Fail\n", buffer2 ); + ok ( err == ERROR_FILE_NOT_FOUND, "Bad Error number %d\n", err ); + /* try FindFirstFileA on "C:\foo\bar.txt" */ SetLastError( 0xdeadbeaf ); strcpy(buffer2, nonexistent);

1 0

Michael Müller : quartz: Return increasing monitor GUID on VMR7 monitor enumeration.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 6e373aa6956c8bc267c0051cb04f6a34574cca5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e373aa6956c8bc267c0051cb… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Dec 31 03:23:19 2013 +0100 quartz: Return increasing monitor GUID on VMR7 monitor enumeration. --- dlls/quartz/vmr9.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 31f3f8e..53e4942 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1314,7 +1314,14 @@ static BOOL CALLBACK get_available_monitors_proc(HMONITOR hmon, HDC hdc, LPRECT VMRMONITORINFO *info = args->info7++; memset(info, 0, sizeof(*info)); - info->guid.pGUID = NULL; /* FIXME */ + if (args->numdev > 0) + { + info->guid.pGUID = &info->guid.GUID; + info->guid.GUID.Data4[7] = args->numdev; + } + else + info->guid.pGUID = NULL; + CopyRect(&info->rcMonitor, &mi.rcMonitor); info->hMon = hmon; info->dwFlags = mi.dwFlags;

1 0

Stefan Dösinger : d3dx9_36/tests: Use NAN.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 95317c33a969cb41c6dc5ecc68c0a8712662dc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95317c33a969cb41c6dc5ecc6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:53 2014 +0100 d3dx9_36/tests: Use NAN. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 3a876e5..21c3b41 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -4800,7 +4800,7 @@ static void test_create_skin_info(void) exp_vertices[0] = 0; exp_vertices[1] = 0x87654321; exp_weights[0] = 0.5; - exp_weights[1] = 0.0f / 0.0f; /* NAN */ + exp_weights[1] = NAN; num_influences = 2; hr = skininfo->lpVtbl->SetBoneInfluence(skininfo, 1, num_influences, vertices, weights);

1 0

Stefan Dösinger : d3dx9_36/tests: Fix calling convention specification.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 9e3ef4abc63e967e01a5c5aed32b5334ed30840f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3ef4abc63e967e01a5c5aed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:52 2014 +0100 d3dx9_36/tests: Fix calling convention specification. Msvc wants __stdcall after the type, otherwise it generates an error. --- dlls/d3dx9_36/tests/mesh.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index c700e43..3a876e5 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1785,7 +1785,7 @@ static char *strdupA(const char *p) return ret; } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHierarchy *iface, LPD3DXFRAME frame) +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHierarchy *iface, LPD3DXFRAME frame) { TRACECALLBACK("ID3DXAllocateHierarchyImpl_DestroyFrame(%p, %p)\n", iface, frame); if (frame) { @@ -1795,7 +1795,7 @@ static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyFrame(ID3DXAllocateHie return D3D_OK; } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateFrame(ID3DXAllocateHierarchy *iface, +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_CreateFrame(ID3DXAllocateHierarchy *iface, const char *name, D3DXFRAME **new_frame) { D3DXFRAME *frame; @@ -1850,13 +1850,13 @@ static HRESULT destroy_mesh_container(LPD3DXMESHCONTAINER mesh_container) return D3D_OK; } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_DestroyMeshContainer(ID3DXAllocateHierarchy *iface, LPD3DXMESHCONTAINER mesh_container) +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_DestroyMeshContainer(ID3DXAllocateHierarchy *iface, LPD3DXMESHCONTAINER mesh_container) { TRACECALLBACK("ID3DXAllocateHierarchyImpl_DestroyMeshContainer(%p, %p)\n", iface, mesh_container); return destroy_mesh_container(mesh_container); } -static CALLBACK HRESULT ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllocateHierarchy *iface, +static HRESULT CALLBACK ID3DXAllocateHierarchyImpl_CreateMeshContainer(ID3DXAllocateHierarchy *iface, const char *name, const D3DXMESHDATA *mesh_data, const D3DXMATERIAL *materials, const D3DXEFFECTINSTANCE *effects, DWORD num_materials, const DWORD *adjacency, ID3DXSkinInfo *skin_info, D3DXMESHCONTAINER **new_mesh_container)

1 0

Stefan Dösinger : d3dx9_36: Add explicit casts in type conversion functions.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: aa2baf8c58054a19440a7a8472004a199f85045e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2baf8c58054a19440a7a847… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:51 2014 +0100 d3dx9_36: Add explicit casts in type conversion functions. --- dlls/d3dx9_36/util.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index c180d71..ea75dfa 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -308,7 +308,7 @@ static INT get_int(D3DXPARAMETER_TYPE type, const void *data) switch (type) { case D3DXPT_FLOAT: - return *(FLOAT *)data; + return (INT)(*(FLOAT *)data); case D3DXPT_INT: case D3DXPT_VOID: @@ -332,10 +332,10 @@ static FLOAT get_float(D3DXPARAMETER_TYPE type, const void *data) return *(FLOAT *)data; case D3DXPT_INT: - return *(INT *)data; + return (FLOAT)(*(INT *)data); case D3DXPT_BOOL: - return get_bool(type, data); + return (FLOAT)get_bool(type, data); default: FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type));

1 0

Stefan Dösinger : d3dx9_36: Floatify some constants.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 6bc4ebd51691e03d36c4b3a32389f9e1b3c3636c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc4ebd51691e03d36c4b3a32… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:50 2014 +0100 d3dx9_36: Floatify some constants. --- dlls/d3dx9_36/math.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index bcda6cc..a5dbee1 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -162,7 +162,7 @@ D3DXMATRIX * WINAPI D3DXMatrixAffineTransformation2D(D3DXMATRIX *out, FLOAT scal s = sinf(rotation / 2.0f); tmp1 = 1.0f - 2.0f * s * s; - tmp2 = 2.0 * s * cosf(rotation / 2.0f); + tmp2 = 2.0f * s * cosf(rotation / 2.0f); D3DXMatrixIdentity(out); out->u.m[0][0] = scaling * tmp1; @@ -2423,7 +2423,7 @@ FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, const D3DXVECTOR3 *dir out[31] = sqrtf(165.0f / D3DX_PI) / 16.0f * dir->x * (14.0f * dirzz - 21.0f * dirzzzz - 1.0f); out[32] = sqrtf(1155.0f / D3DX_PI) / 8.0f * dir->z * (dirxx - diryy) * (3.0f * dirzz - 1.0f); out[33] = sqrtf(770.0f / D3DX_PI) / 32.0f * dir->x * (dirxx - 3.0f * diryy) * (1.0f - 9.0f * dirzz); - out[34] = 3.0f / 16.0f * sqrtf(385.0f / D3DX_PI) * dir->z * (dirxxxx - 6.0 * dirxyxy + diryyyy); + out[34] = 3.0f / 16.0f * sqrtf(385.0f / D3DX_PI) * dir->z * (dirxxxx - 6.0f * dirxyxy + diryyyy); out[35] = -3.0f/ 32.0f * sqrtf(154.0f / D3DX_PI) * dir->x * (dirxxxx - 10.0f * dirxyxy + 5.0f * diryyyy); return out; @@ -2629,8 +2629,8 @@ FLOAT * WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b) t = a[4] * b[5] + a[5] * b[4]; out[7] += 0.15607834f * t; - ta = 0.28209479f * a[0] + 0.09011186 * a[6] - 0.15607835f * a[8]; - tb = 0.28209479f * b[0] + 0.09011186 * b[6] - 0.15607835f * b[8]; + ta = 0.28209479f * a[0] + 0.09011186f * a[6] - 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011186f * b[6] - 0.15607835f * b[8]; out[5] += ta * b[5] + tb * a[5]; t = a[5] * b[5]; out[0] += 0.28209479f * t; @@ -2644,8 +2644,8 @@ FLOAT * WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b) out[0] += 0.28209480f * t; out[6] += 0.18022376f * t; - ta = 0.28209479f * a[0] + 0.09011186 * a[6] + 0.15607835f * a[8]; - tb = 0.28209479f * b[0] + 0.09011186 * b[6] + 0.15607835f * b[8]; + ta = 0.28209479f * a[0] + 0.09011186f * a[6] + 0.15607835f * a[8]; + tb = 0.28209479f * b[0] + 0.09011186f * b[6] + 0.15607835f * b[8]; out[7] += ta * b[7] + tb * a[7]; t = a[7] * b[7]; out[0] += 0.28209479f * t; @@ -2988,7 +2988,7 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in) out[25] = a * 0.7015607357f * in[30] - a * 0.6846531630f * in[32] + a * 0.1976423711f * in[34]; out[26] = -0.5f * in[26] + 0.8660253882f * in[28]; - out[27] = a * 0.5229125023f * in[30] + a * 0.3061861992f * in[32] - a * 0.7954951525 * in[34]; + out[27] = a * 0.5229125023f * in[30] + a * 0.3061861992f * in[32] - a * 0.7954951525f * in[34]; out[28] = 0.8660253882f * in[26] + 0.5f * in[28]; out[29] = a * 0.4841229022f * in[30] + a * 0.6614378691f * in[32] + a * 0.5728219748f * in[34]; out[30] = -a * 0.7015607357f * in[25] - a * 0.5229125023f * in[27] - a * 0.4841229022f * in[29];

1 0

Stefan Dösinger : d3dx9_36: Use float math functions.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: f06fc7f85817e502e184871382854f5e286145a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f06fc7f85817e502e18487138… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 2 15:23:49 2014 +0100 d3dx9_36: Use float math functions. --- dlls/d3dx9_36/math.c | 44 ++++++++++++++++++++++---------------------- dlls/d3dx9_36/mesh.c | 18 +++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index b33e062..bcda6cc 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -487,8 +487,8 @@ D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovLH(D3DXMATRIX *pout, FLOAT fovy, FLOA TRACE("pout %p, fovy %f, aspect %f, zn %f, zf %f\n", pout, fovy, aspect, zn, zf); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = 1.0f / (aspect * tan(fovy/2.0f)); - pout->u.m[1][1] = 1.0f / tan(fovy/2.0f); + pout->u.m[0][0] = 1.0f / (aspect * tanf(fovy/2.0f)); + pout->u.m[1][1] = 1.0f / tanf(fovy/2.0f); pout->u.m[2][2] = zf / (zf - zn); pout->u.m[2][3] = 1.0f; pout->u.m[3][2] = (zf * zn) / (zn - zf); @@ -501,8 +501,8 @@ D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovRH(D3DXMATRIX *pout, FLOAT fovy, FLOA TRACE("pout %p, fovy %f, aspect %f, zn %f, zf %f\n", pout, fovy, aspect, zn, zf); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = 1.0f / (aspect * tan(fovy/2.0f)); - pout->u.m[1][1] = 1.0f / tan(fovy/2.0f); + pout->u.m[0][0] = 1.0f / (aspect * tanf(fovy/2.0f)); + pout->u.m[1][1] = 1.0f / tanf(fovy/2.0f); pout->u.m[2][2] = zf / (zn - zf); pout->u.m[2][3] = -1.0f; pout->u.m[3][2] = (zf * zn) / (zn - zf); @@ -647,10 +647,10 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationX(D3DXMATRIX *pout, FLOAT angle) TRACE("pout %p, angle %f\n", pout, angle); D3DXMatrixIdentity(pout); - pout->u.m[1][1] = cos(angle); - pout->u.m[2][2] = cos(angle); - pout->u.m[1][2] = sin(angle); - pout->u.m[2][1] = -sin(angle); + pout->u.m[1][1] = cosf(angle); + pout->u.m[2][2] = cosf(angle); + pout->u.m[1][2] = sinf(angle); + pout->u.m[2][1] = -sinf(angle); return pout; } @@ -659,10 +659,10 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationY(D3DXMATRIX *pout, FLOAT angle) TRACE("pout %p, angle %f\n", pout, angle); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = cos(angle); - pout->u.m[2][2] = cos(angle); - pout->u.m[0][2] = -sin(angle); - pout->u.m[2][0] = sin(angle); + pout->u.m[0][0] = cosf(angle); + pout->u.m[2][2] = cosf(angle); + pout->u.m[0][2] = -sinf(angle); + pout->u.m[2][0] = sinf(angle); return pout; } @@ -704,10 +704,10 @@ D3DXMATRIX* WINAPI D3DXMatrixRotationZ(D3DXMATRIX *pout, FLOAT angle) TRACE("pout %p, angle %f\n", pout, angle); D3DXMatrixIdentity(pout); - pout->u.m[0][0] = cos(angle); - pout->u.m[1][1] = cos(angle); - pout->u.m[0][1] = sin(angle); - pout->u.m[1][0] = -sin(angle); + pout->u.m[0][0] = cosf(angle); + pout->u.m[1][1] = cosf(angle); + pout->u.m[0][1] = sinf(angle); + pout->u.m[1][0] = -sinf(angle); return pout; } @@ -888,15 +888,15 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(D3DXMATRIX *pout, const D3DXVECTOR trans.z=0.0f; } - rot.w=cos(rotation/2.0f); + rot.w=cosf(rotation/2.0f); rot.x=0.0f; rot.y=0.0f; - rot.z=sin(rotation/2.0f); + rot.z=sinf(rotation/2.0f); - sca_rot.w=cos(scalingrotation/2.0f); + sca_rot.w=cosf(scalingrotation/2.0f); sca_rot.x=0.0f; sca_rot.y=0.0f; - sca_rot.z=sin(scalingrotation/2.0f); + sca_rot.z=sinf(scalingrotation/2.0f); D3DXMatrixTransformation(pout, &sca_center, &sca_rot, &sca, &rot_center, &rot, &trans); @@ -1655,7 +1655,7 @@ void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *pax paxis->x = pq->x; paxis->y = pq->y; paxis->z = pq->z; - *pangle = 2.0f * acos(pq->w); + *pangle = 2.0f * acosf(pq->w); } /*_________________D3DXVec2_____________________*/ @@ -2128,7 +2128,7 @@ D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4* out, UINT outstride, con unsigned short float_32_to_16(const float in) { int exp = 0, origexp; - float tmp = fabs(in); + float tmp = fabsf(in); int sign = (copysignf(1, in) < 0); unsigned int mantissa; unsigned short ret; diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 8180d8e..aa20119 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2404,7 +2404,7 @@ BOOL WINAPI D3DXIntersectTri(const D3DXVECTOR3 *p0, const D3DXVECTOR3 *p1, const { *pu = vec.x; *pv = vec.y; - *pdist = fabs( vec.z ); + *pdist = fabsf( vec.z ); return TRUE; } } @@ -4569,8 +4569,8 @@ static BOOL compute_sincos_table(struct sincos_table *sincos_table, float angle_ angle = angle_start; for (i = 0; i < n; i++) { - sincos_table->sin[i] = sin(angle); - sincos_table->cos[i] = cos(angle); + sincos_table->sin[i] = sinf(angle); + sincos_table->cos[i] = cosf(angle); angle += angle_step; } @@ -4660,8 +4660,8 @@ HRESULT WINAPI D3DXCreateSphere(struct IDirect3DDevice9 *device, float radius, U for (stack = 0; stack < stacks - 1; stack++) { - sin_theta = sin(theta); - cos_theta = cos(theta); + sin_theta = sinf(theta); + cos_theta = cosf(theta); for (slice = 0; slice < slices; slice++) { @@ -5772,9 +5772,9 @@ HRESULT WINAPI D3DXCreateTextW(struct IDirect3DDevice9 *device, HDC hdc, const W face *face_ptr; float max_deviation_sq; const struct cos_table cos_table = { - cos(D3DXToRadian(0.5f)), - cos(D3DXToRadian(45.0f)), - cos(D3DXToRadian(90.0f)), + cosf(D3DXToRadian(0.5f)), + cosf(D3DXToRadian(45.0f)), + cosf(D3DXToRadian(90.0f)), }; int f1, f2; @@ -6154,7 +6154,7 @@ static BOOL weld_float4(void *to, void *from, FLOAT epsilon) FLOAT diff_y = fabsf(v1->y - v2->y); FLOAT diff_z = fabsf(v1->z - v2->z); FLOAT diff_w = fabsf(v1->w - v2->w); - FLOAT max_abs_diff = fmax(diff_x, diff_y); + FLOAT max_abs_diff = max(diff_x, diff_y); max_abs_diff = max(diff_z, max_abs_diff); max_abs_diff = max(diff_w, max_abs_diff);

1 0

Piotr Caban : msvcrt: Try to convert C to C++ exception in __CxxFrameHandler.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 0f3c31b1eab7842834242ac13e5eef0e0d5ce5ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3c31b1eab7842834242ac13… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 2 14:37:59 2014 +0100 msvcrt: Try to convert C to C++ exception in __CxxFrameHandler. --- dlls/msvcrt/except_i386.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 8639579..0481282 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -543,9 +543,19 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } else { + thread_data_t *data = msvcrt_get_thread_data(); + exc_type = NULL; TRACE("handling C exception code %x rec %p frame %p trylevel %d descr %p nested_frame %p\n", rec->ExceptionCode, rec, frame, frame->trylevel, descr, nested_frame ); + + if (data->se_translator) { + EXCEPTION_POINTERS except_ptrs; + + except_ptrs.ExceptionRecord = rec; + except_ptrs.ContextRecord = context; + data->se_translator(rec->ExceptionCode, &except_ptrs); + } } call_catch_block( rec, frame, descr, frame->trylevel, exc_type );

1 0

Dmitry Timoshkov : winebuild: Write actual (not aligned) sizes in the resource headers.
by Alexandre Julliard 02 Jan '14

02 Jan '14

Module: wine Branch: master Commit: 8cf8285adda3e6173b1e49396e8b5ddf4cfc735f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf8285adda3e6173b1e49396… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 2 21:57:19 2014 +0900 winebuild: Write actual (not aligned) sizes in the resource headers. --- tools/winebuild/res32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 0c39ec1..d459a5f 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -477,7 +477,7 @@ void output_resources( DLLSPEC *spec ) for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) output( "\t.long .L__wine_spec_res_%d-.L__wine_spec_rva_base,%u,0,0\n", - i, (res->data_size + 3) & ~3 ); + i, res->data_size ); /* dump the name strings */ @@ -578,7 +578,7 @@ void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ) for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) { put_dword( data_offset + start_rva ); - put_dword( (res->data_size + 3) & ~3 ); + put_dword( res->data_size ); put_dword( 0 ); put_dword( 0 ); data_offset += (res->data_size + 3) & ~3;

1 0

← Newer
1
...
74
75
76
77
78
79
80
81
82
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 January 2014