Changeset 41

Timestamp:

05/16/11 14:06:27 (13 years ago)

Author:

sherbold

Message:

+ Added support for LOWORD/HIWORD usage when generating the LPARAM and WPARAM of single messages (sequences not yet supported)

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/EventGenerator.java (modified) (2 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/EventGenerator.java

@@ -396 +396 @@
                                 } else if (genMsgChild.getName().equals("LPARAM")) {
                                         String paramValueStr = getTermValue(null, termElement);
-                                        int paramValue = 0;
-                                        try {
-                                                paramValue = Integer.parseInt(paramValueStr);
-                                                generatedMessage.setLPARAM(paramValue);
-                                        } catch (NumberFormatException e) {
-                                                generatedMessage.setLPARAMasWindowDesc(paramValueStr);
+                                        long paramValue = 0;
+                                        Element loword = genMsgChild.getChild("LOWORD", rulesNamespace);
+                                        if( loword!=null ) {
+                                                paramValue = loHiWord(genMsgChild);
+                                        } else {
+                                                try {
+                                                        paramValue = Integer.parseInt(paramValueStr);
+                                                        generatedMessage.setLPARAM(paramValue);
+                                                } catch (NumberFormatException e) {
+                                                        generatedMessage.setLPARAMasWindowDesc(paramValueStr);
+                                                }
                                         }
                                 } else if (genMsgChild.getName().equals("WPARAM")) {
                                         String paramValueStr = getTermValue(null, termElement);
-                                        int paramValue = 0;
-                                        try {
-                                                paramValue = Integer.parseInt(paramValueStr);
-                                                generatedMessage.setWPARAM(paramValue);
-                                        } catch (NumberFormatException e) {
-                                                generatedMessage.setWPARAMasWindowDesc(paramValueStr);
+                                        long paramValue = 0;
+                                        Element loword = genMsgChild.getChild("LOWORD", rulesNamespace);
+                                        if( loword!=null ) {
+                                                paramValue = loHiWord(genMsgChild);
+                                        } else {
+                                                try {
+                                                        paramValue = Integer.parseInt(paramValueStr);
+                                                        generatedMessage.setWPARAM(paramValue);
+                                                } catch (NumberFormatException e) {
+                                                        generatedMessage.setWPARAMasWindowDesc(paramValueStr);
+                                                }
                                         }
                                 }
@@ -711 +721 @@
                 }
         }
+        
+        private long loHiWord(Element param) {
+                Element loword = param.getChild("LOWORD", rulesNamespace);
+                Element hiword = param.getChild("HIWORD", rulesNamespace);
+                String lowordStr = getTermValue(null, (Element) loword.getChildren().get(0));
+                String hiwordStr = getTermValue(null, (Element) hiword.getChildren().get(0));
+                return LOWORD(Integer.parseInt(lowordStr))+HIWORD(Integer.parseInt(hiwordStr));
+        }
+        
+        private static short LOWORD(long data) {
+                return (short) (data & 0xffff);
+        }
+
+        private static short HIWORD(long data) {
+                return (short) (data >> 16);
+        }
 
 }