May 2008 - Wine-commits - list.winehq.org

James Hawkins : kernel32: Fix a debugger test that fails in win2k3.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 362f2ceeaf7b678a57f0a0f2abd029a8c0d6e2eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=362f2ceeaf7b678a57f0a0f2a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 19 02:23:20 2008 -0500 kernel32: Fix a debugger test that fails in win2k3. --- dlls/kernel32/tests/debugger.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index ac5f2ce..3d8d7f5 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -241,7 +241,9 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) "wrong exit code : %08x\n", exit_code); } else - ok(exit_code == STATUS_ACCESS_VIOLATION, "exit code = %08x instead of STATUS_ACCESS_VIOLATION\n", exit_code); + ok(exit_code == STATUS_ACCESS_VIOLATION || + exit_code == WAIT_ABANDONED, /* win2k3 */ + "exit code = %08x instead of STATUS_ACCESS_VIOLATION or WAIT_ABANDONED\n", exit_code); CloseHandle(info.hProcess); /* ...before the debugger */

1 0

Mikołaj Zalewski : Make Swedish use SUBLANG_NEUTRAL.
by Alexandre Julliard 19 May '08

19 May '08

1 0

Lei Zhang : wine.inf: Open xml files using winebrowser.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: e63bd4dea70db985f2484124355cf18053eb3259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e63bd4dea70db985f24841243… Author: Lei Zhang <thestig(a)google.com> Date: Fri May 16 17:07:08 2008 -0700 wine.inf: Open xml files using winebrowser. --- tools/wine.inf.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 4be0805..05e4f7d 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -115,6 +115,7 @@ HKCR,.tiff,"Content Type",2,"image/tiff" HKCR,.txt,,2,"txtfile" HKCR,.wri,,2,"wrifile" HKCR,.wav,"Content Type",2,"audio/wav" +HKCR,.xml,,2,"xmlfile" HKCR,.xml,"Content Type",2,"text/xml" HKCR,.xsl,"Content Type",2,"text/xsl" HKCR,chm.file\shell\open\command,,2,"%11%\hh.exe %1" @@ -148,6 +149,11 @@ HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,wrifile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,wrifile\shell\print\command,,2,"%11%\wordpad.exe /p %1" +HKCR,xmlfile\shell\open\command,,2,"%11%\winebrowser.exe -nohome" +HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," +HKCR,xmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" +HKCR,xmlfile\shell\open\ddeexec\Application,,2,"IExplore" +HKCR,xmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" HKCR,http\shell\open\command,,2,"%11%\winebrowser.exe -nohome" HKCR,http\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,http\shell\open\ddeexec,"NoActivateHandler",2,""

1 0

Vitaliy Margolen : winecfg: Remove mostly unused properties.h.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 82a7eb7614da0199aa0d30b1718ec732d3f4f31a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a7eb7614da0199aa0d30b17… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 18 21:50:19 2008 -0600 winecfg: Remove mostly unused properties.h. --- programs/winecfg/audio.c | 7 +++ programs/winecfg/drivedetect.c | 6 +++ programs/winecfg/main.c | 1 - programs/winecfg/properties.h | 90 ---------------------------------------- programs/winecfg/winecfg.h | 2 +- 5 files changed, 14 insertions(+), 92 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 32d8754..3ce0e25 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #define DRIVER_MASK 0x80000000 #define DEVICE_MASK 0x40000000 +#define MAX_NAME_LENGTH 64 typedef DWORD (WINAPI * MessagePtr)(UINT, UINT, DWORD, DWORD, DWORD); @@ -80,6 +81,12 @@ static const char* DSound_Bits[] = { NULL }; +typedef struct +{ + UINT nameID; + const char *szDriver; +} AUDIO_DRIVER; + static const AUDIO_DRIVER sAudioDrivers[] = { {IDS_DRIVER_ALSA, "alsa"}, {IDS_DRIVER_OSS, "oss"}, diff --git a/programs/winecfg/drivedetect.c b/programs/winecfg/drivedetect.c index 0b07bdf..e8c843a 100644 --- a/programs/winecfg/drivedetect.c +++ b/programs/winecfg/drivedetect.c @@ -43,6 +43,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); BOOL gui_mode = TRUE; static long working_mask = 0; +typedef struct +{ + const char *szNode; + int nType; +} DEV_NODES; + #ifdef HAVE_MNTENT_H static const DEV_NODES sDeviceNodes[] = { diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 6fc77f7..f9f561d 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -31,7 +31,6 @@ #include <objbase.h> #include <wine/debug.h> -#include "properties.h" #include "resource.h" #include "winecfg.h" diff --git a/programs/winecfg/properties.h b/programs/winecfg/properties.h deleted file mode 100644 index 8ff17c6..0000000 --- a/programs/winecfg/properties.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * WineCfg configuration properties - * - * Copyright 2002 Jaco Greeff - * Copyright 2003 Dimitrie O. Paun - * Copyright 2003 Mark Westcott - * - * 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 WINE_CFG_PROPERTIES_H -#define WINE_CFG_PROPERTIES_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "commctrl.h" - -#define MAX_NAME_LENGTH 64 -#define MAX_VERSION_LENGTH 48 -#define MAX_DESCRIPTION_LENGTH 128 - -#define DLL_NATIVE 0x0000 -#define DLL_BUILTIN 0x0001 - -typedef struct -{ - char szName[MAX_NAME_LENGTH]; - int nType; -} DLL_DESC; - -typedef struct -{ - char szName[MAX_NAME_LENGTH]; - char szWinVer[MAX_VERSION_LENGTH]; - char szDOSVer[MAX_VERSION_LENGTH]; - HDPA DLLs; -} APP_DESC; - -typedef struct -{ - UINT nameID; - char szDriver[MAX_NAME_LENGTH]; -} AUDIO_DRIVER; - -typedef struct -{ - char szX11Display[MAX_NAME_LENGTH]; - int nSysColors; - int nPrivateMap; - int nPerfect; - int nDepth; - int nManaged; - int nDesktopSizeX; - int nDesktopSizeY; - int nDGA; - int nXVidMode; - int nXShm; - int nTextCP; - int nXVideoPort; - int nTakeFocus; - int nDXGrab; - int nDoubleBuffered; - int nSynchronous; -} X11DRV_DESC; - -typedef struct -{ - char szNode[MAX_NAME_LENGTH]; - int nType; -} DEV_NODES; - -#endif diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 7b0006a..f18b75c 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -31,7 +31,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "properties.h" +#include "commctrl.h" #define IS_OPTION_TRUE(ch) \ ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')

1 0

Alexander Nicolaysen Sørnes : regedit: Improve dialog layout.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 66b3d415c3e619bee182285baf3062079ab761e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b3d415c3e619bee182285ba… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun May 18 23:45:59 2008 +0200 regedit: Improve dialog layout. --- programs/regedit/En.rc | 36 ++++++++++++++++++------------------ programs/regedit/No.rc | 36 ++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index c11345b..4dc0ca4 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -198,7 +198,7 @@ BEGIN EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 END -IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 +IDD_FIND DIALOG DISCARDABLE 22, 17, 220, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Find" FONT 8, "MS Shell Dlg" @@ -210,8 +210,8 @@ BEGIN CHECKBOX "Value names", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Value content", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Whole string only", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX - DEFPUSHBUTTON "Find",IDOK,175,5,30,11,WS_GROUP - PUSHBUTTON "Close",IDCANCEL,175,22,30,11, WS_GROUP + DEFPUSHBUTTON "Find",IDOK,175,5,40,15,WS_GROUP + PUSHBUTTON "Close",IDCANCEL,175,24,40,15, WS_GROUP END IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 @@ -221,8 +221,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Name:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,140,40,30,11,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,175,40,30,11, WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,36,40,15,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,165,36,40,15,WS_GROUP END IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 @@ -232,8 +232,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Name:",IDC_STATIC,5,5,119,8 LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK,140,73,30,11,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,175,73,30,11, WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,72,40,15,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,165,72,40,15,WS_GROUP END IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 @@ -245,8 +245,8 @@ BEGIN EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED LTEXT "Value data:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,140,60,30,11,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,175,60,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,56,40,15,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,165,56,40,15,WS_GROUP END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 @@ -261,21 +261,21 @@ BEGIN GROUPBOX "Base", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX AUTORADIOBUTTON "Hexadecimal", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP AUTORADIOBUTTON "Decimal", IDC_DWORD_DEC, 130, 52, 60, 10, WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,175,80,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,78,40,15,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,165,78,40,15,WS_GROUP END -IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 210, 100 +IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 170, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Edit Binary" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Value name:",IDC_STATIC,5,5,119,8 - EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + EDITTEXT IDC_VALUE_NAME,5,15,160,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED LTEXT "Value data:",IDC_STATIC,5,30,90,8 - CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40 - DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,175,80,30,11,WS_GROUP + CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,5,40,160,40 + DEFPUSHBUTTON "OK",IDOK,80,83,40,15,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,125,83,40,15,WS_GROUP END IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 @@ -287,8 +287,8 @@ BEGIN EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED LTEXT "Value data:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN - DEFPUSHBUTTON "OK",IDOK,140,160,30,11,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,175,160,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,156,40,15,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,165,156,40,15,WS_GROUP END /* diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index e487ab4..c6bbc23 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/No.rc @@ -129,7 +129,7 @@ BEGIN EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 END -IDD_FIND DIALOG DISCARDABLE 22, 17, 210, 85 +IDD_FIND DIALOG DISCARDABLE 22, 17, 220, 85 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Finn" FONT 8, "MS Shell Dlg" @@ -141,8 +141,8 @@ CHECKBOX "N CHECKBOX "Verdinavn", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Verdiinnhold", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX CHECKBOX "Kun hele strenger", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX -DEFPUSHBUTTON "Finn",IDOK,175,5,30,11,WS_GROUP -PUSHBUTTON "Lukk",IDCANCEL,175,22,30,11, WS_GROUP +DEFPUSHBUTTON "Finn",IDOK,175,5,40,15,WS_GROUP +PUSHBUTTON "Lukk",IDCANCEL,175,24,40,15, WS_GROUP END IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 @@ -152,8 +152,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Navn:",IDC_STATIC,5,5,119,8 EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL -DEFPUSHBUTTON "OK",IDOK,140,40,30,11,WS_GROUP -PUSHBUTTON "Avbryt",IDCANCEL,175,40,30,11, WS_GROUP +DEFPUSHBUTTON "OK",IDOK,120,36,40,15,WS_GROUP +PUSHBUTTON "Avbryt",IDCANCEL,165,36,40,15,WS_GROUP END IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 @@ -163,8 +163,8 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Navn:",IDC_STATIC,5,5,119,8 LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL -DEFPUSHBUTTON "OK",IDOK,140,73,30,11,WS_GROUP -PUSHBUTTON "Avbryt",IDCANCEL,175,73,30,11, WS_GROUP +DEFPUSHBUTTON "OK",IDOK,120,72,40,15,WS_GROUP +PUSHBUTTON "Avbryt",IDCANCEL,165,72,40,15,WS_GROUP END IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 @@ -176,8 +176,8 @@ BEGIN EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED LTEXT "Verdidata:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,140,60,30,11,WS_GROUP - PUSHBUTTON "Avbryt",IDCANCEL,175,60,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,56,40,15,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,165,56,40,15,WS_GROUP END IDD_EDIT_DWORD DIALOG DISCARDABLE 22, 17, 210, 100 @@ -192,21 +192,21 @@ BEGIN GROUPBOX "Base", IDC_DWORD_BASE, 120, 30, 85, 37, BS_GROUPBOX AUTORADIOBUTTON "Heksadesimal", IDC_DWORD_HEX, 130, 40, 60, 10, WS_TABSTOP AUTORADIOBUTTON "Desimal", IDC_DWORD_DEC, 130, 52, 60, 10, WS_TABSTOP - DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP - PUSHBUTTON "Avbryt",IDCANCEL,175,80,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,78,40,15,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,165,78,40,15,WS_GROUP END -IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 210, 100 +IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 170, 100 STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU CAPTION "Rediger bin�r" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Verdinavn:",IDC_STATIC,5,5,119,8 - EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED + EDITTEXT IDC_VALUE_NAME,5,15,160,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL | WS_DISABLED LTEXT "Verdidata:",IDC_STATIC,5,30,90,8 - CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,4,40,160,40 - DEFPUSHBUTTON "OK",IDOK,140,80,30,11,WS_GROUP - PUSHBUTTON "Avbryt",IDCANCEL,175,80,30,11,WS_GROUP + CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,5,40,160,40 + DEFPUSHBUTTON "OK",IDOK,80,83,40,15,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,125,83,40,15,WS_GROUP END IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 @@ -218,8 +218,8 @@ BEGIN EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED LTEXT "Verdidata:",IDC_STATIC,5,30,119,8 EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN - DEFPUSHBUTTON "OK",IDOK,140,160,30,11,WS_GROUP - PUSHBUTTON "Avbryt",IDCANCEL,175,160,30,11,WS_GROUP + DEFPUSHBUTTON "OK",IDOK,120,156,40,15,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,165,156,40,15,WS_GROUP END /*

1 0

Hans Leidekker : wininet: Fix buffer size query for HttpQueryInfo( HTTP_QUERY_RAW_HEADERS_CRLF).
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 694a09284a8e5e3fa3782d7be5ab13074c0a6201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=694a09284a8e5e3fa3782d7be… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun May 18 21:09:50 2008 +0200 wininet: Fix buffer size query for HttpQueryInfo(HTTP_QUERY_RAW_HEADERS_CRLF). --- dlls/wininet/http.c | 17 ++++++++--------- dlls/wininet/tests/http.c | 7 ++++++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 24918fc..a70bcff 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2197,27 +2197,26 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev { LPWSTR headers; DWORD len; - BOOL ret; + BOOL ret = FALSE; if (request_only) headers = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, lpwhr->lpszVersion); else headers = lpwhr->lpszRawHeaders; - len = strlenW(headers); - if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) + len = (strlenW(headers) + 1) * sizeof(WCHAR); + if (len > *lpdwBufferLength) { - *lpdwBufferLength = (len + 1) * sizeof(WCHAR); INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); ret = FALSE; - } else + } + else if (lpBuffer) { - memcpy(lpBuffer, headers, (len+1)*sizeof(WCHAR)); - *lpdwBufferLength = len * sizeof(WCHAR); - - TRACE("returning data: %s\n", debugstr_wn((WCHAR*)lpBuffer, len)); + memcpy(lpBuffer, headers, len); + TRACE("returning data: %s\n", debugstr_wn(lpBuffer, len / sizeof(WCHAR))); ret = TRUE; } + *lpdwBufferLength = len; if (request_only) HeapFree(GetProcessHeap(), 0, headers); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b946d3b..1cb9793 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1848,10 +1848,15 @@ static void test_open_url_async(void) type = 0; size = sizeof(type); ret = InternetQueryOption(ctx.req, INTERNET_OPTION_HANDLE_TYPE, &type, &size); - ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); + ok(ret, "InternetQueryOption failed: %u\n", GetLastError()); ok(type == INTERNET_HANDLE_TYPE_HTTP_REQUEST, "expected INTERNET_HANDLE_TYPE_HTTP_REQUEST, got %u\n", type); + size = 0; + ret = HttpQueryInfo(ctx.req, HTTP_QUERY_RAW_HEADERS_CRLF, NULL, &size, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "HttpQueryInfo failed\n"); + ok(size > 0, "expected size > 0\n"); + CloseHandle(ctx.event); InternetCloseHandle(ctx.req); InternetCloseHandle(ses);

1 0

Lei Zhang : explorer: Allow explorer with no arguments to run winefile.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: b11156b84a60eb55c1bff13ac192f718baaa2440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11156b84a60eb55c1bff13ac… Author: Lei Zhang <thestig(a)google.com> Date: Fri May 16 11:44:49 2008 -0700 explorer: Allow explorer with no arguments to run winefile. --- programs/explorer/explorer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 9a21ac6..c8c3ea0 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -184,7 +184,7 @@ int WINAPI wWinMain(HINSTANCE hinstance, } rc = CreateProcessW(NULL, winefile_commandline, NULL, NULL, FALSE, 0, NULL, - parameters.root, &si, &info); + parameters.root[0] ? parameters.root:NULL, &si, &info); HeapFree(GetProcessHeap(),0,winefile_commandline);

1 0

James Hawkins : user32: Fix a few tests that fail in win2k3.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 47711cc62e3d1621da01541fc5ea9fe0385743f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47711cc62e3d1621da01541fc… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 19 02:24:52 2008 -0500 user32: Fix a few tests that fail in win2k3. --- dlls/user32/tests/broadcast.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 786df7d..6cf27b8 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -264,6 +264,10 @@ static void test_noprivileges(void) DWORD recips; BOOL ret; + static const DWORD BSM_ALL_RECIPS = BSM_VXDS | BSM_NETDRIVER | + BSM_INSTALLABLEDRIVERS | + BSM_APPLICATIONS | BSM_ALLDESKTOPS; + pOpenProcessToken = (void *)GetProcAddress(advapi32, "OpenProcessToken"); pAdjustTokenPrivileges = (void *)GetProcAddress(advapi32, "AdjustTokenPrivileges"); if (!pOpenProcessToken || !pAdjustTokenPrivileges || !pOpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) @@ -285,7 +289,9 @@ static void test_noprivileges(void) todo_wine ok(GetLastError() == ERROR_PRIVILEGE_NOT_HELD, "Last error: %08x\n", GetLastError()); ok(ret==1, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - ok(recips == BSM_ALLDESKTOPS, "Received by: %08x\n", recips); + ok(recips == BSM_ALLDESKTOPS || + recips == BSM_ALL_RECIPS, /* win2k3 */ + "Received by: %08x\n", recips); PulseEvent(hevent); /* Wine sets last error to 0, so just use that one as token here so it doesn't fail */ @@ -296,7 +302,9 @@ static void test_noprivileges(void) ok(!GetLastError(), "Last error: %08x\n", GetLastError()); ok(ret==1, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - ok(recips == BSM_ALLCOMPONENTS, "Received by: %08x\n", recips); + ok(recips == BSM_ALLCOMPONENTS || + recips == BSM_ALL_RECIPS, /* win2k3 */ + "Received by: %08x\n", recips); PulseEvent(hevent); SetLastError(0xcafebabe); @@ -306,7 +314,9 @@ static void test_noprivileges(void) todo_wine ok(GetLastError() == ERROR_PRIVILEGE_NOT_HELD, "Last error: %08x\n", GetLastError()); ok(ret==1, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS), "Received by: %08x\n", recips); + ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || + recips == BSM_APPLICATIONS, /* win2k3 */ + "Received by: %08x\n", recips); PulseEvent(hevent); SetLastError(0xcafebabe); @@ -316,7 +326,9 @@ static void test_noprivileges(void) todo_wine ok(GetLastError() == ERROR_PRIVILEGE_NOT_HELD, "Last error: %08x\n", GetLastError()); ok(!ret, "Returned: %d\n", ret); ok(WaitForSingleObject(hevent, 0) != WAIT_TIMEOUT, "Asynchronous message sent instead\n"); - ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS), "Received by: %08x\n", recips); + ok(recips == (BSM_ALLDESKTOPS|BSM_APPLICATIONS) || + recips == BSM_APPLICATIONS, /* win2k3 */ + "Received by: %08x\n", recips); PulseEvent(hevent); }

1 0

James Hawkins : msi: Don't enable a feature' s components if that feature is disabled.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 622197540700ad716c7bbf5388a4dc1fa6afa255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=622197540700ad716c7bbf538… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 19 02:27:50 2008 -0500 msi: Don't enable a feature's components if that feature is disabled. --- dlls/msi/action.c | 10 ++-- dlls/msi/tests/install.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=622197540700ad716c7bb…

1 0

James Hawkins : msi: Reset the hasLocalFeature flag when updating components.
by Alexandre Julliard 19 May '08

19 May '08

Module: wine Branch: master Commit: 95282bdeaaed1f0d5ef5cea1f00b1d7239e5ec0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=95282bdeaaed1f0d5ef5cea1f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 19 02:28:50 2008 -0500 msi: Reset the hasLocalFeature flag when updating components. --- dlls/msi/helpers.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 223cacd..3ff47ed 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -921,6 +921,8 @@ void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) ComponentList *clist; MSIFEATURE *f; + component->hasLocalFeature = FALSE; + msi_component_set_state( component, newstate ); /*if any other feature wants is local we need to set it local*/ @@ -939,6 +941,7 @@ void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature) f->ActionRequest == INSTALLSTATE_SOURCE) ) { TRACE("Saved by %s\n", debugstr_w(f->Feature)); + component->hasLocalFeature = TRUE; if (component->Attributes & msidbComponentAttributesOptional) {

1 0