July 2008 - Wine-commits - list.winehq.org

Owen Rudge : winefile: Fix absolute pidl conversion for non-filesystem shell objects.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 021850c0b8364b2fb814d072bccea4efbba9d212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=021850c0b8364b2fb814d072b… Author: Owen Rudge <owen(a)owenrudge.net> Date: Sat Jul 26 00:34:15 2008 +0100 winefile: Fix absolute pidl conversion for non-filesystem shell objects. --- programs/winefile/winefile.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 311d580..a51c80b 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -867,20 +867,14 @@ static LPITEMIDLIST get_path_pidl(LPTSTR path, HWND hwnd) static LPITEMIDLIST get_to_absolute_pidl(Entry* entry, HWND hwnd) { if (entry->up && entry->up->etype==ET_SHELL) { - IShellFolder* folder = entry->up->folder; - WCHAR buffer[MAX_PATH]; + LPITEMIDLIST idl = NULL; - HRESULT hr = path_from_pidlW(folder, entry->pidl, buffer, MAX_PATH); - - if (SUCCEEDED(hr)) { - LPITEMIDLIST pidl; - ULONG len; - - hr = IShellFolder_ParseDisplayName(Globals.iDesktop, hwnd, NULL, buffer, &len, &pidl, NULL); - - if (SUCCEEDED(hr)) - return pidl; + while (entry->up) { + idl = ILCombine(ILClone(entry->pidl), idl); + entry = entry->up; } + + return idl; } else if (entry->etype == ET_WINDOWS) { TCHAR path[MAX_PATH];

1 0

Alexandre Julliard : Wine release 1.1.2
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: website Branch: master Commit: 74566b54119eb410a7ac565e4c945a01284b2903 URL: http://source.winehq.org/git/website.git/?a=commit;h=74566b54119eb410a7ac56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 25 18:49:48 2008 +0200 Wine release 1.1.2 --- news/en/2008072501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2008072501.xml b/news/en/2008072501.xml new file mode 100644 index 0000000..1fb4aad --- /dev/null +++ b/news/en/2008072501.xml @@ -0,0 +1,17 @@ +<news> +<date>July 25, 2008</date> +<title>Wine 1.1.2 Released</title> +<body> + The Wine development release 1.1.2 is now available. + <a href="?announce=1.1.2">What's new</a> in this release: +<ul> + <li>Control panel improvements and new appwiz panel.</li> + <li>Restructurations of state handling in Direct3D.</li> + <li>Support for timer queue functions.</li> + <li>Many MSXML improvements.</li> + <li>Several fixes to Solaris support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.2 : Alexandre Julliard : Release 1.1.2
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: refs/tags/wine-1.1.2 Tag: 393c3eda47eb730e7d7a011851214dd6a5c3f3f5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=393c3eda47eb730e7d7a01185121… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 25 17:42:25 2008 +0200 Release 1.1.2

1 0

Alexandre Julliard : Release 1.1.2.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 53320cfc634cdac3d718b2cdb10e9ec867c922cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=53320cfc634cdac3d718b2cdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 25 17:42:25 2008 +0200 Release 1.1.2. --- ANNOUNCE | 1319 ++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 579 insertions(+), 760 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53320cfc634cdac3d718b…

1 0

Detlef Riekenberg : appwiz.cpl: Do not access memory after HeapFree in FreeAppInfo.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 8ed31e2c388a0dba291797d334ac63e2f7e46d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed31e2c388a0dba291797d33… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jul 25 16:41:38 2008 +0200 appwiz.cpl: Do not access memory after HeapFree in FreeAppInfo. --- dlls/appwiz.cpl/appwiz.c | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index a13dea1..e06d810 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -110,27 +110,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, */ static void FreeAppInfo(APPINFO *info) { - APPINFO *iter = info; - - while (iter) + while (info) { - if (iter->title) - HeapFree(GetProcessHeap(), 0, iter->title); - - if (iter->path) - HeapFree(GetProcessHeap(), 0, iter->path); - - if (iter->icon) - HeapFree(GetProcessHeap(), 0, iter->icon); - - if (iter->publisher) - HeapFree(GetProcessHeap(), 0, iter->publisher); - - if (iter->version) - HeapFree(GetProcessHeap(), 0, iter->version); - - iter = iter->next; - HeapFree(GetProcessHeap(), 0, iter); + APPINFO *next_info = info->next; + + HeapFree(GetProcessHeap(), 0, info->title); + HeapFree(GetProcessHeap(), 0, info->path); + HeapFree(GetProcessHeap(), 0, info->icon); + HeapFree(GetProcessHeap(), 0, info->publisher); + HeapFree(GetProcessHeap(), 0, info->version); + HeapFree(GetProcessHeap(), 0, info); + info = next_info; } }

1 0

Mikołaj Zalewski : advapi32: tests: Make WOW64 test pass under Win2k, fix a flag.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 352d85705922cf3411fbaa4bdfdec8587d4cd772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=352d85705922cf3411fbaa4bd… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jul 24 16:31:05 2008 +0200 advapi32: tests: Make WOW64 test pass under Win2k, fix a flag. --- dlls/advapi32/tests/registry.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index ac0cd08..94ce15a 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -953,12 +953,14 @@ static void test_reg_open_key(void) /* WOW64 flags */ hkResult = NULL; ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, KEY_READ|KEY_WOW64_32KEY, &hkResult); - ok(ret == ERROR_SUCCESS && hkResult != NULL, "RegOpenKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); + ok((ret == ERROR_SUCCESS && hkResult != NULL) || broken(ret == ERROR_ACCESS_DENIED /* NT4, win2k */), + "RegOpenKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); RegCloseKey(hkResult); hkResult = NULL; ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, KEY_READ|KEY_WOW64_64KEY, &hkResult); - ok(ret == ERROR_SUCCESS && hkResult != NULL, "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); + ok((ret == ERROR_SUCCESS && hkResult != NULL) || broken(ret == ERROR_ACCESS_DENIED /* NT4, win2k */), + "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); RegCloseKey(hkResult); } @@ -989,12 +991,14 @@ static void test_reg_create_key(void) /* WOW64 flags - open an existing key */ hkey1 = NULL; ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL); - ok(ret == ERROR_SUCCESS && hkey1 != NULL, "RegOpenKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); + ok((ret == ERROR_SUCCESS && hkey1 != NULL) || broken(ret == ERROR_ACCESS_DENIED /* NT4, win2k */), + "RegOpenKeyEx with KEY_WOW64_32KEY failed (err=%u)\n", ret); RegCloseKey(hkey1); hkey1 = NULL; - ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &hkey1, NULL); - ok(ret == ERROR_SUCCESS && hkey1 != NULL, "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); + ret = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_READ|KEY_WOW64_64KEY, NULL, &hkey1, NULL); + ok((ret == ERROR_SUCCESS && hkey1 != NULL) || broken(ret == ERROR_ACCESS_DENIED /* NT4, win2k */), + "RegOpenKeyEx with KEY_WOW64_64KEY failed (err=%u)\n", ret); RegCloseKey(hkey1); }

1 0

Dan Hipschman : ntdll: Implement RtlDeleteTimer for kernel32' s DeleteTimerQueueTimer.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 4c64d0cdfa5a81724307e6a71cfbb4e67fea9075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c64d0cdfa5a81724307e6a71… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jul 24 16:27:54 2008 -0700 ntdll: Implement RtlDeleteTimer for kernel32's DeleteTimerQueueTimer. --- dlls/kernel32/sync.c | 11 +++-- dlls/kernel32/tests/sync.c | 89 +++++++++++++++++++++++++++++++++++++++----- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/threadpool.c | 52 +++++++++++++++++++++++++ include/winternl.h | 1 + 5 files changed, 139 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c64d0cdfa5a81724307e…

1 0

Dan Hipschman : ntdll: Implement RtlUpdateTimer for kernel32' s ChangeTimerQueueTimer.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 396e47ef5c201ff01f2eef7fcb0339520db4e6fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=396e47ef5c201ff01f2eef7fc… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jul 24 16:27:03 2008 -0700 ntdll: Implement RtlUpdateTimer for kernel32's ChangeTimerQueueTimer. --- dlls/kernel32/sync.c | 15 +++++++++------ dlls/kernel32/tests/sync.c | 15 ++++++++++++--- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/threadpool.c | 36 ++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 5 files changed, 59 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index c739a5b..8bd4243 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1109,16 +1109,19 @@ BOOL WINAPI CreateTimerQueueTimer( PHANDLE phNewTimer, HANDLE TimerQueue, * * RETURNS * nonzero on success or zero on failure - * - * BUGS - * Unimplemented */ BOOL WINAPI ChangeTimerQueueTimer( HANDLE TimerQueue, HANDLE Timer, ULONG DueTime, ULONG Period ) { - FIXME("stub\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + NTSTATUS status = RtlUpdateTimer(TimerQueue, Timer, DueTime, Period); + + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + return TRUE; } /*********************************************************************** diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index d41bd79..19fc8e2 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -583,7 +583,6 @@ static void CALLBACK timer_queue_cb3(PVOID p, BOOLEAN timedOut) /* Basically kill the timer since it won't have time to run again. */ BOOL ret = pChangeTimerQueueTimer(d->q, d->t, 10000, 0); - todo_wine ok(ret, "ChangeTimerQueueTimer\n"); } } @@ -600,7 +599,6 @@ static void CALLBACK timer_queue_cb4(PVOID p, BOOLEAN timedOut) fail if the timer is already flagged. Hence we really run only once. Otherwise we will run multiple times. */ BOOL ret = pChangeTimerQueueTimer(d->q, d->t, 50, 50); - todo_wine ok(ret, "ChangeTimerQueueTimer\n"); ++d->num_calls; } @@ -707,6 +705,16 @@ static void test_timer_queue(void) q = pCreateTimerQueue(); ok(q != NULL, "CreateTimerQueue\n"); + /* Test changing a once-only timer before it fires (this is allowed, + whereas after it fires you cannot). */ + n1 = 0; + ret = pCreateTimerQueueTimer(&t1, q, timer_queue_cb1, &n1, 10000, + 0, 0); + ok(ret, "CreateTimerQueueTimer\n"); + ok(t1 != NULL, "CreateTimerQueueTimer\n"); + ret = pChangeTimerQueueTimer(q, t1, 0, 0); + ok(ret, "ChangeTimerQueueTimer\n"); + d2.t = t2 = NULL; d2.num_calls = 0; d2.max_calls = 3; @@ -740,11 +748,12 @@ static void test_timer_queue(void) ret = pDeleteTimerQueueEx(q, INVALID_HANDLE_VALUE); ok(ret, "DeleteTimerQueueEx\n"); + ok(n1 == 1, "ChangeTimerQueueTimer\n"); todo_wine { ok(d2.num_calls == d2.max_calls, "DeleteTimerQueueTimer\n"); - ok(d3.num_calls == d3.max_calls, "ChangeTimerQueueTimer\n"); } + ok(d3.num_calls == d3.max_calls, "ChangeTimerQueueTimer\n"); ok(d4.num_calls == 1, "Timer flagged for deletion incorrectly\n"); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 595a5f6..4d200eb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -895,7 +895,7 @@ @ stub RtlUpcaseUnicodeToCustomCPN @ stdcall RtlUpcaseUnicodeToMultiByteN(ptr long ptr ptr long) @ stdcall RtlUpcaseUnicodeToOemN(ptr long ptr ptr long) -# @ stub RtlUpdateTimer +@ stdcall RtlUpdateTimer(ptr ptr long long) @ stdcall RtlUpperChar(long) @ stdcall RtlUpperString(ptr ptr) @ stub RtlUsageHeap diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index cbb97f4..f6e6c1e 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -907,3 +907,39 @@ NTSTATUS WINAPI RtlCreateTimer(PHANDLE NewTimer, HANDLE TimerQueue, return status; } + +/*********************************************************************** + * RtlUpdateTimer (NTDLL.@) + * + * Changes the time at which a timer expires. + * + * PARAMS + * TimerQueue [I] The queue that holds the timer. + * Timer [I] The timer to update. + * DueTime [I] The delay, in milliseconds, before next firing the timer. + * Period [I] The period, in milliseconds, at which to fire the timer + * after the first callback. If zero, the timer will not + * refire once. It still needs to be deleted with + * RtlDeleteTimer. + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: Any NTSTATUS code. + */ +NTSTATUS WINAPI RtlUpdateTimer(HANDLE TimerQueue, HANDLE Timer, + DWORD DueTime, DWORD Period) +{ + struct timer_queue *q = TimerQueue; + struct queue_timer *t = Timer; + + RtlEnterCriticalSection(&q->cs); + /* Can't change a timer if it was once-only or destroyed. */ + if (t->expire != EXPIRE_NEVER) + { + t->period = Period; + queue_move_timer(t, queue_current_time() + DueTime, TRUE); + } + RtlLeaveCriticalSection(&q->cs); + + return STATUS_SUCCESS; +} diff --git a/include/winternl.h b/include/winternl.h index 30bd0e5..cb9a6f7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2340,6 +2340,7 @@ NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeStringToCountedOemString(STRING*,const NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeStringToOemString(STRING*,const UNICODE_STRING*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeToMultiByteN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlUpcaseUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD); +NTSYSAPI NTSTATUS WINAPI RtlUpdateTimer(HANDLE, HANDLE, DWORD, DWORD); NTSYSAPI CHAR WINAPI RtlUpperChar(CHAR); NTSYSAPI void WINAPI RtlUpperString(STRING *,const STRING *); NTSYSAPI NTSTATUS WINAPI RtlValidSecurityDescriptor(PSECURITY_DESCRIPTOR);

1 0

Dan Hipschman : ntdll: Implement the timer queue thread.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 5ef54c4cec4d89c55918559b651e83481019b7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ef54c4cec4d89c55918559b6… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jul 24 16:26:32 2008 -0700 ntdll: Implement the timer queue thread. --- dlls/kernel32/tests/sync.c | 34 +++++- dlls/ntdll/threadpool.c | 274 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 291 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ef54c4cec4d89c559185…

1 0

Philip Nilsson : d3dx9: Use UINT instead of unsigned int where appropriate.
by Alexandre Julliard 25 Jul '08

25 Jul '08

Module: wine Branch: master Commit: 6de5bdb0f7ec27d6dd7a765d9607382c6251d8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de5bdb0f7ec27d6dd7a765d9… Author: Philip Nilsson <pnilsson(a)nullref.se> Date: Thu Jul 24 21:47:37 2008 +0200 d3dx9: Use UINT instead of unsigned int where appropriate. --- dlls/d3dx9_36/math.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index c151b6a..deb52d2 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -53,7 +53,7 @@ D3DXVECTOR4* WINAPI D3DXVec2TransformArray( D3DXVECTOR4* out, UINT outstride, CONST D3DXVECTOR2* in, UINT instride, CONST D3DXMATRIX* matrix, UINT elements) { - unsigned int i; + UINT i; TRACE("\n"); for (i = 0; i < elements; ++i) { D3DXVec2Transform( @@ -71,7 +71,7 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray( D3DXVECTOR2* out, UINT outstride, CONST D3DXVECTOR2* in, UINT instride, CONST D3DXMATRIX* matrix, UINT elements) { - unsigned int i; + UINT i; TRACE("\n"); for (i = 0; i < elements; ++i) { D3DXVec2TransformCoord( @@ -89,7 +89,7 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformNormalArray( D3DXVECTOR2* out, UINT outstride, CONST D3DXVECTOR2 *in, UINT instride, CONST D3DXMATRIX *matrix, UINT elements) { - unsigned int i; + UINT i; TRACE("\n"); for (i = 0; i < elements; ++i) { D3DXVec2TransformNormal( @@ -110,7 +110,7 @@ D3DXVECTOR3* WINAPI D3DXVec3ProjectArray( CONST D3DVIEWPORT9* viewport, CONST D3DXMATRIX* projection, CONST D3DXMATRIX* view, CONST D3DXMATRIX* world, UINT elements) { - unsigned int i; + UINT i; TRACE("\n"); for (i = 0; i < elements; ++i) { D3DXVec3Project( @@ -128,7 +128,7 @@ D3DXVECTOR4* WINAPI D3DXVec3TransformArray( D3DXVECTOR4* out, UINT outstride, CONST D3DXVECTOR3* in, UINT instride, CONST D3DXMATRIX* matrix, UINT elements) { - unsigned int i; + UINT i; TRACE("\n"); for (i = 0; i < elements; ++i) { D3DXVec3Transform( @@ -146,7 +146,7 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformCoordArray( D3DXVECTOR3* out, UINT outstride, CONST D3DXVECTOR3* in, UINT instride, CONST D3DXMATRIX* matrix, UINT elements) { - unsigned int i; + UINT i; TRACE("\n"); for (i = 0; i < elements; ++i) { D3DXVec3TransformCoord( @@ -164,7 +164,7 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformNormalArray( D3DXVECTOR3* out, UINT outstride, CONST D3DXVECTOR3* in, UINT instride, CONST D3DXMATRIX* matrix, UINT elements) { - unsigned int i; + UINT i; TRACE("\n"); for (i = 0; i < elements; ++i) { D3DXVec3TransformNormal( @@ -183,7 +183,7 @@ D3DXVECTOR3* WINAPI D3DXVec3UnprojectArray( CONST D3DVIEWPORT9* viewport, CONST D3DXMATRIX* projection, CONST D3DXMATRIX* view, CONST D3DXMATRIX* world, UINT elements) { - unsigned int i; + UINT i; TRACE("\n"); for (i = 0; i < elements; ++i) { D3DXVec3Unproject( @@ -201,7 +201,7 @@ D3DXVECTOR4* WINAPI D3DXVec4TransformArray( D3DXVECTOR4* out, UINT outstride, CONST D3DXVECTOR4* in, UINT instride, CONST D3DXMATRIX* matrix, UINT elements) { - unsigned int i; + UINT i; TRACE("\n"); for (i = 0; i < elements; ++i) { D3DXVec4Transform(

1 0