winecfg: Remove useless audio control panel button.

Changelog:
winecfg: Remove useless audio control panel button.

We don't have an audio control panel, and it doesn't seem likely that we
will ever have one.  This patch removes the dead code.

-- 
Andrew Riedi

From 74c411d9f7de96e357c642a595633b8e92bd033a Mon Sep 17 00:00:00 2001
From: Andrew Riedi <andrewriedi <at> gmail.com>
Date: Thu, 30 Apr 2009 00:25:52 -0700
Subject: [PATCH] winecfg: Remove useless audio control panel button.

We don't have an audio control panel, and it doesn't seem likely that we
will ever have one.  This patch removes the dead code.
---
 programs/winecfg/Bg.rc      |    1 -
 programs/winecfg/Cs.rc      |    1 -
 programs/winecfg/Da.rc      |    1 -
 programs/winecfg/De.rc      |    1 -
 programs/winecfg/En.rc      |    1 -
 programs/winecfg/Es.rc      |    1 -
 programs/winecfg/Fi.rc      |    1 -
 programs/winecfg/Fr.rc      |    1 -
 programs/winecfg/Hu.rc      |    1 -
 programs/winecfg/It.rc      |    1 -
 programs/winecfg/Ja.rc      |    1 -
 programs/winecfg/Ko.rc      |    1 -

user32: combine horizontal and vertical window scroll bar info in a single structure.

Fixes bug #18102
---
 dlls/user32/defwnd.c       |    5 ++---
 dlls/user32/scroll.c       |   42 +++++++++++++++++++++++++++++++-----------
 dlls/user32/tests/scroll.c |   14 ++++++--------
 dlls/user32/win.c          |    3 +--
 dlls/user32/win.h          |    3 +--
 5 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c
index e3ec37c..bf30c97 100644
--- a/dlls/user32/defwnd.c
+++ b/dlls/user32/defwnd.c
 <at>  <at>  -406,9 +406,8  <at>  <at>  static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
             if (!wndPtr) return 0;
             HeapFree( GetProcessHeap(), 0, wndPtr->text );
             wndPtr->text = NULL;
-            HeapFree( GetProcessHeap(), 0, wndPtr->pVScroll );
-            HeapFree( GetProcessHeap(), 0, wndPtr->pHScroll );
-            wndPtr->pVScroll = wndPtr->pHScroll = NULL;
+            HeapFree( GetProcessHeap(), 0, wndPtr->pScroll );
+            wndPtr->pScroll = NULL;
             WIN_ReleasePtr( wndPtr );
             return 0;
         }
diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c
index 91adb74..d7c891f 100644
--- a/dlls/user32/scroll.c
+++ b/dlls/user32/scroll.c
 <at>  <at>  -41,6 +41,7  <at>  <at> 

user32: avoid local heap oveflow by allocating menu structures on the global heap.

Fixes bug#18297
---
 dlls/user32/menu.c |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 335fcfa..49799b3 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
 <at>  <at>  -93,7 +93,6  <at>  <at>  typedef struct {
 /* Popup menu structure */
 typedef struct {
     WORD        wFlags;       /* Menu flags (MF_POPUP, MF_SYSMENU) */
-    WORD        wMagic;       /* Magic number */
     WORD	Width;        /* Width of the whole menu */
     WORD	Height;       /* Height of the whole menu */
     UINT        nItems;       /* Number of items in the menu */
 <at>  <at>  -115,6 +114,11  <at>  <at>  typedef struct {
     SIZE        maxBmpSize;     /* Maximum size of the bitmap items */
 } POPUPMENU, *LPPOPUPMENU;

+typedef struct {
+    WORD        wMagic;       /* Magic number */
+    LPPOPUPMENU lppop;
+} MENUHEAD;
+
 /* internal flags for menu tracking */

 #define TF_ENDMENU              0x10000
 <at>  <at>  -292,13 +296,13  <at>  <at>  static void do_debug_print_menuitem(const char *prefix, const MENUITEM *mp,

[2/5] wined3d: Use the shader_sm1_read_*() functions in shader_trace_init().

From a544bfdad124ac7b6b04f29b19961e531c5655f5 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet <at> codeweavers.com>
Date: Fri, 1 May 2009 09:13:54 +0200
Subject: wined3d: Use the shader_sm1_read_*() functions in shader_trace_init().

---
 dlls/wined3d/baseshader.c |   49 +++++++++++++-------------------------------
 1 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index cc7bf88..7efed39 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
 <at>  <at>  -1304,19 +1304,22  <at>  <at>  void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table
         }
         else
         {
-            DWORD param, addr_token = 0;
-            int tokens_read;
+            struct wined3d_shader_src_param dst_rel_addr, src_rel_addr;
+            struct wined3d_shader_dst_param dst_param;
+            struct wined3d_shader_src_param src_param;
+
+            if (ins.dst_count)
+            {
+                shader_sm1_read_dst_param(&pToken, &dst_param, &dst_rel_addr, shader_version);
+            }

[1/5] wined3d: Merge shader_dump_arr_entry() into shader_dump_register().

From 378a0c92b1d2308458e8e3c28d9f066ecf8b2bae Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet <at> codeweavers.com>
Date: Fri, 1 May 2009 09:13:53 +0200
Subject: wined3d: Merge shader_dump_arr_entry() into shader_dump_register().

---
 dlls/wined3d/baseshader.c |   56 ++++++++++++++++++--------------------------
 1 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index acc4b71..cc7bf88 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
 <at>  <at>  -911,34 +911,21  <at>  <at>  static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti
     }
 }

-static void shader_dump_arr_entry(const struct wined3d_shader_src_param *rel_addr,
-        UINT register_idx, DWORD shader_version)
-{
-    if (rel_addr)
-    {
-        TRACE("[");
-        shader_dump_src_param(rel_addr, shader_version);
-        TRACE(" + ");
-    }
-    TRACE("%u", register_idx);

[3/5] wined3d: Merge wined3d_private_types.h into wined3d_private.h.

From 230d37497252ea498eb4e1f31b967ed50fe4a49e Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet <at> codeweavers.com>
Date: Fri, 1 May 2009 09:13:54 +0200
Subject: wined3d: Merge wined3d_private_types.h into wined3d_private.h.

---
 dlls/wined3d/wined3d_private.h       |  212 ++++++++++++++++++++++++++++++--
 dlls/wined3d/wined3d_private_types.h |  228 ----------------------------------
 2 files changed, 201 insertions(+), 239 deletions(-)
 delete mode 100644 dlls/wined3d/wined3d_private_types.h

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 16512cc..faecf2e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
 <at>  <at>  -3,7 +3,7  <at>  <at> 
  *
  * Copyright 2002-2003 The wine-d3d team
  * Copyright 2002-2003 Raphael Junqueira
- * Copyright 2004 Jason Edmeades
+ * Copyright 2002-2003, 2004 Jason Edmeades
  * Copyright 2005 Oliver Stieber
  *
  * This library is free software; you can redistribute it and/or
 <at>  <at>  -38,7 +38,6  <at>  <at> 
 #include "wine/unicode.h"

[5/5] wined3d: Avoid using WINED3DSP_REGNUM_MASK in the def/defi/defb handlers.

From ec3710de20b1cabdc4d3e20a69a3329071d1c056 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet <at> codeweavers.com>
Date: Fri, 1 May 2009 09:13:54 +0200
Subject: wined3d: Avoid using WINED3DSP_REGNUM_MASK in the def/defi/defb handlers.

---
 dlls/wined3d/baseshader.c |   86 +++++++++++++++++++++++++++-----------------
 1 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index c56b3cf..9bdad17 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
 <at>  <at>  -468,17 +468,6  <at>  <at>  void shader_init(struct IWineD3DBaseShaderClass *shader,
     list_init(&shader->linked_programs);
 }

-static inline WINED3DSHADER_PARAM_REGISTER_TYPE shader_get_regtype(DWORD param)
-{
-    return ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT)
-            | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2);
-}
-
-static inline DWORD shader_get_writemask(DWORD param)
-{
-    return param & WINED3DSP_WRITEMASK_ALL;
-}

[4/5] wined3d: Introduce shader_sm1_read_comment() to read shader comments.

From 2d0df35dae6781d6d6ae07ca2f7548c26bece2e9 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet <at> codeweavers.com>
Date: Fri, 1 May 2009 09:13:54 +0200
Subject: wined3d: Introduce shader_sm1_read_comment() to read shader comments.

---
 dlls/wined3d/baseshader.c |   48 +++++++++++++++++++++++---------------------
 1 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index 7efed39..c56b3cf 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
 <at>  <at>  -296,6 +296,20  <at>  <at>  static void shader_sm1_read_semantic(const DWORD **ptr, struct wined3d_shader_se
     shader_parse_dst_param(dst_token, NULL, &semantic->reg);
 }

+static void shader_sm1_read_comment(const DWORD **ptr, const char **comment)
+{
+    DWORD token = **ptr;
+
+    if ((token & WINED3DSI_OPCODE_MASK) != WINED3DSIO_COMMENT)
+    {
+        *comment = NULL;
+        return;
+    }
+

wine.inf: add more file type descriptions

Changelog:
* added more file type descriptions to wine.inf

Damjan Jovanovic

user32/tests: fix a test in edit.c that was not testing what it was supposed to test.

---
 dlls/user32/tests/edit.c |   45 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c
index ecc50ab..8bcd634 100644
--- a/dlls/user32/tests/edit.c
+++ b/dlls/user32/tests/edit.c
 <at>  <at>  -1177,9 +1177,13  <at>  <at>  static void test_edit_control_4(void)
 static void test_edit_control_5(void)
 {
     static const char *str = "test\r\ntest";
+    HWND parentWnd;
     HWND hWnd;
     int len;
+    RECT rc1 = { 10, 10, 11, 11};
+    RECT rc;

+    /* first show that a non-child won't do for this test */
     hWnd = CreateWindowEx(0,
               "EDIT",
               str,
 <at>  <at>  -1187,19 +1191,48  <at>  <at>  static void test_edit_control_5(void)
               10, 10, 1, 1,
               NULL, NULL, NULL, NULL);
     assert(hWnd);
-
+    /* size of non-child edit control is (much) bigger then requested */
+    GetWindowRect( hWnd, &rc);
+    ok( rc.right - rc.left > 20, "size of the window (%d) is smaller then expected\n",