wine-commits December 2008

wine-commits@winehq.org

2 participants
1225 discussions

Alexandre Julliard : gdiplus/tests: Don't cast pointers to integers.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: dbee72d568f4d74fcafbda17cad4ce301da5db95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbee72d568f4d74fcafbda17c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:13:01 2008 +0100 gdiplus/tests: Don't cast pointers to integers. --- dlls/gdiplus/tests/image.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 4d93da4..6000dde 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -42,20 +42,17 @@ static void test_Scan0(void) bm = (GpBitmap*)0xdeadbeef; stat = GdipCreateBitmapFromScan0(10, -10, 10, PixelFormat24bppRGB, NULL, &bm); expect(InvalidParameter, stat); - - expect(NULL, bm); + ok( !bm, "expected null bitmap\n" ); bm = (GpBitmap*)0xdeadbeef; stat = GdipCreateBitmapFromScan0(-10, 10, 10, PixelFormat24bppRGB, NULL, &bm); expect(InvalidParameter, stat); - - expect(NULL, bm); + ok( !bm, "expected null bitmap\n" ); bm = (GpBitmap*)0xdeadbeef; stat = GdipCreateBitmapFromScan0(10, 0, 10, PixelFormat24bppRGB, NULL, &bm); expect(InvalidParameter, stat); - - expect(NULL, bm); + ok( !bm, "expected null bitmap\n" ); bm = NULL; stat = GdipCreateBitmapFromScan0(10, 10, 12, PixelFormat24bppRGB, buff, &bm); @@ -67,12 +64,12 @@ static void test_Scan0(void) bm = (GpBitmap*) 0xdeadbeef; stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, buff, &bm); expect(InvalidParameter, stat); - expect(NULL, bm); + ok( !bm, "expected null bitmap\n" ); bm = (GpBitmap*)0xdeadbeef; stat = GdipCreateBitmapFromScan0(10, 10, 0, PixelFormat24bppRGB, buff, &bm); expect(InvalidParameter, stat); - expect(0xdeadbeef, bm); + ok( bm == (GpBitmap*)0xdeadbeef, "expected deadbeef bitmap\n" ); bm = NULL; stat = GdipCreateBitmapFromScan0(10, 10, -8, PixelFormat24bppRGB, buff, &bm); @@ -86,7 +83,7 @@ static void test_Scan0(void) bm = (GpBitmap*)0xdeadbeef; stat = GdipCreateBitmapFromScan0(10, 10, -10, PixelFormat24bppRGB, buff, &bm); expect(InvalidParameter, stat); - expect(NULL, bm); + ok( !bm, "expected null bitmap\n" ); } static void test_GetImageDimension(void)

1 0

Alexandre Julliard : comctl32/tests: Avoid handle casts in traces.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: acdcb19cbb322eda88c801b3dee414f1e563a437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acdcb19cbb322eda88c801b3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 4 12:12:29 2008 +0100 comctl32/tests: Avoid handle casts in traces. --- dlls/comctl32/tests/header.c | 6 +++--- dlls/comctl32/tests/tooltips.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index e6a2524..c0ff7cd 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -984,13 +984,13 @@ static void test_hdm_imageMessages(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); hImageListRetVal = (HIMAGELIST) SendMessage(hChild, HDM_SETIMAGELIST, 0, (LPARAM) hImageList); - ok(hImageListRetVal == NULL, "Expected NULL, got %d\n", (int) hImageListRetVal); + ok(hImageListRetVal == NULL, "Expected NULL, got %p\n", hImageListRetVal); hImageListRetVal = (HIMAGELIST) SendMessage(hChild, HDM_GETIMAGELIST, 0, 0); - ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %d\n", (int) hImageListRetVal); + ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %p\n", hImageListRetVal); hImageListRetVal = (HIMAGELIST) SendMessage(hChild, HDM_CREATEDRAGIMAGE, 0, 0); - ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %d\n", (int) hImageListRetVal); + ok(hImageListRetVal != NULL, "Expected non-NULL handle, got %p\n", hImageListRetVal); ok_sequence(sequences, HEADER_SEQ_INDEX, imageMessages_seq, "imageMessages sequence testing", FALSE); diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index b3f28fd..4c708a0 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -101,8 +101,8 @@ static LRESULT CALLBACK CustomDrawWndProc(HWND hWnd, UINT msg, WPARAM wParam, LP case WM_NOTIFY: if (((NMHDR *)lParam)->code == NM_CUSTOMDRAW) { NMTTCUSTOMDRAW *ttcd = (NMTTCUSTOMDRAW*) lParam; - ok(ttcd->nmcd.hdr.hwndFrom == g_hwnd, "Unexpected hwnd source %x (%x)\n", - (int)ttcd->nmcd.hdr.hwndFrom, (int) g_hwnd); + ok(ttcd->nmcd.hdr.hwndFrom == g_hwnd, "Unexpected hwnd source %p (%p)\n", + ttcd->nmcd.hdr.hwndFrom, g_hwnd); ok(ttcd->nmcd.hdr.idFrom == 0x1234ABCD, "Unexpected id %x\n", (int)ttcd->nmcd.hdr.idFrom); switch (ttcd->nmcd.dwDrawStage) {

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

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

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 : 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

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

Francois Gouget : cmdlgtst: Fix an ellipsis in the copyright message.
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: 4365a07d470ab10aea6e4c726da1bdd128a6d3be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4365a07d470ab10aea6e4c726… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 4 09:22:09 2008 +0100 cmdlgtst: Fix an ellipsis in the copyright message. --- programs/cmdlgtst/Cs.rc | 4 ++-- programs/cmdlgtst/De.rc | 4 ++-- programs/cmdlgtst/En.rc | 4 ++-- programs/cmdlgtst/Es.rc | 4 ++-- programs/cmdlgtst/It.rc | 4 ++-- programs/cmdlgtst/Ja.rc | 4 ++-- programs/cmdlgtst/Ko.rc | 4 ++-- programs/cmdlgtst/Nl.rc | 4 ++-- programs/cmdlgtst/Pt.rc | 8 ++++---- programs/cmdlgtst/Si.rc | 4 ++-- programs/cmdlgtst/Tr.rc | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4365a07d470ab10aea6e4…

1 0

Rob Shearman : winspool.drv: Use CP_UNIXCP instead of CP_ACP for data that is going to or coming from system library functions .
by Alexandre Julliard 04 Dec '08

04 Dec '08

Module: wine Branch: master Commit: e47495c6e2a090a01160d4872108917b15f035b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47495c6e2a090a01160d4872… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 3 18:24:50 2008 +0000 winspool.drv: Use CP_UNIXCP instead of CP_ACP for data that is going to or coming from system library functions. --- dlls/winspool.drv/info.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 6e6b4ad..052ecc1 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7603,24 +7603,24 @@ static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR docume #ifdef SONAME_LIBCUPS if(pcupsPrintFile) { - char *unixname, *queue, *doc_titleA; + char *unixname, *queue, *unix_doc_title; DWORD len; BOOL ret; if(!(unixname = wine_get_unix_file_name(filename))) return FALSE; - len = WideCharToMultiByte(CP_ACP, 0, printer_name, -1, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_UNIXCP, 0, printer_name, -1, NULL, 0, NULL, NULL); queue = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, printer_name, -1, queue, len, NULL, NULL); + WideCharToMultiByte(CP_UNIXCP, 0, printer_name, -1, queue, len, NULL, NULL); - len = WideCharToMultiByte(CP_ACP, 0, document_title, -1, NULL, 0, NULL, NULL); - doc_titleA = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, document_title, -1, doc_titleA, len, NULL, NULL); + len = WideCharToMultiByte(CP_UNIXCP, 0, document_title, -1, NULL, 0, NULL, NULL); + unix_doc_title = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_UNIXCP, 0, document_title, -1, unix_doc_title, len, NULL, NULL); TRACE("printing via cups\n"); - ret = pcupsPrintFile(queue, unixname, doc_titleA, 0, NULL); - HeapFree(GetProcessHeap(), 0, doc_titleA); + ret = pcupsPrintFile(queue, unixname, unix_doc_title, 0, NULL); + HeapFree(GetProcessHeap(), 0, unix_doc_title); HeapFree(GetProcessHeap(), 0, queue); HeapFree(GetProcessHeap(), 0, unixname); return ret; @@ -7739,9 +7739,9 @@ static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) if(!(unixname = wine_get_unix_file_name(filename))) return FALSE; - len = WideCharToMultiByte(CP_ACP, 0, cmd, -1, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, NULL, 0, NULL, NULL); cmdA = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, cmd, -1, cmdA, len, NULL, NULL); + WideCharToMultiByte(CP_UNIXCP, 0, cmd, -1, cmdA, len, NULL, NULL); TRACE("printing with: %s\n", cmdA); @@ -7800,9 +7800,9 @@ static BOOL schedule_unixfile(LPCWSTR output, LPCWSTR filename) if(!(unixname = wine_get_unix_file_name(filename))) return FALSE; - len = WideCharToMultiByte(CP_ACP, 0, output, -1, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_UNIXCP, 0, output, -1, NULL, 0, NULL, NULL); outputA = HeapAlloc(GetProcessHeap(), 0, len); - WideCharToMultiByte(CP_ACP, 0, output, -1, outputA, len, NULL, NULL); + WideCharToMultiByte(CP_UNIXCP, 0, output, -1, outputA, len, NULL, NULL); out_fd = open(outputA, O_CREAT | O_TRUNC | O_WRONLY, 0666); in_fd = open(unixname, O_RDONLY);

1 0

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 December 2008