January 2006 - Wine-commits

Ken Thomases : user: Fixed the lifetime of MDICREATESTRUCT variables.
by Alexandre Julliard 19 Jan '06

19 Jan '06

Module: wine Branch: refs/heads/master Commit: d6865383a69368b18b45a620ca55a6493481c1b8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d6865383a69368b18b45a62… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 19 12:43:45 2006 +0100 user: Fixed the lifetime of MDICREATESTRUCT variables. --- dlls/user/win.c | 2 +- dlls/user/winproc.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user/win.c b/dlls/user/win.c index dbdb7e5..4dd37eb 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -833,6 +833,7 @@ static HWND WIN_CreateWindowEx( CREATEST WND *wndPtr; HWND hwnd, parent, owner, top_child = 0; BOOL unicode = (type == WIN_PROC_32W); + MDICREATESTRUCTA mdi_cs; TRACE("%s %s ex=%08lx style=%08lx %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", (type == WIN_PROC_32W) ? debugstr_w((LPCWSTR)cs->lpszName) : debugstr_a(cs->lpszName), @@ -848,7 +849,6 @@ static HWND WIN_CreateWindowEx( CREATEST /* Fix the styles for MDI children */ if (cs->dwExStyle & WS_EX_MDICHILD) { - MDICREATESTRUCTA mdi_cs; UINT flags = 0; wndPtr = WIN_GetPtr(cs->hwndParent); diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 7cfc077..51f0ab8 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -3017,6 +3017,7 @@ static BOOL WINPROC_CallProc32WTo32A_fas char *cls = buffer, *name; CREATESTRUCTW *csW = (CREATESTRUCTW *)lParam; CREATESTRUCTA csA = *(CREATESTRUCTA *)csW; + MDICREATESTRUCTA mdi_cs; DWORD name_lenA, name_lenW, class_lenA, class_lenW; class_lenW = strlenW(csW->lpszClass) * sizeof(WCHAR); @@ -3050,8 +3051,6 @@ static BOOL WINPROC_CallProc32WTo32A_fas if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD) { - MDICREATESTRUCTA mdi_cs; - mdi_cs = *(MDICREATESTRUCTA *)csW->lpCreateParams; mdi_cs.szTitle = csA.lpszName; mdi_cs.szClass = csA.lpszClass;

1 0

H. Verbeet : d3d8: Added GL_ARB_point_sprite definition.
by Alexandre Julliard 19 Jan '06

19 Jan '06

Module: wine Branch: refs/heads/master Commit: b645b9ed5358e80233f1a31f1f913cc0861ecde1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b645b9ed5358e80233f1a31… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jan 19 12:40:05 2006 +0100 d3d8: Added GL_ARB_point_sprite definition. --- dlls/d3d8/d3dcore_gl.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/d3dcore_gl.h b/dlls/d3d8/d3dcore_gl.h index 4ebb4ea..173ee74 100644 --- a/dlls/d3d8/d3dcore_gl.h +++ b/dlls/d3d8/d3dcore_gl.h @@ -592,6 +592,13 @@ typedef void (APIENTRY * PGLFNGETCOMBINE /* #define ZERO */ #endif +/* GL_ARB_point_sprite */ +#ifndef GL_ARB_point_sprite +#define GL_ARB_point_sprite 1 +#define GL_POINT_SPRITE_ARB 0x8861 +#define GL_COORD_REPLACE_ARB 0x8862 +#endif + /******* * OpenGL Official Version * defines

1 0

Aric Stewart : shell32: Update shellpaths My Pictures, My Video, My Music to be under
by Alexandre Julliard 19 Jan '06

19 Jan '06

Module: wine Branch: refs/heads/master Commit: 265c8a5d7329a1512db900a799bd66013365b295 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=265c8a5d7329a1512db900a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 19 12:43:14 2006 +0100 shell32: Update shellpaths My Pictures, My Video, My Music to be under $HOME, with a number of fallbacks. --- dlls/shell32/shellpath.c | 90 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 68 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 215e5ed..29c004f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1229,6 +1229,66 @@ static HRESULT _SHGetUserShellFolderPath return hr; } +/* Helper function for _SHGetDefaultValue + * + * handing the directories under $HOME: + * 1) try path under $HOME (such as $HOME/My Documents/My Pictures), if it + * exists return it. + * 2) if not, but $HOME/My Documents exists return path 1 and have it created + * 3) try $HOME if it exists return it + * 4) normal fallback to C:/windows/Profiles/... + */ +static HRESULT expand_home_path(LPWSTR pszPath, LPCWSTR def_path, UINT resource, + BOOL create_lastdir) +{ + HRESULT hr = E_FAIL; + const char *home = getenv("HOME"); + + if (home) + { + LPWSTR homeW = wine_get_dos_file_name(home); + + if (homeW) + { + WCHAR resourcePath[MAX_PATH]; + lstrcpynW(pszPath, homeW, MAX_PATH); + + if (LoadStringW(shell32_hInstance, resource, resourcePath, MAX_PATH)) + PathAppendW(pszPath, resourcePath); + else + PathAppendW(pszPath, def_path); + + if (PathIsDirectoryW(pszPath)) hr = S_OK; + else if (create_lastdir) + { + /* attempt 2, try for My Documents */ + + WCHAR* ptr = strrchrW(pszPath, '\\'); + if (ptr) + { + *ptr = 0; + if (PathIsDirectoryW(pszPath)) + { + *ptr = '\\'; + hr = S_OK; + } + } + } + + if (hr != S_OK) + { + /* attempt 3 return HOME */ + lstrcpyW(pszPath,homeW); + hr = S_OK; + } + HeapFree(GetProcessHeap(), 0, homeW); + } + else + hr = HRESULT_FROM_WIN32(GetLastError()); + } + return hr; +} + /* Gets a 'semi-expanded' default value of the CSIDL with index folder into * pszPath, based on the entries in CSIDL_Data. By semi-expanded, I mean: * - The entry's szDefaultPath may be either a string value or an integer @@ -1260,32 +1320,18 @@ static HRESULT _SHGetDefaultValue(BYTE f hr = E_FAIL; switch (folder) { + case CSIDL_MYPICTURES: + hr = expand_home_path(pszPath,My_PicturesW,IDS_MYPICTURES,TRUE); + break; case CSIDL_PERSONAL: + hr = expand_home_path(pszPath,PersonalW,IDS_PERSONAL,FALSE); + break; case CSIDL_MYMUSIC: - case CSIDL_MYPICTURES: + hr = expand_home_path(pszPath,My_MusicW,IDS_MYMUSIC,TRUE); + break; case CSIDL_MYVIDEO: - { - const char *home = getenv("HOME"); - - /* special case for "My Documents", map to $HOME */ - if (home) - { - LPWSTR homeW = wine_get_dos_file_name(home); - - if (homeW) - { - if (PathIsDirectoryW(homeW)) - { - lstrcpynW(pszPath, homeW, MAX_PATH); - hr = S_OK; - } - HeapFree(GetProcessHeap(), 0, homeW); - } - else - hr = HRESULT_FROM_WIN32(GetLastError()); - } + hr = expand_home_path(pszPath,My_VideoW,IDS_MYVIDEO,TRUE); break; - } case CSIDL_DESKTOP: case CSIDL_DESKTOPDIRECTORY: {

1 0

H. Verbeet : wined3d: Better version string parsing for VENDOR_NVIDIA in
by Alexandre Julliard 19 Jan '06

19 Jan '06

Module: wine Branch: refs/heads/master Commit: b88407268727d95b11f9d2c72ad978bc6ef42fa5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b88407268727d95b11f9d2c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jan 19 12:39:37 2006 +0100 wined3d: Better version string parsing for VENDOR_NVIDIA in IWineD3DImpl_FillGLCaps. --- dlls/wined3d/directx.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 466d3e4..07543bb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -268,30 +268,38 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine switch (gl_info->gl_vendor) { case VENDOR_NVIDIA: gl_string_cursor = strstr(gl_string, "NVIDIA"); + if (!gl_string_cursor) { + ERR_(d3d_caps)("Invalid nVidia version string: %s\n", debugstr_a(gl_string)); + break; + } + gl_string_cursor = strstr(gl_string_cursor, " "); - while (*gl_string_cursor && ' ' == *gl_string_cursor) ++gl_string_cursor; - if (*gl_string_cursor) { - char tmp[16]; - int cursor = 0; + if (!gl_string_cursor) { + ERR_(d3d_caps)("Invalid nVidia version string: %s\n", debugstr_a(gl_string)); + break; + } - while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') { - tmp[cursor++] = *gl_string_cursor; - ++gl_string_cursor; - } - tmp[cursor] = 0; - major = atoi(tmp); + while (*gl_string_cursor == ' ') { + ++gl_string_cursor; + } - if (*gl_string_cursor != '.') WARN_(d3d_caps)("malformed GL_VERSION (%s)\n", debugstr_a(gl_string)); + if (!*gl_string_cursor) { + ERR_(d3d_caps)("Invalid nVidia version string: %s\n", debugstr_a(gl_string)); + break; + } + + major = atoi(gl_string_cursor); + while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') { ++gl_string_cursor; + } - cursor = 0; - while (*gl_string_cursor <= '9' && *gl_string_cursor >= '0') { - tmp[cursor++] = *gl_string_cursor; - ++gl_string_cursor; - } - tmp[cursor] = 0; - minor = atoi(tmp); + if (*gl_string_cursor++ != '.') { + ERR_(d3d_caps)("Invalid nVidia version string: %s\n", debugstr_a(gl_string)); + break; } + + minor = atoi(gl_string_cursor); + break; case VENDOR_ATI:

1 0

Huw Davies : msxml: Text node implementation.
by Alexandre Julliard 19 Jan '06

19 Jan '06

Module: wine Branch: refs/heads/master Commit: 5d629e7ce8111356e611b9cc99b922cd9b426cc4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d629e7ce8111356e611b9c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 19 11:56:34 2006 +0100 msxml: Text node implementation. --- dlls/msxml3/Makefile.in | 3 dlls/msxml3/msxml_private.h | 1 dlls/msxml3/node.c | 3 dlls/msxml3/text.c | 598 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 604 insertions(+), 1 deletions(-) create mode 100644 dlls/msxml3/text.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5d629e7ce8111356e61…

1 0

Mike McCormack : winmine: Use WIN32_LEAN_AND_MEAN.
by Alexandre Julliard 19 Jan '06

19 Jan '06

Module: wine Branch: refs/heads/master Commit: a9f96938dca379c8e6f18738ce5aa12e529ce2ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a9f96938dca379c8e6f1873… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 19 12:39:28 2006 +0100 winmine: Use WIN32_LEAN_AND_MEAN. --- programs/winemine/dialog.c | 2 ++ programs/winemine/main.c | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/winemine/dialog.c b/programs/winemine/dialog.c index fd08440..c517162 100644 --- a/programs/winemine/dialog.c +++ b/programs/winemine/dialog.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <windows.h> #include "main.h" #include "dialog.h" diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 62a0635..abd6752 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -18,10 +18,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <string.h> #include <time.h> #include <windows.h> -#include <windowsx.h> +#include <stdlib.h> #include "main.h" #include "dialog.h" #include "resource.h" @@ -55,13 +57,13 @@ int WINAPI WinMain( HINSTANCE hInst, HIN wc.lpszMenuName = "MENU_WINEMINE"; wc.lpszClassName = appname; - if (!RegisterClass(&wc)) exit(1); + if (!RegisterClass(&wc)) ExitProcess(1); hWnd = CreateWindow( appname, appname, wnd_style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hInst, NULL ); - if (!hWnd) exit(1); + if (!hWnd) ExitProcess(1); ShowWindow( hWnd, cmdshow ); UpdateWindow( hWnd ); @@ -111,8 +113,8 @@ LRESULT WINAPI MainProc( HWND hWnd, UINT case WM_MOVE: WINE_TRACE("WM_MOVE\n"); - board.pos.x = GET_X_LPARAM(lParam); - board.pos.y = GET_Y_LPARAM(lParam); + board.pos.x = (short)LOWORD(lParam); + board.pos.y = (short)HIWORD(lParam); return 0; case WM_DESTROY:

1 0

H. Verbeet : wined3d: In IWineD3DImpl_FillGLCaps use glGetString instead of
by Alexandre Julliard 19 Jan '06

19 Jan '06

Module: wine Branch: refs/heads/master Commit: 093a034f7ffa8dee4d7346737bbb4991bfeae5a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=093a034f7ffa8dee4d73467… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jan 19 11:55:34 2006 +0100 wined3d: In IWineD3DImpl_FillGLCaps use glGetString instead of glXGetClientString to retrieve the OpenGL vendor. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b9178a1..466d3e4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -234,11 +234,11 @@ static BOOL IWineD3DImpl_FillGLCaps(Wine if (NULL != display) { test = glXQueryVersion(display, &major, &minor); gl_info->glx_version = ((major & 0x0000FFFF) << 16) | (minor & 0x0000FFFF); - gl_string = glXGetClientString(display, GLX_VENDOR); } else { FIXME("Display must not be NULL, use glXGetCurrentDisplay or getAdapterDisplay()\n"); - gl_string = (const char *) glGetString(GL_VENDOR); } + gl_string = (const char *) glGetString(GL_VENDOR); + TRACE_(d3d_caps)("Filling vendor string %s\n", gl_string); if (gl_string != NULL) { /* Fill in the GL vendor */

1 0

Dmitry Timoshkov : x11drv: Add support for another Canadian French keyboard flavour.
by Alexandre Julliard 19 Jan '06

19 Jan '06

Module: wine Branch: refs/heads/master Commit: 2f1c52e5fdd71e13795236ec29f05004e8ece874 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f1c52e5fdd71e13795236e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jan 19 11:55:50 2006 +0100 x11drv: Add support for another Canadian French keyboard flavour. --- dlls/x11drv/keyboard.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index e011446..9cbe5fc 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -411,6 +411,16 @@ static const char main_key_CF[MAIN_LEN][ "��" }; +/*** Canadian French keyboard layout (setxkbmap ca -variant fr) */ +static const char main_key_CA_fr[MAIN_LEN][4] = +{ + "#|","1!","2\"","3/","4$","5%","6?","7&","8*","9(","0)","-_","=+", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","^^","��", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL",";:","``","<>", + "zZ","xX","cC","vV","bB","nN","mM",",'",".","��", + "��" +}; + /*** Canadian keyboard layout (setxkbmap ca) */ static const char main_key_CA[MAIN_LEN][4] = { @@ -899,6 +909,7 @@ static const struct { {0x0406, "Danish keyboard layout", &main_key_DA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x040c, "French keyboard layout", &main_key_FR, &main_key_scan_qwerty, &main_key_vkey_azerty}, {0x0c0c, "Canadian French keyboard layout", &main_key_CF, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0c0c, "Canadian French keyboard layout (CA_fr)", &main_key_CA_fr, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0c0c, "Canadian keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x080c, "Belgian keyboard layout", &main_key_BE, &main_key_scan_qwerty, &main_key_vkey_azerty}, {0x0816, "Portuguese keyboard layout", &main_key_PT, &main_key_scan_qwerty, &main_key_vkey_qwerty},

1 0

Jason Edmeades : user: Tests for when the menu is incorrect because of duplication of a
by Alexandre Julliard 19 Jan '06

19 Jan '06

Module: wine Branch: refs/heads/master Commit: 14889a618d399fdcec910f9f8aa2e048fbe28ced URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=14889a618d399fdcec910f9… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Jan 19 11:56:20 2006 +0100 user: Tests for when the menu is incorrect because of duplication of a menu id and an hMenu. --- dlls/user/tests/menu.c | 273 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 273 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=14889a618d399fdcec9…

1 0

Mike McCormack : winecfg: Tidy up included headers.
by Alexandre Julliard 19 Jan '06

19 Jan '06

Module: wine Branch: refs/heads/master Commit: 55303936b690714ecd3c71b6ec98f6d0bfa6df6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=55303936b690714ecd3c71b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 19 11:55:01 2006 +0100 winecfg: Tidy up included headers. Get rid of the barely used properties.c. --- programs/winecfg/Makefile.in | 1 - programs/winecfg/audio.c | 21 +++++++++--- programs/winecfg/driveui.c | 13 +++----- programs/winecfg/main.c | 13 +------- programs/winecfg/properties.c | 71 ----------------------------------------- programs/winecfg/properties.h | 3 -- programs/winecfg/theme.c | 5 +-- programs/winecfg/winecfg.c | 2 + programs/winecfg/x11drvdlg.c | 6 ++- 9 files changed, 28 insertions(+), 107 deletions(-) delete mode 100644 programs/winecfg/properties.c diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 7f79b38..7aa1136 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -14,7 +14,6 @@ C_SRCS = \ driveui.c \ libraries.c \ main.c \ - properties.c \ theme.c \ winecfg.c \ x11drvdlg.c diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 3d78e92..07a4baf 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -19,6 +19,7 @@ * */ +#define WIN32_LEAN_AND_MEAN #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -26,14 +27,11 @@ #include "wine/port.h" #include <assert.h> -#include <stdarg.h> #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include <windows.h> #include <wine/debug.h> #include <shellapi.h> #include <objbase.h> @@ -43,7 +41,6 @@ #include <windowsx.h> #include <mmsystem.h> #include <mmreg.h> -#include <mmsystem.h> #include <mmddk.h> #include "winecfg.h" @@ -64,6 +61,18 @@ static const char* DSound_HW_Accels[] = NULL }; +static const AUDIO_DRIVER sAudioDrivers[] = { + {"ALSA", "alsa"}, + {"aRts", "arts"}, + {"EsounD", "esd"}, + {"OSS", "oss"}, + {"JACK", "jack"}, + {"NAS", "nas"}, + {"Audio IO(Solaris)", "audioio"}, + {"Disable sound", ""}, + {"", ""} +}; + /* list of available drivers */ static AUDIO_DRIVER * loadedAudioDrv; @@ -467,7 +476,7 @@ static void findAudioDrivers(void) */ old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); - for (pAudioDrv = getAudioDrivers(); *pAudioDrv->szName; pAudioDrv++) + for (pAudioDrv = sAudioDrivers; *pAudioDrv->szName; pAudioDrv++) { if (strlen(pAudioDrv->szDriver)) { diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 993cec9..5f407b5 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -21,20 +21,15 @@ * */ -#include <stdarg.h> -#include <stdio.h> - +#define WIN32_LEAN_AND_MEAN #define COBJMACROS -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include <windows.h> #include <shellapi.h> #include <objbase.h> #include <shlguid.h> #include <shlwapi.h> #include <shlobj.h> -#include <winuser.h> #include <wine/debug.h> @@ -279,7 +274,9 @@ static int fill_drives_list(HWND dialog) if (drives[i].letter == 'C') drivec_present = TRUE; - snprintf(letter, sizeof(letter), "%c:", 'A' + i); + letter[0] = 'A' + i; + letter[1] = ':'; + letter[2] = 0; memset(&item, 0, sizeof(item)); item.mask = LVIF_TEXT | LVIF_PARAM; diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index a49d939..b77d02b 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -21,21 +21,12 @@ * */ -#include "config.h" - -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif +#define WIN32_LEAN_AND_MEAN #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include <windef.h> -#include <winbase.h> -#include <winuser.h> +#include <windows.h> #include <commctrl.h> #include <objbase.h> #include <wine/debug.h> diff --git a/programs/winecfg/properties.c b/programs/winecfg/properties.c deleted file mode 100644 index 482448c..0000000 --- a/programs/winecfg/properties.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * WineCfg properties management - * - * Copyright 2002 Jaco Greeff - * Copyright 2003 Dimitrie O. Paun - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -#define WIN32_LEAN_AND_MEAN - -#include <windows.h> - -#include "properties.h" - -static const DLL_DESC sDLLType[] = { - {"oleaut32", DLL_BUILTIN}, - {"ole32", DLL_BUILTIN}, - {"commdlg", DLL_BUILTIN}, - {"comdlg32", DLL_BUILTIN}, - {"shell", DLL_BUILTIN}, - {"shell32", DLL_BUILTIN}, - {"shfolder", DLL_BUILTIN}, - {"shlwapi", DLL_BUILTIN}, - {"shdocvw", DLL_BUILTIN}, - {"advapi32", DLL_BUILTIN}, - {"msvcrt", DLL_NATIVE}, - {"mciavi32.dll", DLL_NATIVE}, - {"*", DLL_NATIVE}, - {"", -1} -}; - -static const AUDIO_DRIVER sAudioDrivers[] = { - {"ALSA", "alsa"}, - {"aRts", "arts"}, - {"EsounD", "esd"}, - {"OSS", "oss"}, - {"JACK", "jack"}, - {"NAS", "nas"}, - {"Audio IO(Solaris)", "audioio"}, - {"Disable sound", ""}, - {"", ""} -}; - - -/***************************************************************************** - */ -const DLL_DESC* getDLLDefaults(void) -{ - return sDLLType; -} - -/***************************************************************************** - */ -const AUDIO_DRIVER* getAudioDrivers(void) -{ - return sAudioDrivers; -} diff --git a/programs/winecfg/properties.h b/programs/winecfg/properties.h index 57a1019..b890c2a 100644 --- a/programs/winecfg/properties.h +++ b/programs/winecfg/properties.h @@ -87,7 +87,4 @@ typedef struct int nType; } DEV_NODES; -const DLL_DESC *getDLLDefaults(void); -const AUDIO_DRIVER *getAudioDrivers(void); - #endif diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 37541cc..3cb0e39 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -23,10 +23,7 @@ #include <stdlib.h> #include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> +#include <windows.h> #include <uxtheme.h> #include <tmschema.h> #include <shlobj.h> diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index 96d8f7a..df2b05f 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -27,6 +27,8 @@ * */ +#define WIN32_LEAN_AND_MEAN + #include <assert.h> #include <stdio.h> #include <limits.h> diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index ed0ab5c..fe1a503 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -21,13 +21,13 @@ * */ +#define WIN32_LEAN_AND_MEAN + #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include <winreg.h> +#include <windows.h> #include <wine/debug.h> #include "resource.h"

1 0