September 2006 - Wine-Commits

Benjamin Arai : msi: Adds tests to check if joins return the correct number of rows.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 32d002c7ed166348f62e613cf9784dbfcfd78e02 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32d002c7ed166348f62e613… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Tue Sep 19 16:11:50 2006 -0700 msi: Adds tests to check if joins return the correct number of rows. --- dlls/msi/tests/db.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 64a573e..4ea7c35 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1893,6 +1893,11 @@ static void test_join(void) MsiCloseHandle(hrec); } + todo_wine + { + ok( i == 5, "Expected 5 rows, got %ld\n", i ); + } + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -1937,6 +1942,11 @@ static void test_join(void) todo_wine { + ok( i == 2, "Expected 2 rows, got %ld\n", i ); + } + + todo_wine + { ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); } @@ -1975,6 +1985,8 @@ static void test_join(void) MsiCloseHandle(hrec); } + ok( i == 2, "Expected 2 rows, got %ld\n", i ); + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -2012,6 +2024,8 @@ static void test_join(void) MsiCloseHandle(hrec); } + ok( i == 1, "Expected 1 rows, got %ld\n", i ); + ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); MsiViewClose(hview); @@ -2058,6 +2072,11 @@ static void test_join(void) todo_wine { + ok( i == 1, "Expected 1 rows, got %ld\n", i ); + } + + todo_wine + { ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); } @@ -2104,6 +2123,11 @@ static void test_join(void) todo_wine { + ok( i == 6, "Expected 6 rows, got %ld\n", i ); + } + + todo_wine + { ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); } @@ -2151,6 +2175,11 @@ static void test_join(void) todo_wine { + ok( i == 3, "Expected 3 rows, got %ld\n", i ); + } + + todo_wine + { ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r ); }

1 0

Christoph Frick : wined3d: Clamp the light exponent at 128.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 6192f77d25209d266c0302db74bfaadc35494366 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6192f77d25209d266c0302d… Author: Christoph Frick <frick(a)sc-networks.com> Date: Sun Sep 17 19:54:33 2006 +0200 wined3d: Clamp the light exponent at 128. --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34026db..e32b824 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2755,6 +2755,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl } if (rho < 0.0001) rho = 0.0001f; object->exponent = -0.3/log(cos(rho/2)); + if (object->exponent > 128.0) { + object->exponent = 128.0; + } object->cutoff = pLight->Phi*90/M_PI; /* FIXME: Range */

1 0

Benjamin Arai : msi: Updates tests for joins to include row and column ids in message.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: d4c6b06ed7d73c63d9e9de7e6dd878594c85eaa7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4c6b06ed7d73c63d9e9de7… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Tue Sep 19 16:11:39 2006 -0700 msi: Updates tests for joins to include row and column ids in message. --- dlls/msi/tests/db.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index acfa093..64a573e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1877,7 +1877,7 @@ static void test_join(void) if (i == 2 || i == 3) todo_wine { ok( !lstrcmp( buf, join_res_first[i].one ), - "Expected '%s', got %s\n", join_res_first[i].one, buf ); + "For (row %ld, column 1) expected '%s', got %s\n", i, join_res_first[i].one, buf ); } size = MAX_PATH; @@ -1886,7 +1886,7 @@ static void test_join(void) if (i == 3) todo_wine { ok( !lstrcmp( buf, join_res_first[i].two ), - "Expected '%s', got %s\n", join_res_first[i].two, buf ); + "For (row %ld, column 2) expected '%s', got %s\n", i, join_res_first[i].two, buf ); } i++; @@ -1923,13 +1923,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_second[i].one ), - "Expected '%s', got %s\n", join_res_second[i].one, buf ); + "For (row %ld, column 1) expected '%s', got %s\n", i, join_res_second[i].one, buf ); size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_second[i].two ), - "Expected '%s', got %s\n", join_res_second[i].two, buf ); + "For (row %ld, column 2) expected '%s', got %s\n", i, join_res_second[i].two, buf ); i++; MsiCloseHandle(hrec); @@ -1963,13 +1963,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_third[i].one ), - "Expected '%s', got %s\n", join_res_third[i].one, buf ); + "For (row %ld, column 1) expected '%s', got %s\n", i, join_res_third[i].one, buf ); size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_third[i].two ), - "Expected '%s', got %s\n", join_res_third[i].two, buf ); + "For (row %ld, column 2) expected '%s', got %s\n", i, join_res_third[i].two, buf ); i++; MsiCloseHandle(hrec); @@ -2000,13 +2000,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_fourth[i].one ), - "Expected '%s', got %s\n", join_res_fourth[i].one, buf ); + "For (row %ld, column 1) expected '%s', got %s\n", i, join_res_fourth[i].one, buf ); size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_fourth[i].two ), - "Expected '%s', got %s\n", join_res_fourth[i].two, buf ); + "For (row %ld, column 2) expected '%s', got %s\n", i, join_res_fourth[i].two, buf ); i++; MsiCloseHandle(hrec); @@ -2044,13 +2044,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_fifth[i].one ), - "Expected '%s', got %s\n", join_res_fifth[i].one, buf ); + "For (row %ld, column 1) expected '%s', got %s\n", i, join_res_fifth[i].one, buf ); size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_fifth[i].two ), - "Expected '%s', got %s\n", join_res_fifth[i].two, buf ); + "For (row %ld, column 2) expected '%s', got %s\n", i, join_res_fifth[i].two, buf ); i++; MsiCloseHandle(hrec); @@ -2090,13 +2090,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_sixth[i].one ), - "Expected '%s', got %s\n", join_res_sixth[i].one, buf ); + "For (row %ld, column 1) expected '%s', got %s\n", i, join_res_sixth[i].one, buf ); size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_sixth[i].two ), - "Expected '%s', got %s\n", join_res_sixth[i].two, buf ); + "For (row %ld, column 2) expected '%s', got %s\n", i, join_res_sixth[i].two, buf ); i++; MsiCloseHandle(hrec); @@ -2137,13 +2137,13 @@ static void test_join(void) r = MsiRecordGetString( hrec, 1, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_seventh[i].one ), - "Expected '%s', got %s\n", join_res_seventh[i].one, buf ); + "For (row %ld, column 1) expected '%s', got %s\n", i, join_res_seventh[i].one, buf ); size = MAX_PATH; r = MsiRecordGetString( hrec, 2, buf, &size ); ok( r == ERROR_SUCCESS, "failed to get record string: %d\n", r ); ok( !lstrcmp( buf, join_res_seventh[i].two ), - "Expected '%s', got %s\n", join_res_seventh[i].two, buf ); + "For (row %ld, column 2) expected '%s', got %s\n", i, join_res_seventh[i].two, buf ); i++; MsiCloseHandle(hrec);

1 0

Paul Vriens : setupapi/tests: Use pSetupDiOpenClassRegKeyExA.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: d51594d0d685458de5815893a46dcc3261bf49a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d51594d0d685458de581589… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Sep 18 15:33:50 2006 +0200 setupapi/tests: Use pSetupDiOpenClassRegKeyExA. --- dlls/setupapi/tests/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 56d809e..703cfd9 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -90,7 +90,7 @@ static void test_SetupDiOpenClassRegKeyE HKEY hkey; /* Check return value for non-existent key */ - hkey = SetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, + hkey = pSetupDiOpenClassRegKeyExA(&guid, KEY_ALL_ACCESS, DIOCR_INSTALLER, NULL, NULL); ok(hkey == INVALID_HANDLE_VALUE, "returned %p (expected INVALID_HANDLE_VALUE)\n", hkey);

1 0

Paul Vriens : ntdll: Don' t do DVD_READ_STRUCTURE when inbuffer or outbuffer has issues (Coverity).
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 0c7ecacf470ee483a6d73f7ca4767e85f92ce7ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c7ecacf470ee483a6d73f7… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Sep 18 14:18:24 2006 +0200 ntdll: Don't do DVD_READ_STRUCTURE when inbuffer or outbuffer has issues (Coverity). --- dlls/ntdll/cdrom.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 60074b0..2e46f68 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -2261,8 +2261,11 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hD sz = sizeof(DVD_LAYER_DESCRIPTOR); if (lpInBuffer == NULL || nInBufferSize != sizeof(DVD_READ_STRUCTURE)) status = STATUS_INVALID_PARAMETER; else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL; - TRACE("doing DVD_READ_STRUCTURE\n"); - status = DVD_ReadStructure(fd, (PDVD_READ_STRUCTURE)lpInBuffer, (PDVD_LAYER_DESCRIPTOR)lpOutBuffer); + else + { + TRACE("doing DVD_READ_STRUCTURE\n"); + status = DVD_ReadStructure(fd, (PDVD_READ_STRUCTURE)lpInBuffer, (PDVD_LAYER_DESCRIPTOR)lpOutBuffer); + } break; case IOCTL_SCSI_GET_INQUIRY_DATA:

1 0

Paul Vriens : ntdll: Fixed conditional expression (Coverity).
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: e94df274cee3d78526cacf91bc92b0ad70bff182 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e94df274cee3d78526cacf9… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Sep 18 13:55:25 2006 +0200 ntdll: Fixed conditional expression (Coverity). --- dlls/ntdll/reg.c | 2 +- dlls/ntdll/tests/reg.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index e77c48a..bd32a3d 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -517,7 +517,7 @@ NTSTATUS WINAPI RtlpNtQueryValueKey( HAN UNICODE_STRING name; NTSTATUS ret; DWORD dwResultLen; - DWORD dwLen = sizeof (KEY_VALUE_PARTIAL_INFORMATION) + result_len ? *result_len : 0; + DWORD dwLen = sizeof (KEY_VALUE_PARTIAL_INFORMATION) + (result_len ? *result_len : 0); info = (KEY_VALUE_PARTIAL_INFORMATION*)RtlAllocateHeap( GetProcessHeap(), 0, dwLen ); if (!info) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index c9fab3a..252a815 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -103,6 +103,7 @@ static NTSTATUS (WINAPI * pRtlUnicodeStr static NTSTATUS (WINAPI * pRtlFreeHeap)(PVOID, ULONG, PVOID); static NTSTATUS (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); static NTSTATUS (WINAPI * pRtlZeroMemory)(PVOID, ULONG); +static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*); static HMODULE hntdll = 0; static int CurrentTest = 0; @@ -146,6 +147,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(RtlFreeHeap) NTDLL_GET_PROC(RtlAllocateHeap) NTDLL_GET_PROC(RtlZeroMemory) + NTDLL_GET_PROC(RtlpNtQueryValueKey) } return TRUE; } @@ -445,6 +447,14 @@ static void test_NtDeleteKey(void) ok(status == STATUS_SUCCESS, "NtDeleteKey Failed: 0x%08lx\n", status); } +static void test_RtlpNtQueryValueKey(void) +{ + NTSTATUS status; + + status = pRtlpNtQueryValueKey(NULL, NULL, NULL, NULL); + ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08lx\n", status); +} + START_TEST(reg) { static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t','\\',0}; @@ -463,6 +473,7 @@ START_TEST(reg) test_RtlCheckRegistryKey(); test_RtlOpenCurrentUser(); test_RtlQueryRegistryValues(); + test_RtlpNtQueryValueKey(); test_NtFlushKey(); test_NtDeleteKey();

1 0

Dmitry Timoshkov : gdi: If there is no space for strings GetOutlineTextMetricsA should not indicate that they present .
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: e41c0acc0c16713d23c926f8442e651e034f99db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e41c0acc0c16713d23c926f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Sep 18 19:00:44 2006 +0900 gdi: If there is no space for strings GetOutlineTextMetricsA should not indicate that they present. --- dlls/gdi/font.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index a4327de..42b4925 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -1483,6 +1483,20 @@ UINT WINAPI GetOutlineTextMetricsA( if(output != lpOTM) { memcpy(lpOTM, output, cbData); HeapFree(GetProcessHeap(), 0, output); + + /* check if the string offsets really fit into the provided size */ + /* FIXME: should we check string length as well? */ + if ((UINT_PTR)lpOTM->otmpFamilyName >= lpOTM->otmSize) + lpOTM->otmpFamilyName = 0; /* doesn't fit */ + + if ((UINT_PTR)lpOTM->otmpFaceName >= lpOTM->otmSize) + lpOTM->otmpFaceName = 0; /* doesn't fit */ + + if ((UINT_PTR)lpOTM->otmpStyleName >= lpOTM->otmSize) + lpOTM->otmpStyleName = 0; /* doesn't fit */ + + if ((UINT_PTR)lpOTM->otmpFullName >= lpOTM->otmSize) + lpOTM->otmpFullName = 0; /* doesn't fit */ } end:

1 0

Vitaliy Margolen : dinput: Initialize default coop level. Invert logic in hook handler.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 84b2d73d3813d655360fbc562900d52852e38338 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=84b2d73d3813d655360fbc5… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Sep 17 15:13:11 2006 -0600 dinput: Initialize default coop level. Invert logic in hook handler. --- dlls/dinput/mouse.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 5d4c04e..dff65df 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -264,6 +264,7 @@ static SysMouseImpl *alloc_device(REFGUI newDevice->wine_df->internal_format_size = Wine_InternalMouseFormat.dwDataSize; newDevice->wine_df->dt = NULL; newDevice->dinput = dinput; + newDevice->dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; return newDevice; } @@ -424,7 +425,6 @@ static HRESULT WINAPI SysMouseAImpl_SetD /* low-level mouse hook */ static LRESULT CALLBACK dinput_mouse_hook( int code, WPARAM wparam, LPARAM lparam ) { - LRESULT ret; MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = (SysMouseImpl*) current_lock; DWORD dwCoop; @@ -544,14 +544,11 @@ static LRESULT CALLBACK dinput_mouse_hoo LeaveCriticalSection(&(This->crit)); - if (dwCoop & DISCL_NONEXCLUSIVE) { - /* Pass the events down to previous handlers (e.g. win32 input) */ - ret = CallNextHookEx( 0, code, wparam, lparam ); - } else { - /* Ignore message */ - ret = 1; - } - return ret; + /* Ignore message */ + if (dwCoop & DISCL_EXCLUSIVE) return 1; + + /* Pass the events down to previous handlers (e.g. win32 input) */ + return CallNextHookEx( 0, code, wparam, lparam ); } static void dinput_window_check(SysMouseImpl* This) {

1 0

Andrew Talbot : ntdll: Cast-qual warning fix.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 589265918cc5a729baad20cca48d565757676db8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=589265918cc5a729baad20c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Sep 19 21:44:40 2006 +0100 ntdll: Cast-qual warning fix. --- dlls/ntdll/env.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index ae7ba3e..193237d 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -419,8 +419,8 @@ NTSTATUS WINAPI RtlCreateProcessParamete const UNICODE_STRING *ShellInfo, const UNICODE_STRING *RuntimeInfo ) { - static const WCHAR empty[] = {0}; - static const UNICODE_STRING empty_str = { 0, sizeof(empty), (WCHAR *)empty }; + static WCHAR empty[] = {0}; + static const UNICODE_STRING empty_str = { 0, sizeof(empty), empty }; static const UNICODE_STRING null_str = { 0, 0, NULL }; const RTL_USER_PROCESS_PARAMETERS *cur_params;

1 0

Andrew Talbot : msi: Cast-qual warnings fix.
by Alexandre Julliard Sept. 20, 2006

Sept. 20, 2006

Module: wine Branch: master Commit: 2e372c08b52f564eacab3558754f9413e80be6a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e372c08b52f564eacab355… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Sep 17 08:52:49 2006 +0100 msi: Cast-qual warnings fix. --- dlls/msi/action.c | 9 +++++---- dlls/msi/appsearch.c | 2 +- dlls/msi/registry.c | 4 ++-- dlls/msi/source.c | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f5d92e3..a1b7155 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -364,6 +364,7 @@ static UINT msi_parse_command_line( MSIP static LPWSTR* msi_split_string( LPCWSTR str, WCHAR sep ) { + LPCWSTR pc; LPWSTR p, *ret = NULL; UINT count = 0; @@ -371,11 +372,11 @@ static LPWSTR* msi_split_string( LPCWSTR return ret; /* count the number of substrings */ - for ( p = (LPWSTR)str, count = 0; p; count++ ) + for ( pc = str, count = 0; pc; count++ ) { - p = strchrW( p, sep ); - if (p) - p++; + pc = strchrW( pc, sep ); + if (pc) + pc++; } /* allocate space for an array of substring pointers and the substrings */ diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index b47ecec..9e65d6d 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -254,7 +254,7 @@ static void ACTION_ConvertRegValue(DWORD switch (regType) { case REG_SZ: - if (*(LPWSTR)value == '#') + if (*(LPCWSTR)value == '#') { /* escape leading pound with another */ *appValue = msi_alloc(sz + sizeof(WCHAR)); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index ddeb3a6..e31e343 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -334,7 +334,7 @@ LPWSTR msi_version_dword_to_str(DWORD ve LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) { DWORD len = value ? (lstrlenW(value) + 1) * sizeof (WCHAR) : 0; - return RegSetValueExW( hkey, name, 0, REG_SZ, (LPBYTE)value, len ); + return RegSetValueExW( hkey, name, 0, REG_SZ, (const BYTE *)value, len ); } LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value ) @@ -342,7 +342,7 @@ LONG msi_reg_set_val_multi_str( HKEY hke LPCWSTR p = value; while (*p) p += lstrlenW(p) + 1; return RegSetValueExW( hkey, name, 0, REG_MULTI_SZ, - (LPBYTE)value, (p + 1 - value) * sizeof(WCHAR) ); + (const BYTE *)value, (p + 1 - value) * sizeof(WCHAR) ); } LONG msi_reg_set_val_dword( HKEY hkey, LPCWSTR name, DWORD val ) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 7499429..388bd28 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -333,7 +333,7 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWS rc = OpenMediaSubkey(sourcekey, &key, FALSE); if (rc == ERROR_SUCCESS) rc = RegSetValueExW(key, INSTALLPROPERTY_MEDIAPACKAGEPATHW, 0, - REG_SZ, (LPBYTE)szValue, size); + REG_SZ, (const BYTE *)szValue, size); if (rc != ERROR_SUCCESS) rc = ERROR_UNKNOWN_PROPERTY; RegCloseKey(key); @@ -345,7 +345,7 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWS rc = OpenMediaSubkey(sourcekey, &key, FALSE); if (rc == ERROR_SUCCESS) rc = RegSetValueExW(key, INSTALLPROPERTY_DISKPROMPTW, 0, - REG_SZ, (LPBYTE)szValue, size); + REG_SZ, (const BYTE *)szValue, size); if (rc != ERROR_SUCCESS) rc = ERROR_UNKNOWN_PROPERTY; RegCloseKey(key); @@ -383,7 +383,7 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWS { DWORD size = lstrlenW(szValue)*sizeof(WCHAR); rc = RegSetValueExW(sourcekey, INSTALLPROPERTY_PACKAGENAMEW, 0, - REG_SZ, (LPBYTE)szValue, size); + REG_SZ, (const BYTE *)szValue, size); if (rc != ERROR_SUCCESS) rc = ERROR_UNKNOWN_PROPERTY; } @@ -532,7 +532,7 @@ UINT WINAPI MsiSourceListAddSourceExW( L current_index ++; sprintfW(source_struct.szIndex,fmt,current_index); rc = RegSetValueExW(typekey, source_struct.szIndex, 0, REG_EXPAND_SZ, - (LPBYTE)szSource, size); + (const BYTE *)szSource, size); } RegCloseKey(typekey);

1 0