user/tests: Write-strings warnings fix (Try 2)

Andrew Talbot Andrew.Talbot at talbotville.com
Wed Jul 26 16:22:05 CDT 2006


Changelog:
    user/tests: Write-strings warnings fix.

diff -urN a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c
--- a/dlls/user/tests/menu.c	2006-07-06 12:11:00.000000000 +0100
+++ b/dlls/user/tests/menu.c	2006-07-26 22:00:59.000000000 +0100
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 #include <assert.h>
 
 #include "windef.h"
@@ -75,7 +76,7 @@
 
  /* menu texts with their sizes */
 static struct {
-    char *text;
+    LPCSTR text;
     SIZE size; /* size of text up to any \t */
     SIZE sc_size; /* size of the short-cut */
 } MOD_txtsizes[] = {
@@ -324,13 +325,14 @@
 /* helper for test_menu_bmp_and_string() */
 static void test_mbs_help( int ispop, int hassub, int mnuopt,
         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;
     HMENU hmenu, submenu;
     MENUITEMINFO mii={ sizeof( MENUITEMINFO )};
     MENUINFO mi;
     RECT rc;
+    CHAR text_copy[16];
     int hastab,  expect;
     int failed = 0;
 
@@ -344,7 +346,8 @@
     if( text ) {
         char *p;
         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'))) {
             hastab = *(p + 1) ? 2 : 1;
         }



More information about the wine-patches mailing list