ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user/tests: Write-strings warnings fix.

This commit is contained in:
Andrew Talbot 2006-07-26 22:22:05 +01:00 committed by Alexandre Julliard
parent d1617bea17
commit aa57a0b939
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/user/tests/menu.c
View File

@ -24,6 +24,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <assert.h> #include <assert.h>
#include "windef.h" #include "windef.h"
@ -75,7 +76,7 @@ static HMENU hMenus[4];
/* menu texts with their sizes */ /* menu texts with their sizes */
static struct { static struct {
char *text; LPCSTR text;
SIZE size; /* size of text up to any \t */ SIZE size; /* size of text up to any \t */
SIZE sc_size; /* size of the short-cut */ SIZE sc_size; /* size of the short-cut */
} MOD_txtsizes[] = { } MOD_txtsizes[] = {
@ -324,13 +325,14 @@ static void test_menu_ownerdraw(void)
/* helper for test_menu_bmp_and_string() */ /* helper for test_menu_bmp_and_string() */
static void test_mbs_help( int ispop, int hassub, int mnuopt, static void test_mbs_help( int ispop, int hassub, int mnuopt,
HWND hwnd, int arrowwidth, int count, HBITMAP hbmp, HWND hwnd, int arrowwidth, int count, HBITMAP hbmp,
SIZE bmpsize, char *text, SIZE size, SIZE sc_size) SIZE bmpsize, LPCSTR text, SIZE size, SIZE sc_size)
{ {
BOOL ret; BOOL ret;
HMENU hmenu, submenu; HMENU hmenu, submenu;
MENUITEMINFO mii={ sizeof( MENUITEMINFO )}; MENUITEMINFO mii={ sizeof( MENUITEMINFO )};
MENUINFO mi; MENUINFO mi;
RECT rc; RECT rc;
CHAR text_copy[16];
int hastab, expect; int hastab, expect;
int failed = 0; int failed = 0;
@ -344,7 +346,8 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt,
if( text ) { if( text ) {
char *p; char *p;
mii.fMask |= MIIM_STRING; mii.fMask |= MIIM_STRING;
mii.dwTypeData = text; strcpy(text_copy, text);
mii.dwTypeData = text_copy; /* structure member declared non-const */
if( ( p = strchr( text, '\t'))) { if( ( p = strchr( text, '\t'))) {
hastab = *(p + 1) ? 2 : 1; hastab = *(p + 1) ? 2 : 1;
} }