Optionally repack nonpower 2 textures to the expected span length when
a textures is locked. This is necessary for buggy games like Warhammer
40k that don't work with the odd span sizes produce by default
nonpower 2 support.

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 4b2c781..84edf86 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -110,21 +110,26 @@
 /**
  * Settings 
  */
-#define VS_NONE 0
-#define VS_HW   1
-#define VS_SW   2
+#define VS_NONE    0
+#define VS_HW      1
+#define VS_SW      2
 
-#define PS_NONE 0
-#define PS_HW   1
+#define PS_NONE    0
+#define PS_HW      1
 
-#define VBO_NONE 0
-#define VBO_HW   1
+#define VBO_NONE   0
+#define VBO_HW     1
+
+#define NP2_NONE   0
+#define NP2_REPACK 1
 
 typedef struct wined3d_settings_s {
 /* vertex and pixel shader modes */
   int vs_mode;
   int ps_mode;
   int vbo_mode;
+/* nonpower 2 function */
+  int nonpower2_mode;
 } wined3d_settings_t;
 
 extern wined3d_settings_t wined3d_settings;