January 2014 - Wine-commits

Michael Stefaniuc : dmime: Don' t use an IDirectMusicSegment8 method implementation directly.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 770feca7ac05a1189dfdeb64b702790d18a5076e URL: http://source.winehq.org/git/wine.git/?a=commit;h=770feca7ac05a1189dfdeb64b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 7 10:33:21 2014 +0100 dmime: Don't use an IDirectMusicSegment8 method implementation directly. --- dlls/dmime/segment.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 36766db..22218b5 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -813,7 +813,8 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_LoadTrack (LPPERSISTSTREA /* release all loading-related stuff */ IPersistStream_Release (pPersistStream); - hr = IDirectMusicSegment8Impl_IDirectMusicSegment8_InsertTrack ((LPDIRECTMUSICSEGMENT8)&This->SegmentVtbl, *ppTrack, pTrack_hdr->dwGroup); /* at dsPosition */ + hr = IDirectMusicSegment8_InsertTrack((LPDIRECTMUSICSEGMENT8)&This->SegmentVtbl, *ppTrack, + pTrack_hdr->dwGroup); /* at dsPosition */ if (FAILED(hr)) { ERR(": could not insert track\n"); return hr;

1 0

Michael Stefaniuc : dmime: Remove duplicated "IDirectMusicSegment8" from the method names.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: c236bddcef0a6f12bb2d4202ebb4a0576f1300ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c236bddcef0a6f12bb2d4202e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 7 10:37:48 2014 +0100 dmime: Remove duplicated "IDirectMusicSegment8" from the method names. --- dlls/dmime/segment.c | 190 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 126 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c236bddcef0a6f12bb2d4…

1 0

Michael Stefaniuc : dmime: COM cleanup for IDirectMusicSegment8.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: dc45b8ad06cd76786fa2e61bb5f98aef66847791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc45b8ad06cd76786fa2e61bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 7 10:45:38 2014 +0100 dmime: COM cleanup for IDirectMusicSegment8. --- dlls/dmime/dmime_private.h | 2 +- dlls/dmime/segment.c | 93 +++++++++++++++++++++++++------------------- 2 files changed, 54 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc45b8ad06cd76786fa2e…

1 0

Jactry Zeng : riched20: Use CP_UNICODE instead of 1200.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 51936be04dc9245d17051f6e5b6b247cfa5aa466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51936be04dc9245d17051f6e5… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sun Jan 5 19:10:58 2014 +0800 riched20: Use CP_UNICODE instead of 1200. --- dlls/riched20/editor.c | 8 ++++---- dlls/riched20/editor.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 66dec2d..119061f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1968,7 +1968,7 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) ME_SetCursorToStart(editor, &start); nChars = INT_MAX; } - if (ex->codepage == 1200) + if (ex->codepage == CP_UNICODE) { return ME_GetTextW(editor, (LPWSTR)pText, ex->cb / sizeof(WCHAR) - 1, &start, nChars, ex->flags & GT_USECRLF); @@ -3338,7 +3338,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, * we know it isn't unicode. */ bRtf = (lParam && (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf", 6))); - bUnicode = !bRtf && pStruct->codepage == 1200; + bUnicode = !bRtf && pStruct->codepage == CP_UNICODE; TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n", bUnicode ? debugstr_w((LPCWSTR)lParam) : debugstr_a((LPCSTR)lParam), @@ -3691,7 +3691,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, /* CR/LF conversion required in 2.0 mode, verbatim in 1.0 mode */ how.flags = GTL_CLOSE | (editor->bEmulateVersion10 ? 0 : GTL_USECRLF) | GTL_NUMCHARS; - how.codepage = unicode ? 1200 : CP_ACP; + how.codepage = unicode ? CP_UNICODE : CP_ACP; return ME_GetTextLengthEx(editor, &how); } case EM_GETTEXTLENGTHEX: @@ -3701,7 +3701,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, GETTEXTEX ex; ex.cb = wParam * (unicode ? sizeof(WCHAR) : sizeof(CHAR)); ex.flags = GT_USECRLF; - ex.codepage = unicode ? 1200 : CP_ACP; + ex.codepage = unicode ? CP_UNICODE : CP_ACP; ex.lpDefaultChar = NULL; ex.lpUsedDefChar = NULL; return ME_GetTextEx(editor, &ex, lParam); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 2f2dc96..40bf04c 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -108,6 +108,8 @@ int ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) DECLSPEC_HIDDEN; BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len) DECLSPEC_HIDDEN; +#define CP_UNICODE 1200 + /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) DECLSPEC_HIDDEN; void ME_EndToUnicode(BOOL unicode, LPVOID psz) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcr90: Add _is_exception_typeof implementation.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 32858d1811c0b939e348f1ca3de91581ef574d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32858d1811c0b939e348f1ca3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 6 17:54:26 2014 +0100 msvcr90: Add _is_exception_typeof implementation. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcr90/tests/msvcr90.c | 119 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/cpp.c | 85 ++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 7 files changed, 212 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32858d1811c0b939e348f…

1 0

Stefan Dösinger : d3dx9_36: Cast D3DPARAMETER_TYPE * to DWORD *.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: e1a845c2139064f0b8bf7cd5e78e2ccd682ac589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a845c2139064f0b8bf7cd5e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 3 14:17:16 2014 +0100 d3dx9_36: Cast D3DPARAMETER_TYPE * to DWORD *. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 547e810..ac13c72 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4398,10 +4398,10 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch if (!parent) { - read_dword(ptr, &param->type); + read_dword(ptr, (DWORD *)&param->type); TRACE("Type: %s\n", debug_d3dxparameter_type(param->type)); - read_dword(ptr, &param->class); + read_dword(ptr, (DWORD *)&param->class); TRACE("Class: %s\n", debug_d3dxparameter_class(param->class)); read_dword(ptr, &offset);

1 0

Stefan Dösinger : d3dx9_36: Don' t make the input parameter to remap_faces_for_attrsort const.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 303a5f05f71d0250f02acff8bb9635006c850c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=303a5f05f71d0250f02acff8b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 3 14:17:17 2014 +0100 d3dx9_36: Don't make the input parameter to remap_faces_for_attrsort const. --- dlls/d3dx9_36/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index aa20119..133f14d 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1610,9 +1610,9 @@ static int attrib_entry_compare(const DWORD **a, const DWORD **b) /* Create face_remap, a new attribute buffer for attribute sort optimization. */ static HRESULT remap_faces_for_attrsort(struct d3dx9_mesh *This, const DWORD *indices, - const DWORD *attrib_buffer, DWORD **sorted_attrib_buffer, DWORD **face_remap) + DWORD *attrib_buffer, DWORD **sorted_attrib_buffer, DWORD **face_remap) { - const DWORD **sorted_attrib_ptr_buffer = NULL; + DWORD **sorted_attrib_ptr_buffer = NULL; DWORD i; *face_remap = HeapAlloc(GetProcessHeap(), 0, This->numfaces * sizeof(**face_remap));

1 0

Stefan Dösinger : d3dx9_36: Improve error handling in remap_faces_for_attrsort.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: 86e88f51b88f99514d1a00f9ee60c0a60232c7b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e88f51b88f99514d1a00f9e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 3 14:17:18 2014 +0100 d3dx9_36: Improve error handling in remap_faces_for_attrsort. --- dlls/d3dx9_36/mesh.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 133f14d..b713079 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1615,12 +1615,17 @@ static HRESULT remap_faces_for_attrsort(struct d3dx9_mesh *This, const DWORD *in DWORD **sorted_attrib_ptr_buffer = NULL; DWORD i; - *face_remap = HeapAlloc(GetProcessHeap(), 0, This->numfaces * sizeof(**face_remap)); sorted_attrib_ptr_buffer = HeapAlloc(GetProcessHeap(), 0, This->numfaces * sizeof(*sorted_attrib_ptr_buffer)); - if (!*face_remap || !sorted_attrib_ptr_buffer) { + if (!sorted_attrib_ptr_buffer) + return E_OUTOFMEMORY; + + *face_remap = HeapAlloc(GetProcessHeap(), 0, This->numfaces * sizeof(**face_remap)); + if (!*face_remap) + { HeapFree(GetProcessHeap(), 0, sorted_attrib_ptr_buffer); return E_OUTOFMEMORY; } + for (i = 0; i < This->numfaces; i++) sorted_attrib_ptr_buffer[i] = &attrib_buffer[i]; qsort(sorted_attrib_ptr_buffer, This->numfaces, sizeof(*sorted_attrib_ptr_buffer),

1 0

Stefan Dösinger : d3dx9_36: Make the order parameter of weightedcapintegrale an UINT.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: b87e167fa33a67d793c66b5bb06c3f18d8c5c4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=b87e167fa33a67d793c66b5bb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 3 14:17:19 2014 +0100 d3dx9_36: Make the order parameter of weightedcapintegrale an UINT. --- dlls/d3dx9_36/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index a5dbee1..f98927f 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2286,7 +2286,7 @@ FLOAT WINAPI D3DXSHDot(UINT order, const FLOAT *a, const FLOAT *b) return s; } -static void weightedcapintegrale(FLOAT *out, FLOAT order, FLOAT angle) +static void weightedcapintegrale(FLOAT *out, UINT order, FLOAT angle) { FLOAT coeff[3];

1 0

Stefan Dösinger : d3dx9_36: Cast UINTs to FLOATs in d3dx9_line_Begin.
by Alexandre Julliard 06 Jan '14

06 Jan '14

Module: wine Branch: master Commit: b054fe94ee0bc34652b147e1b42228cfb5f056a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b054fe94ee0bc34652b147e1b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 3 14:17:20 2014 +0100 d3dx9_36: Cast UINTs to FLOATs in d3dx9_line_Begin. --- dlls/d3dx9_36/line.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 0b3e88f..5de44f4 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -113,7 +113,7 @@ static HRESULT WINAPI d3dx9_line_Begin(ID3DXLine *iface) goto failed; D3DXMatrixIdentity(&identity); - D3DXMatrixOrthoOffCenterLH(&projection, 0.0, vp.Width, vp.Height, 0.0, 0.0, 1.0); + D3DXMatrixOrthoOffCenterLH(&projection, 0.0, (FLOAT)vp.Width, (FLOAT)vp.Height, 0.0, 0.0, 1.0); if (FAILED(IDirect3DDevice9_SetTransform(line->device, D3DTS_WORLD, &identity))) goto failed;

1 0