June 2006 - Wine-Commits - list.winehq.org

Alexandre Julliard : msi: Make some variables static and/or const.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: b79a53e959a5bcd40998d6f92052dd32720248f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b79a53e959a5bcd40998d6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 13:39:59 2006 +0200 msi: Make some variables static and/or const. --- dlls/msi/action.c | 2 +- dlls/msi/dialog.c | 6 +++--- dlls/msi/events.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5a8e1ab..63eb9c7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -113,7 +113,7 @@ static const WCHAR szForceReboot[] = {'F','o','r','c','e','R','e','b','o','o','t',0}; static const WCHAR szResolveSource[] = {'R','e','s','o','l','v','e','S','o','u','r','c','e',0}; -const WCHAR szAppSearch[] = +static const WCHAR szAppSearch[] = {'A','p','p','S','e','a','r','c','h',0}; static const WCHAR szAllocateRegistrySpace[] = {'A','l','l','o','c','a','t','e','R','e','g','i','s','t','r','y', diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 85976f1..5d36d93 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -106,10 +106,10 @@ typedef struct LPWSTR propval; } radio_button_group_descr; -const WCHAR szMsiDialogClass[] = { +static const WCHAR szMsiDialogClass[] = { 'M','s','i','D','i','a','l','o','g','C','l','o','s','e','C','l','a','s','s',0 }; -const WCHAR szMsiHiddenWindow[] = { +static const WCHAR szMsiHiddenWindow[] = { 'M','s','i','H','i','d','d','e','n','W','i','n','d','o','w',0 }; static const WCHAR szStatic[] = { 'S','t','a','t','i','c',0 }; static const WCHAR szButton[] = { 'B','U','T','T','O','N', 0 }; @@ -1675,7 +1675,7 @@ static UINT msi_dialog_selection_tree( m return ERROR_SUCCESS; } -struct control_handler msi_dialog_handler[] = +static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, { szPushButton, msi_dialog_button_control }, diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 13302b8..3d734d6 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -368,7 +368,7 @@ UINT ACTION_DialogBox( MSIPACKAGE* packa return r; } -struct _events Events[] = { +static const struct _events Events[] = { { "EndDialog",ControlEvent_EndDialog }, { "NewDialog",ControlEvent_NewDialog }, { "SpawnDialog",ControlEvent_SpawnDialog },

1 0

Alexandre Julliard : crtdll: Fixed copy/ paste error in definition of _baseminor_dll and _baseversion_dll.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 654c02017ba53934d61c632caa412f797cf51c03 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=654c02017ba53934d61c632… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 13:38:29 2006 +0200 crtdll: Fixed copy/paste error in definition of _baseminor_dll and _baseversion_dll. --- dlls/crtdll/crtdll.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index ba953f1..505a6e9 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -42,8 +42,8 @@ # Old C runtime library. All functions p @ cdecl _amsg_exit(long) msvcrt._amsg_exit @ cdecl _assert(str str long) msvcrt._assert @ extern _basemajor_dll CRTDLL__basemajor_dll -@ extern _baseminor_dll CRTDLL__basemajor_dll -@ extern _baseversion_dll CRTDLL__basemajor_dll +@ extern _baseminor_dll CRTDLL__baseminor_dll +@ extern _baseversion_dll CRTDLL__baseversion_dll @ cdecl _beep(long long) msvcrt._beep @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread @ cdecl _c_exit() msvcrt._c_exit

1 0

Alexandre Julliard : x11drv: Get rid of the no longer used desktop_tid variable.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 653fc2c4439411a23c225f4c14cce0a3c53ca806 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=653fc2c4439411a23c225f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 12 13:37:36 2006 +0200 x11drv: Get rid of the no longer used desktop_tid variable. --- dlls/x11drv/x11drv.h | 1 - dlls/x11drv/x11drv_main.c | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h index e313e76..7cfdbc4 100644 --- a/dlls/x11drv/x11drv.h +++ b/dlls/x11drv/x11drv.h @@ -526,7 +526,6 @@ inline static Display *thread_display(vo extern Visual *visual; extern Window root_window; -extern DWORD desktop_tid; extern unsigned int screen_width; extern unsigned int screen_height; extern unsigned int screen_depth; diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c index b6fa275..5655e60 100644 --- a/dlls/x11drv/x11drv_main.c +++ b/dlls/x11drv/x11drv_main.c @@ -71,7 +71,6 @@ unsigned int screen_width; unsigned int screen_height; unsigned int screen_depth; Window root_window; -DWORD desktop_tid = 0; int dxgrab = 0; int usedga = 0; int usexvidmode = 1; @@ -542,7 +541,6 @@ #endif data->last_focus = 0; data->selection_wnd = 0; TlsSetValue( thread_data_tls_index, data ); - if (desktop_tid) AttachThreadInput( GetCurrentThreadId(), desktop_tid, TRUE ); return data; }

1 0

Dmitry Timoshkov : user32: Remove redundant SetLastError call from MENU_SetMenu.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 099e23ce4987d625ff07a46494007bb7cd374c55 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=099e23ce4987d625ff07a46… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jun 12 00:26:49 2006 +0900 user32: Remove redundant SetLastError call from MENU_SetMenu. --- dlls/user/menu.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 83e55d9..bc1db93 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -4043,7 +4043,6 @@ BOOL MENU_SetMenu( HWND hWnd, HMENU hMen if (hMenu && !IsMenu(hMenu)) { WARN("hMenu %p is not a menu handle\n", hMenu); - SetLastError(ERROR_INVALID_MENU_HANDLE); return FALSE; } if (!WIN_ALLOWED_MENU(GetWindowLongW( hWnd, GWL_STYLE )))

1 0

Detlef Riekenberg : include/ddk: Add minimal compstui.h.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 42a361d1608d5e3334a1791410d0c06b1244ca7e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42a361d1608d5e3334a1791… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 9 13:30:21 2006 +0200 include/ddk: Add minimal compstui.h. --- include/Makefile.in | 1 + include/ddk/compstui.h | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) create mode 100644 include/ddk/compstui.h diff --git a/include/Makefile.in b/include/Makefile.in index a7a4a74..49e4a0e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -91,6 +91,7 @@ WINDOWS_INCLUDES = \ dde.h \ ddeml.h \ ddk/cfgmgr32.h \ + ddk/compstui.h \ ddk/ntddcdvd.h \ ddk/ntddser.h \ ddk/ntddtape.h \ diff --git a/include/ddk/compstui.h b/include/ddk/compstui.h new file mode 100644 index 0000000..3b06749 --- /dev/null +++ b/include/ddk/compstui.h @@ -0,0 +1,68 @@ +/* + * Definitions for Common Property Sheet User Interface + * + * Copyright 2006 Detlef Riekenberg + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef _COMPSTUI_ +#define _COMPSTUI_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* DEFINES */ + +#define PROPSHEETUI_INFO_VERSION 0x0100 + +#define PSUIINFO_UNICODE 1 + +/* return-values for CommonPropertySheetUI on success */ +#define CPSUI_CANCEL 0 +#define CPSUI_OK 1 +#define CPSUI_RESTARTWINDOWS 2 +#define CPSUI_REBOOTSYSTEM 3 + + +/* TYPES */ +typedef DWORD (CALLBACK *PFNCOMPROPSHEET)(HANDLE, UINT, LPARAM, LPARAM); + +typedef struct _PROPSHEETUI_INFO { + WORD cbSize; + WORD Version; + WORD Flags; /* set PSUIINFO_UNICODE for UNICODE */ + WORD Reason; + HANDLE hComPropSheet; + PFNCOMPROPSHEET pfnComPropSheet; + LPARAM lParamInit; + DWORD UserData; + DWORD Result; + } PROPSHEETUI_INFO, *PPROPSHEETUI_INFO; + +typedef LONG (CALLBACK *PFNPROPSHEETUI)(PROPSHEETUI_INFO, LPARAM lParam); + +/* FUNCTIONS */ +LONG CommonPropertySheetUIA(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); +LONG CommonPropertySheetUIW(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); +#define CommonPropertySheetUI WINELIB_NAME_AW(CommonPropertySheetUI) + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* _COMPSTUI_ */

1 0

Andrew Talbot : winedbg: Write-strings warnings fix.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: a7142d435bdeb9c265b50cbb7ccfdc885eb540f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7142d435bdeb9c265b50cb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jun 9 21:44:44 2006 +0100 winedbg: Write-strings warnings fix. --- programs/winedbg/tgt_minidump.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index f6cfa63..c1f0b9e 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -190,7 +190,8 @@ static enum dbg_start minidump_do_reload if (MiniDumpReadDumpStream(data->mapping, SystemInfoStream, &dir, &stream, &size)) { MINIDUMP_SYSTEM_INFO* msi = (MINIDUMP_SYSTEM_INFO*)stream; - char *str, tmp[128]; + const char *str; + char tmp[128]; dbg_printf("WineDbg starting on minidump on pid %lu\n", pid); switch (msi->ProcessorArchitecture)

1 0

Christian Gmeiner : setupapi: Documentation update.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: f14f04dc8a895304ac90406a0d2c297a5e54f7d4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f14f04dc8a895304ac90406… Author: Christian Gmeiner <christian.gmeiner(a)students.fhv.at> Date: Fri Jun 9 07:25:31 2006 +0200 setupapi: Documentation update. --- dlls/setupapi/devinst.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index e8b5e97..f402f00 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -68,8 +68,22 @@ static const WCHAR DeviceClasses[] = {'S 'C','o','n','t','r','o','l','\\', 'D','e','v','i','c','e','C','l','a','s','s','e','s',0}; + /*********************************************************************** * SetupDiBuildClassInfoList (SETUPAPI.@) + * + * Returns a list of setup class GUIDs that identify the classes + * that are installed on a local machine. + * + * PARAMS + * Flags [I] control exclusion of classes from the list. + * ClassGuidList [O] pointer to a GUID-typed array that receives a list of setup class GUIDs. + * ClassGuidListSize [I] The number of GUIDs in the array (ClassGuidList). + * RequiredSize [O] pointer, which receives the number of GUIDs that are returned. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. */ BOOL WINAPI SetupDiBuildClassInfoList( DWORD Flags, @@ -85,6 +99,21 @@ BOOL WINAPI SetupDiBuildClassInfoList( /*********************************************************************** * SetupDiBuildClassInfoListExA (SETUPAPI.@) + * + * Returns a list of setup class GUIDs that identify the classes + * that are installed on a local or remote macine. + * + * PARAMS + * Flags [I] control exclusion of classes from the list. + * ClassGuidList [O] pointer to a GUID-typed array that receives a list of setup class GUIDs. + * ClassGuidListSize [I] The number of GUIDs in the array (ClassGuidList). + * RequiredSize [O] pointer, which receives the number of GUIDs that are returned. + * MachineName [I] name of a remote machine. + * Reserved [I] must be NULL. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. */ BOOL WINAPI SetupDiBuildClassInfoListExA( DWORD Flags, @@ -116,7 +145,22 @@ BOOL WINAPI SetupDiBuildClassInfoListExA } /*********************************************************************** - * SetupDiBuildClassInfoListExW (SETUPAPI.@) + * SetupDiBuildClassInfoListExW (SETUPAPI.@) + * + * Returns a list of setup class GUIDs that identify the classes + * that are installed on a local or remote macine. + * + * PARAMS + * Flags [I] control exclusion of classes from the list. + * ClassGuidList [O] pointer to a GUID-typed array that receives a list of setup class GUIDs. + * ClassGuidListSize [I] The number of GUIDs in the array (ClassGuidList). + * RequiredSize [O] pointer, which receives the number of GUIDs that are returned. + * MachineName [I] name of a remote machine. + * Reserved [I] must be NULL. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. */ BOOL WINAPI SetupDiBuildClassInfoListExW( DWORD Flags,

1 0

Mike McCormack : user32: Win64 lparam and wparam are longs.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: a8ac8d7f098eef736e8d20b86cdef0868360d1ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8ac8d7f098eef736e8d20b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 11 11:06:00 2006 +0900 user32: Win64 lparam and wparam are longs. --- dlls/user/message.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user/message.c b/dlls/user/message.c index c92db6a..d2af2bd 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -3356,7 +3356,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UIN req->msg = WM_TIMER; req->id = id; req->rate = max( timeout, SYS_TIMER_RATE ); - req->lparam = (unsigned int)winproc; + req->lparam = (unsigned long)winproc; if (!wine_server_call_err( req )) { ret = reply->id; @@ -3387,7 +3387,7 @@ UINT_PTR WINAPI SetSystemTimer( HWND hwn req->msg = WM_SYSTIMER; req->id = id; req->rate = max( timeout, SYS_TIMER_RATE ); - req->lparam = (unsigned int)winproc; + req->lparam = (unsigned long)winproc; if (!wine_server_call_err( req )) { ret = reply->id;

1 0

Mike McCormack : user32: Fix a pointer size warning in Win64.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 87db243f0e430c40f2f4ac0eddaf711fa211f19b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=87db243f0e430c40f2f4ac0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 11 11:06:10 2006 +0900 user32: Fix a pointer size warning in Win64. --- dlls/user/lstr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c index f75aa36..95d1922 100644 --- a/dlls/user/lstr.c +++ b/dlls/user/lstr.c @@ -288,7 +288,7 @@ LPSTR WINAPI CharUpperA(LPSTR str) LPWSTR WINAPI CharLowerW(LPWSTR x) { if (HIWORD(x)) return strlwrW(x); - else return (LPWSTR)((UINT)tolowerW(LOWORD(x))); + else return (LPWSTR)((UINT_PTR)tolowerW(LOWORD(x))); } @@ -298,7 +298,7 @@ LPWSTR WINAPI CharLowerW(LPWSTR x) LPWSTR WINAPI CharUpperW(LPWSTR x) { if (HIWORD(x)) return struprW(x); - else return (LPWSTR)((UINT)toupperW(LOWORD(x))); + else return (LPWSTR)((UINT_PTR)toupperW(LOWORD(x))); }

1 0

Mike McCormack : kernel32: Fix a cast for Win64.
by Alexandre Julliard June 12, 2006

June 12, 2006

Module: wine Branch: refs/heads/master Commit: 3ea306f264b914cff9c9d6a13cc570207364d8b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3ea306f264b914cff9c9d6a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Jun 11 11:05:49 2006 +0900 kernel32: Fix a cast for Win64. --- dlls/kernel/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/locale.c b/dlls/kernel/locale.c index 29064b7..beb5bbd 100644 --- a/dlls/kernel/locale.c +++ b/dlls/kernel/locale.c @@ -443,7 +443,7 @@ static LANGID get_language_id(LPCSTR Lan /* retry without country name */ l_data.country[0] = 0; EnumResourceLanguagesW(kernel32_handle, (LPCWSTR)RT_STRING, (LPCWSTR)LOCALE_ILANGUAGE, - find_language_id_proc, (LONG)&l_data); + find_language_id_proc, (LONG_PTR)&l_data); if (!l_data.n_found) { MESSAGE("Warning: Language '%s_%s' was not recognized, defaulting to English.\n",

1 0