December 2008 - Wine-commits

Alexandre Julliard : imm32/tests: Don't use a pointer in an ok test.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 7801b692cbac84386707b26a8bc5c389f449c025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7801b692cbac84386707b26a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:13:21 2008 +0100 imm32/tests: Don't use a pointer in an ok test. --- dlls/imm32/tests/imm32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index f56437c..ce73639 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -258,7 +258,7 @@ static void test_ImmSetCompositionString(void) SetLastError(0xdeadbeef); imc = ImmGetContext(hwnd); - ok(imc, "ImmGetContext() failed. Last error: %u\n", GetLastError()); + ok(imc != 0, "ImmGetContext() failed. Last error: %u\n", GetLastError()); if (!imc) return;

1 0

Alexandre Julliard : ntdll/tests: Use the correct prototype for RtlAllocateHeap/RtlReAllocateHeap.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 2e83689b77bd5c6604e03401e018a870b6db35c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e83689b77bd5c6604e03401e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:14:17 2008 +0100 ntdll/tests: Use the correct prototype for RtlAllocateHeap/RtlReAllocateHeap. --- dlls/ntdll/tests/reg.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 1525bb1..0e25c06 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -134,11 +134,11 @@ static NTSTATUS (WINAPI * pNtSetValueKey)( PHKEY, const PUNICODE_STRING, ULONG, ULONG, const PVOID, ULONG ); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(PUNICODE_STRING); static NTSTATUS (WINAPI * pRtlCreateUnicodeString)( PUNICODE_STRING, LPCWSTR); -static NTSTATUS (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); +static LPVOID (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); static NTSTATUS (WINAPI * pRtlAppendUnicodeToString)(PUNICODE_STRING, PCWSTR); static NTSTATUS (WINAPI * pRtlUnicodeStringToAnsiString)(PSTRING, PUNICODE_STRING, BOOL); static NTSTATUS (WINAPI * pRtlFreeHeap)(PVOID, ULONG, PVOID); -static NTSTATUS (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); +static LPVOID (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); static NTSTATUS (WINAPI * pRtlZeroMemory)(PVOID, ULONG); static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*); @@ -200,7 +200,7 @@ static NTSTATUS WINAPI QueryRoutine (IN PCWSTR ValueName, IN ULONG ValueType, IN { ValueNameLength = lstrlenW(ValueName); - ValName = (LPSTR)pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength); + ValName = pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength); WideCharToMultiByte(0, 0, ValueName, ValueNameLength+1,ValName, ValueNameLength, 0, 0); @@ -213,12 +213,12 @@ static NTSTATUS WINAPI QueryRoutine (IN PCWSTR ValueName, IN ULONG ValueType, IN { case REG_NONE: trace("ValueType: REG_NONE\n"); - trace("ValueData: %d\n", (int)ValueData); + trace("ValueData: %p\n", ValueData); break; case REG_BINARY: trace("ValueType: REG_BINARY\n"); - trace("ValueData: %d\n", (int)ValueData); + trace("ValueData: %p\n", ValueData); break; case REG_SZ: @@ -238,7 +238,7 @@ static NTSTATUS WINAPI QueryRoutine (IN PCWSTR ValueName, IN ULONG ValueType, IN case REG_DWORD: trace("ValueType: REG_DWORD\n"); - trace("ValueData: %d\n", (int)ValueData); + trace("ValueData: %p\n", ValueData); break; }; trace("ValueLength: %d\n", (int)ValueLength); @@ -295,7 +295,7 @@ static void test_RtlQueryRegistryValues(void) PRTL_QUERY_REGISTRY_TABLE QueryTable = NULL; RelativeTo = RTL_REGISTRY_ABSOLUTE;/*Only using absolute - no need to test all relativeto variables*/ - QueryTable = (PRTL_QUERY_REGISTRY_TABLE)pRtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_QUERY_REGISTRY_TABLE)*26); + QueryTable = pRtlAllocateHeap(GetProcessHeap(), 0, sizeof(RTL_QUERY_REGISTRY_TABLE)*26); pRtlZeroMemory( QueryTable, sizeof(RTL_QUERY_REGISTRY_TABLE) * 26); @@ -601,7 +601,7 @@ START_TEST(reg) if(!InitFunctionPtrs()) return; pRtlFormatCurrentUserKeyPath(&winetestpath); - winetestpath.Buffer = (PWSTR)pRtlReAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, winetestpath.Buffer, + winetestpath.Buffer = pRtlReAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, winetestpath.Buffer, winetestpath.MaximumLength + sizeof(winetest)*sizeof(WCHAR)); winetestpath.MaximumLength = winetestpath.MaximumLength + sizeof(winetest)*sizeof(WCHAR);

1 0

Alexandre Julliard : Define _WIN32_WINNT before including any headers.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: c03917c17344a817e0c562d971da87f44ada3bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03917c17344a817e0c562d97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:10:16 2008 +0100 Define _WIN32_WINNT before including any headers. --- dlls/comctl32/tests/subclass.c | 4 ++-- dlls/kernel32/tests/file.c | 6 +++--- dlls/kernel32/tests/sync.c | 2 +- dlls/shell32/tests/shlexec.c | 6 +++--- dlls/user32/tests/broadcast.c | 4 ++-- dlls/user32/tests/msg.c | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 9c879e3..c225f72 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -17,11 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _WIN32_WINNT 0x0501 /* For SetWindowSubclass/etc */ + #include <assert.h> #include <stdarg.h> -#define _WIN32_WINNT 0x0501 /* For SetWindowSubclass/etc */ - #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b045025..338ba46 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -20,13 +20,13 @@ * */ +/* ReplaceFile requires Windows 2000 or newer */ +#define _WIN32_WINNT 0x0500 + #include <stdarg.h> #include <stdlib.h> #include <time.h> -/* ReplaceFile requires Windows 2000 or newer */ -#define _WIN32_WINNT 0x0500 - #include "wine/test.h" #include "windef.h" #include "winbase.h" diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 9f811bc..bb9afe3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _WIN32_WINNT 0x500 #include <stdarg.h> #include <stdlib.h> #include <stdio.h> #include <windef.h> -#define _WIN32_WINNT 0x500 #include <winbase.h> #include "wine/test.h" diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ac7915a..80ccdf7 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -32,14 +32,14 @@ * we could check */ -#include <stdio.h> -#include <assert.h> - /* Needed to get SEE_MASK_NOZONECHECKS with the PSDK */ #define NTDDI_WINXPSP1 0x05010100 #define NTDDI_VERSION NTDDI_WINXPSP1 #define _WIN32_WINNT 0x0501 +#include <stdio.h> +#include <assert.h> + #include "wtypes.h" #include "winbase.h" #include "windef.h" diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index ae9cd29..b0990e3 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _WIN32_WINNT 0x0501 + #include <assert.h> #include <stdarg.h> #include <stdio.h> -#define _WIN32_WINNT 0x0501 - #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2c3dea5..f4496a7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -20,12 +20,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _WIN32_WINNT 0x0501 /* For WM_CHANGEUISTATE,QS_RAWINPUT */ + #include <assert.h> #include <stdarg.h> #include <stdio.h> -#define _WIN32_WINNT 0x0501 /* For WM_CHANGEUISTATE,QS_RAWINPUT */ - #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Michael Stefaniuc : ws2_32/tests: Remove some superfluous casts.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: e948b2bf7e1b19ac80977c9b341acee7fc1f622f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e948b2bf7e1b19ac80977c9b3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 4 05:32:23 2008 +0100 ws2_32/tests: Remove some superfluous casts. --- dlls/ws2_32/tests/sock.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ceb9281..5250ccc 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -317,7 +317,7 @@ static void server_start ( server_params *par ) { int i; test_params *gen = par->general; - server_memory *mem = (LPVOID) LocalAlloc ( LPTR, sizeof (server_memory)); + server_memory *mem = LocalAlloc ( LPTR, sizeof ( server_memory ) ); TlsSetValue ( tls, mem ); mem->s = WSASocketA ( AF_INET, gen->sock_type, gen->sock_prot, @@ -331,7 +331,7 @@ static void server_start ( server_params *par ) for (i = 0; i < MAX_CLIENTS; i++) { mem->sock[i].s = INVALID_SOCKET; - mem->sock[i].buf = (LPVOID) LocalAlloc ( LPTR, gen->n_chunks * gen->chunk_size ); + mem->sock[i].buf = LocalAlloc ( LPTR, gen->n_chunks * gen->chunk_size ); mem->sock[i].n_recvd = 0; mem->sock[i].n_sent = 0; } @@ -347,12 +347,12 @@ static void server_stop (void) for (i = 0; i < MAX_CLIENTS; i++ ) { - LocalFree ( (HANDLE) mem->sock[i].buf ); + LocalFree ( mem->sock[i].buf ); if ( mem->sock[i].s != INVALID_SOCKET ) closesocket ( mem->sock[i].s ); } ok ( closesocket ( mem->s ) == 0, "closesocket failed\n" ); - LocalFree ( (HANDLE) mem ); + LocalFree ( mem ); ExitThread ( GetCurrentThreadId () ); } @@ -361,7 +361,7 @@ static void server_stop (void) static void client_start ( client_params *par ) { test_params *gen = par->general; - client_memory *mem = (LPVOID) LocalAlloc (LPTR, sizeof (client_memory)); + client_memory *mem = LocalAlloc (LPTR, sizeof (client_memory)); TlsSetValue ( tls, mem ); @@ -376,7 +376,7 @@ static void client_start ( client_params *par ) ok ( mem->s != INVALID_SOCKET, "Client: WSASocket failed\n" ); - mem->send_buf = (LPVOID) LocalAlloc ( LPTR, 2 * gen->n_chunks * gen->chunk_size ); + mem->send_buf = LocalAlloc ( LPTR, 2 * gen->n_chunks * gen->chunk_size ); mem->recv_buf = mem->send_buf + gen->n_chunks * gen->chunk_size; fill_buffer ( mem->send_buf, gen->chunk_size, gen->n_chunks ); @@ -389,8 +389,8 @@ static void client_stop (void) { client_memory *mem = TlsGetValue ( tls ); wsa_ok ( closesocket ( mem->s ), 0 ==, "closesocket error (%x): %d\n" ); - LocalFree ( (HANDLE) mem->send_buf ); - LocalFree ( (HANDLE) mem ); + LocalFree ( mem->send_buf ); + LocalFree ( mem ); ExitThread(0); }

1 0

Francois Gouget : Make sure we have a space before the ellipses in Slovenian resources.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 23e6e7be8ee648c1969e004a0bff73a08b6f3e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e6e7be8ee648c1969e004a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 4 09:22:13 2008 +0100 Make sure we have a space before the ellipses in Slovenian resources. --- dlls/avifil32/avifile_Si.rc | 2 +- dlls/browseui/rsrc_Si.rc | 2 +- dlls/comdlg32/cdlg_Si.rc | 6 +++--- dlls/gphoto2.ds/gphoto2_Si.rc | 4 ++-- dlls/sane.ds/sane_Si.rc | 2 +- dlls/shdoclc/Si.rc | 32 ++++++++++++++++---------------- dlls/user32/resources/user32_Si.rc | 6 +++--- programs/clock/Si.rc | 2 +- programs/regedit/Si.rc | 4 ++-- programs/winefile/Si.rc | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23e6e7be8ee648c1969e0…

1 0

Michael Stefaniuc : winecfg: Remove some superfluous casts.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 7a2f3bf7ee8a3d3aca1ca09c1049ac226327ab42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2f3bf7ee8a3d3aca1ca09c1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 4 05:31:26 2008 +0100 winecfg: Remove some superfluous casts. --- programs/winecfg/libraries.c | 2 +- programs/winecfg/theme.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 92dd970..6abe04d 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -495,7 +495,7 @@ static void on_add_click(HWND dialog) load_library_settings(dialog); - SendDlgItemMessage(dialog, IDC_DLLS_LIST, LB_SELECTSTRING, (WPARAM) 0, (LPARAM) buffer); + SendDlgItemMessage(dialog, IDC_DLLS_LIST, LB_SELECTSTRING, 0, (LPARAM) buffer); set_controls_from_selection(dialog); } diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 9b7e857..d87aba0 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -302,7 +302,7 @@ static BOOL fill_theme_list (HWND comboTheme, HWND comboColor, HWND comboSize) for (i = 0; i < themeFilesCount; i++) { - ThemeFile* item = (ThemeFile*)DSA_GetItemPtr (themeFiles, i); + ThemeFile* item = DSA_GetItemPtr (themeFiles, i); SendMessageW (comboTheme, CB_ADDSTRING, 0, (LPARAM)item->fancyName); } @@ -316,7 +316,7 @@ static BOOL fill_theme_list (HWND comboTheme, HWND comboColor, HWND comboSize) BOOL found = FALSE; for (i = 0; i < themeFilesCount; i++) { - theme = (ThemeFile*)DSA_GetItemPtr (themeFiles, i); + theme = DSA_GetItemPtr (themeFiles, i); if (lstrcmpiW (theme->themeFileName, currentTheme) == 0) { found = TRUE; @@ -332,8 +332,7 @@ static BOOL fill_theme_list (HWND comboTheme, HWND comboColor, HWND comboSize) myEnumThemeProc (NULL, currentTheme, currentTheme, currentTheme, NULL, NULL); themeIndex = themeFilesCount; - theme = (ThemeFile*)DSA_GetItemPtr (themeFiles, - themeFilesCount-1); + theme = DSA_GetItemPtr (themeFiles, themeFilesCount-1); } fill_color_size_combos (theme, comboColor, comboSize); select_color_and_size (theme, currentColor, comboColor, @@ -364,8 +363,7 @@ static BOOL update_color_and_size (int themeIndex, HWND comboColor, WCHAR currentTheme[MAX_PATH]; WCHAR currentColor[MAX_PATH]; WCHAR currentSize[MAX_PATH]; - ThemeFile* theme = - (ThemeFile*)DSA_GetItemPtr (themeFiles, themeIndex - 1); + ThemeFile* theme = DSA_GetItemPtr (themeFiles, themeIndex - 1); fill_color_size_combos (theme, comboColor, comboSize); @@ -399,8 +397,7 @@ static void do_apply_theme (int themeIndex, int colorIndex, int sizeIndex) } else { - ThemeFile* theme = - (ThemeFile*)DSA_GetItemPtr (themeFiles, themeIndex-1); + ThemeFile* theme = DSA_GetItemPtr (themeFiles, themeIndex-1); const WCHAR* themeFileName = theme->themeFileName; const WCHAR* colorName = NULL; const WCHAR* sizeName = NULL;

1 0

Michael Stefaniuc : cmd: Remove some superfluous casts.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: cf8571fed030e82bbf1303c1065026b385097f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8571fed030e82bbf1303c10… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 4 05:31:43 2008 +0100 cmd: Remove some superfluous casts. --- programs/cmd/batch.c | 4 ++-- programs/cmd/directory.c | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 3748f21..0044f70 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -89,7 +89,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN */ prev_context = context; - context = (BATCH_CONTEXT *)LocalAlloc (LMEM_FIXED, sizeof (BATCH_CONTEXT)); + context = LocalAlloc (LMEM_FIXED, sizeof (BATCH_CONTEXT)); context -> h = h; context -> command = command; memset(context -> shift_count, 0x00, sizeof(context -> shift_count)); @@ -122,7 +122,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN * to the caller's caller. */ - LocalFree ((HANDLE)context); + LocalFree (context); if ((prev_context != NULL) && (!called)) { prev_context -> skip_rest = TRUE; context = prev_context; diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 2082d6e..c70fca5 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -938,7 +938,7 @@ void WCMD_getfileowner(WCHAR *filename, WCHAR *owner, int ownerlen) { ULONG domainLen = MAXSTRING; SID_NAME_USE nameuse; - secBuffer = (LPBYTE) HeapAlloc(GetProcessHeap(),0,sizeNeeded * sizeof(BYTE)); + secBuffer = HeapAlloc(GetProcessHeap(),0,sizeNeeded * sizeof(BYTE)); if(!secBuffer) return; /* Get the owners security descriptor */ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 454bd3c..0771e2e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1348,7 +1348,7 @@ void WCMD_print_error (void) { WCMD_output_asis_len(lpMsgBuf, lstrlen(lpMsgBuf), GetStdHandle(STD_ERROR_HANDLE)); - LocalFree ((HLOCAL)lpMsgBuf); + LocalFree (lpMsgBuf); WCMD_output_asis_len (newline, lstrlen(newline), GetStdHandle(STD_ERROR_HANDLE)); return;

1 0

Michael Stefaniuc : regedit: Remove some superfluous casts.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 683c53db423b02ef4bb9ed2c851d5cd212120f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=683c53db423b02ef4bb9ed2c8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 4 05:32:06 2008 +0100 regedit: Remove some superfluous casts. --- programs/regedit/framewnd.c | 2 +- programs/regedit/main.c | 4 ++-- programs/regedit/regproc.c | 2 +- programs/regedit/treeview.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index a801703..5b19899 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -89,7 +89,7 @@ static void OnEnterMenuLoop(HWND hWnd) nParts = -1; SendMessageW(hStatusBar, SB_SETPARTS, 1, (long)&nParts); bInMenuLoop = TRUE; - SendMessageW(hStatusBar, SB_SETTEXTW, (WPARAM)0, (LPARAM)&empty); + SendMessageW(hStatusBar, SB_SETTEXTW, 0, (LPARAM)&empty); } static void OnExitMenuLoop(HWND hWnd) diff --git a/programs/regedit/main.c b/programs/regedit/main.c index 6fe129a..27bc26f 100644 --- a/programs/regedit/main.c +++ b/programs/regedit/main.c @@ -92,7 +92,7 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) 0/*hbrBackground*/, 0/*lpszMenuName*/, szFrameClass, - (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, + LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED) }; ATOM hFrameWndClass = RegisterClassEx(&wcFrame); /* register frame window class */ @@ -109,7 +109,7 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) 0/*hbrBackground*/, 0/*lpszMenuName*/, szChildClass, - (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, + LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED) }; diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 028789a..a4e8936 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -860,7 +860,7 @@ static void REGPROC_print_error(void) exit(1); } puts(lpMsgBuf); - LocalFree((HLOCAL)lpMsgBuf); + LocalFree(lpMsgBuf); exit(1); } diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index f51ccfd..20d1b76 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -194,7 +194,7 @@ static HTREEITEM AddEntryToTree(HWND hwndTV, HTREEITEM hParent, LPWSTR label, HK tvins.u.item.iSelectedImage = Image_Open; tvins.u.item.cChildren = dwChildren; tvins.u.item.lParam = (LPARAM)hKey; - tvins.hInsertAfter = (HTREEITEM)(hKey ? TVI_LAST : TVI_SORT); + tvins.hInsertAfter = hKey ? TVI_LAST : TVI_SORT; tvins.hParent = hParent; return TreeView_InsertItemW(hwndTV, &tvins); @@ -533,7 +533,7 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) tvins.u.item.cChildren = 5; /* Save the heading level in the item's application-defined data area. */ tvins.u.item.lParam = 0; - tvins.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvins.hInsertAfter = TVI_FIRST; tvins.hParent = TVI_ROOT; /* Add the item to the tree view control. */ if (!(hRoot = TreeView_InsertItemW(hwndTV, &tvins))) return FALSE;

1 0

Andrew Talbot : dxgi: Memory allocation size fix.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: c3b27ceb4de51c7116c986f454cc4e7ab0b6dd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3b27ceb4de51c7116c986f45… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 3 17:42:06 2008 +0000 dxgi: Memory allocation size fix. --- dlls/dxgi/dxgi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 370fcdd..eaf7b06 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -110,7 +110,7 @@ HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) for (i = 0; i < object->adapter_count; ++i) { - struct dxgi_adapter *adapter = HeapAlloc(GetProcessHeap(), 0, sizeof(**object->adapters)); + struct dxgi_adapter *adapter = HeapAlloc(GetProcessHeap(), 0, sizeof(*adapter)); if (!adapter) { UINT j;

1 0

Andrew Talbot : wineoss.drv: Sign-compare warnings fix.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 209fe1ec55bf5fe95e4a79bbfd42c5f900a7b103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209fe1ec55bf5fe95e4a79bbf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 3 17:42:10 2008 +0000 wineoss.drv: Sign-compare warnings fix. --- dlls/wineoss.drv/audio.c | 19 +++++++++++-------- dlls/wineoss.drv/dscapture.c | 2 +- dlls/wineoss.drv/dsrender.c | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index ce56b3a..3a8d3ad 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -701,7 +701,8 @@ static void OSS_Info(int fd) static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev) { int rc,arg; - int f,c,r; + int f,c; + unsigned int r; BOOL has_mixer = FALSE; TRACE("(%p) %s\n", ossdev, ossdev->dev_name); @@ -876,7 +877,8 @@ static BOOL OSS_WaveOutInit(OSS_DEVICE* ossdev) static BOOL OSS_WaveInInit(OSS_DEVICE* ossdev) { int rc,arg; - int f,c,r; + int f,c; + unsigned int r; TRACE("(%p) %s\n", ossdev, ossdev->dev_name); if (OSS_OpenDevice(ossdev, O_RDONLY, NULL, 0,-1,-1,-1) != 0) @@ -1004,7 +1006,8 @@ static BOOL OSS_WaveInInit(OSS_DEVICE* ossdev) static void OSS_WaveFullDuplexInit(OSS_DEVICE* ossdev) { int rc,arg; - int f,c,r; + int f,c; + unsigned int r; int caps; BOOL has_mixer = FALSE; TRACE("(%p) %s\n", ossdev, ossdev->dev_name); @@ -1149,7 +1152,7 @@ static char* StrDup(const char* str, const char* def) LRESULT OSS_WaveInit(void) { char* str; - int i; + unsigned int i; /* FIXME: Remove unneeded members of WOutDev and WInDev */ TRACE("()\n"); @@ -1172,9 +1175,9 @@ LRESULT OSS_WaveInit(void) for (i = 1; i < MAX_WAVEDRV; ++i) { WOutDev[i].ossdev.dev_name = WInDev[i].ossdev.dev_name = HeapAlloc(GetProcessHeap(),0,11); - sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%d", i); + sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%u", i); WOutDev[i].ossdev.mixer_name = WInDev[i].ossdev.mixer_name = HeapAlloc(GetProcessHeap(),0,13); - sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%d", i); + sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%u", i); } } @@ -1213,13 +1216,13 @@ LRESULT OSS_WaveInit(void) TRACE("%d wave out devices\n", numOutDev); for (i = 0; i < numOutDev; i++) { - TRACE("%d: %s, %s, %s\n", i, WOutDev[i].ossdev.dev_name, + TRACE("%u: %s, %s, %s\n", i, WOutDev[i].ossdev.dev_name, WOutDev[i].ossdev.mixer_name, WOutDev[i].ossdev.interface_name); } TRACE("%d wave in devices\n", numInDev); for (i = 0; i < numInDev; i++) { - TRACE("%d: %s, %s, %s\n", i, WInDev[i].ossdev.dev_name, + TRACE("%u: %s, %s, %s\n", i, WInDev[i].ossdev.dev_name, WInDev[i].ossdev.mixer_name, WInDev[i].ossdev.interface_name); } diff --git a/dlls/wineoss.drv/dscapture.c b/dlls/wineoss.drv/dscapture.c index 6df133a..8849644 100644 --- a/dlls/wineoss.drv/dscapture.c +++ b/dlls/wineoss.drv/dscapture.c @@ -317,7 +317,7 @@ static HRESULT WINAPI IDsCaptureDriverNotifyImpl_SetNotificationPositions( } if (TRACE_ON(dscapture)) { - int i; + DWORD i; for (i=0;i<howmuch;i++) TRACE("notify at %d to 0x%08lx\n", notify[i].dwOffset,(DWORD_PTR)notify[i].hEventNotify); diff --git a/dlls/wineoss.drv/dsrender.c b/dlls/wineoss.drv/dsrender.c index 79aa2ea..de704d0 100644 --- a/dlls/wineoss.drv/dsrender.c +++ b/dlls/wineoss.drv/dsrender.c @@ -303,7 +303,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_SetNotificationPositions( } if (TRACE_ON(wave)) { - int i; + DWORD i; for (i=0;i<howmuch;i++) TRACE("notify at %d to 0x%08lx\n", notify[i].dwOffset,(DWORD_PTR)notify[i].hEventNotify);

1 0