June 2010 - Wine-commits - list.winehq.org

David Hedberg : include: Update FOLDERVIEWMODE and FOLDERFLAGS.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 5858a3bc178511b47e92d624f4d9a038f11f2d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5858a3bc178511b47e92d624f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jun 1 04:46:47 2010 +0200 include: Update FOLDERVIEWMODE and FOLDERFLAGS. --- include/shobjidl.idl | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index ddaaafc..f022c78 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -409,11 +409,25 @@ typedef enum FWF_SINGLECLICKACTIVATE = 0x00008000, FWF_NOWEBVIEW = 0x00010000, FWF_HIDEFILENAMES = 0x00020000, - FWF_CHECKSELECT = 0x00040000 + FWF_CHECKSELECT = 0x00040000, + FWF_NOENUMREFRESH = 0x00080000, + FWF_NOGROUPING = 0x00100000, + FWF_FULLROWSELECT = 0x00200000, + FWF_NOFILTERS = 0x00400000, + FWF_NOCOLUMNHEADER = 0x00800000, + FWF_NOHEADERINALLVIEWS = 0x01000000, + FWF_EXTENDEDTILES = 0x02000000, + FWF_TRICHECKSELECT = 0x04000000, + FWF_AUTOCHECKSELECT = 0x08000000, + FWF_NOBROWSERVIEWSTATE = 0x10000000, + FWF_SUBSETGROUPS = 0x20000000, + FWF_USESEARCHFOLDER = 0x40000000, + FWF_ALLOWRTLREADING = 0x80000000 } FOLDERFLAGS; typedef enum { + FVM_AUTO =-1, FVM_ICON = 1, FVM_FIRST = FVM_ICON, FVM_SMALLICON = 2, @@ -422,7 +436,8 @@ typedef enum FVM_THUMBNAIL = 5, FVM_TILE = 6, FVM_THUMBSTRIP = 7, - FVM_LAST = FVM_THUMBSTRIP + FVM_CONTENT = 8, + FVM_LAST = FVM_CONTENT } FOLDERVIEWMODE; typedef struct

1 0

David Hedberg : include: Add new SBSP_* defines.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 5c451900bb2e07f23080e749367aa77eceb900fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c451900bb2e07f23080e7493… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jun 1 04:46:45 2010 +0200 include: Add new SBSP_* defines. --- include/shobjidl.idl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index f022c78..6bd0244 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -648,8 +648,18 @@ cpp_quote("#define SBSP_PARENT 0x00002000") cpp_quote("#define SBSP_NAVIGATEBACK 0x00004000") cpp_quote("#define SBSP_NAVIGATEFORWARD 0x00008000") cpp_quote("#define SBSP_ALLOW_AUTONAVIGATE 0x00010000") +cpp_quote("#define SBSP_KEEPSAMETEMPLATE 0x00020000") +cpp_quote("#define SBSP_KEEPWORDWHEELTEXT 0x00040000") +cpp_quote("#define SBSP_ACTIVATE_NOFOCUS 0x00080000") +cpp_quote("#define SBSP_CREATENOHISTORY 0x00100000") +cpp_quote("#define SBSP_PLAYNOSOUND 0x00200000") +cpp_quote("#define SBSP_CALLERUNTURUSTED 0x00800000") +cpp_quote("#define SBSP_TRUSTFIRSTDOWNLOAD 0x01000000") +cpp_quote("#define SBSP_UNTRUSTEDFORDOWNLOAD 0x02000000") cpp_quote("#define SBSP_NOAUTOSELECT 0x04000000") cpp_quote("#define SBSP_WRITENOHISTORY 0x08000000") +cpp_quote("#define SBSP_TRUSTEDFORACTIVEX 0x10000000") +cpp_quote("#define SBSP_FEEDNAVIGATION 0x20000000") cpp_quote("#define SBSP_REDIRECT 0x40000000") cpp_quote("#define SBSP_INITIATEDBYHLINKFRAME 0x80000000")

1 0

David Hedberg : shell32: Fix possible memory leak in CreateUnixFolder.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: c1682eb8eb42fa54c8f4c7860acef10de4eaa474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1682eb8eb42fa54c8f4c7860… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Jun 1 04:46:44 2010 +0200 shell32: Fix possible memory leak in CreateUnixFolder. --- dlls/shell32/shfldr_unixfs.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 2951d6a..dfd7255 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -2158,13 +2158,15 @@ static const IDropTargetVtbl UnixFolder_IDropTarget_Vtbl = { static HRESULT CreateUnixFolder(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv, const CLSID *pCLSID) { HRESULT hr = E_FAIL; - UnixFolder *pUnixFolder = SHAlloc((ULONG)sizeof(UnixFolder)); + UnixFolder *pUnixFolder; if (pUnkOuter) { FIXME("Aggregation not yet implemented!\n"); return CLASS_E_NOAGGREGATION; } + pUnixFolder = SHAlloc((ULONG)sizeof(UnixFolder)); + if(pUnixFolder) { pUnixFolder->lpIShellFolder2Vtbl = &UnixFolder_IShellFolder2_Vtbl; pUnixFolder->lpIPersistFolder3Vtbl = &UnixFolder_IPersistFolder3_Vtbl;

1 0

Dmitry Timoshkov : hhctrl.ocx: Add a trace for the resulting CHM offset to string conversion.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: a70e10d03dc40527418f6d96ccf9a74e0338c825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70e10d03dc40527418f6d96c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 1 15:26:02 2010 +0900 hhctrl.ocx: Add a trace for the resulting CHM offset to string conversion. --- dlls/hhctrl.ocx/chm.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index cf5b8bf..4c85bd9 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); /* Reads a string from the #STRINGS section in the CHM file */ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) { + LPCSTR str; + if(!chm->strings_stream) return NULL; @@ -72,7 +74,9 @@ static LPCSTR GetChmString(CHMInfo *chm, DWORD offset) } } - return chm->strings[offset >> BLOCK_BITS] + (offset & BLOCK_MASK); + str = chm->strings[offset >> BLOCK_BITS] + (offset & BLOCK_MASK); + TRACE("offset %#x => %s\n", offset, debugstr_a(str)); + return str; } static BOOL ReadChmSystem(CHMInfo *chm)

1 0

Dmitry Timoshkov : hhctrl.ocx: If a CHM file reports window dimensions and title but doesn' t really set them use default values.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: a314027b4211ddd045e12bd768962c3c47f56d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a314027b4211ddd045e12bd76… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jun 1 15:26:13 2010 +0900 hhctrl.ocx: If a CHM file reports window dimensions and title but doesn't really set them use default values. --- dlls/hhctrl.ocx/help.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 30cb008..2ea0132 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1260,7 +1260,8 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) RECT winPos = info->WinType.rcWindowPos; WNDCLASSEXW wcex; DWORD dwStyles, dwExStyles; - DWORD x, y, width, height; + DWORD x, y, width = 0, height = 0; + LPCWSTR caption; static const WCHAR windowClassW[] = { 'H','H',' ', 'P','a','r','e','n','t',0 @@ -1301,7 +1302,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) width = winPos.right - x; height = winPos.bottom - y; } - else + if (!width || !height) { x = WINTYPE_DEFAULT_X; y = WINTYPE_DEFAULT_Y; @@ -1309,7 +1310,10 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) height = WINTYPE_DEFAULT_HEIGHT; } - hWnd = CreateWindowExW(dwExStyles, windowClassW, info->WinType.pszCaption, + caption = info->WinType.pszCaption; + if (!*caption) caption = info->pCHMInfo->defTitle; + + hWnd = CreateWindowExW(dwExStyles, windowClassW, caption, dwStyles, x, y, width, height, NULL, NULL, hhctrl_hinstance, NULL); if (!hWnd) return FALSE;

1 0

André Hentschel : winemenubuilder: Simplify switch cases.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: d6001be3483f8e7bd8fa5f39f4b686b0cc8ffe4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6001be3483f8e7bd8fa5f39f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 31 19:19:29 2010 +0200 winemenubuilder: Simplify switch cases. --- programs/winemenubuilder/winemenubuilder.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 413e5de..a40a657 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -505,11 +505,9 @@ static BOOL SaveIconResAsPNG(const BITMAPINFO *pIcon, const char *png_filename, switch (pIcon->bmiHeader.biBitCount) { case 4: - return SavePalettedIconResAsPNG(pIcon, png_filename, commentW); case 8: return SavePalettedIconResAsPNG(pIcon, png_filename, commentW); case 24: - return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW); case 32: return SaveTrueColorIconResAsPNG(pIcon, png_filename, commentW); default:

1 0

André Hentschel : winetest: Add an else case.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 99a24eaf48d06b37661225eaf11ccf029140ddf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a24eaf48d06b37661225eaf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 31 19:20:16 2010 +0200 winetest: Add an else case. --- programs/winetest/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 3eabf5f..01217d2 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -212,6 +212,8 @@ static void print_version (void) static const char platform[] = "alpha"; #elif defined(__powerpc__) static const char platform[] = "powerpc"; +#else +# error CPU unknown #endif OSVERSIONINFOEX ver; BOOL ext, wow64;

1 0

Henri Verbeet : wined3d: Get rid of some dead code.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: 1b5cc39a86256f5d3d582429924fcc6b6bd80400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5cc39a86256f5d3d5824299… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 31 20:40:26 2010 +0200 wined3d: Get rid of some dead code. --- dlls/wined3d/drawprim.c | 40 ---------- dlls/wined3d/surface.c | 162 ---------------------------------------- dlls/wined3d/surface_base.c | 9 -- dlls/wined3d/surface_gdi.c | 136 --------------------------------- dlls/wined3d/swapchain.c | 40 ---------- dlls/wined3d/wined3d_private.h | 34 -------- include/wine/wined3d.idl | 3 - 7 files changed, 0 insertions(+), 424 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b5cc39a86256f5d3d582…

1 0

Austin English : ntdll: Add signal context function definitions for FreeBSD .
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: da77e7456bd90dd7621deba1d97764f31c6af7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da77e7456bd90dd7621deba1d… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 31 15:19:38 2010 -0500 ntdll: Add signal context function definitions for FreeBSD. --- dlls/ntdll/signal_x86_64.c | 53 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ccea6df..f509006 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -29,6 +29,10 @@ #include <stdarg.h> #include <stdio.h> +#ifdef HAVE_UCONTEXT_H +# include <ucontext.h> +#endif + #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -132,12 +136,45 @@ extern int arch_prctl(int func, void *ptr); #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.fpregs)) -#endif /* linux */ - -#if defined(__NetBSD__) -# include <sys/ucontext.h> -# include <sys/types.h> -# include <signal.h> +#elif defined(__FreeBSD__) +#include <sys/ucontext.h> + +#define RAX_sig(context) ((context)->uc_mcontext.mc_rax) +#define RBX_sig(context) ((context)->uc_mcontext.mc_rbx) +#define RCX_sig(context) ((context)->uc_mcontext.mc_rcx) +#define RDX_sig(context) ((context)->uc_mcontext.mc_rdx) +#define RSI_sig(context) ((context)->uc_mcontext.mc_rsi) +#define RDI_sig(context) ((context)->uc_mcontext.mc_rdi) +#define RBP_sig(context) ((context)->uc_mcontext.mc_rbp) +#define R8_sig(context) ((context)->uc_mcontext.mc_r8) +#define R9_sig(context) ((context)->uc_mcontext.mc_r9) +#define R10_sig(context) ((context)->uc_mcontext.mc_r10) +#define R11_sig(context) ((context)->uc_mcontext.mc_r11) +#define R12_sig(context) ((context)->uc_mcontext.mc_r12) +#define R13_sig(context) ((context)->uc_mcontext.mc_r13) +#define R14_sig(context) ((context)->uc_mcontext.mc_r14) +#define R15_sig(context) ((context)->uc_mcontext.mc_r15) + +#define CS_sig(context) ((context)->uc_mcontext.mc_cs) +#define DS_sig(context) ((context)->uc_mcontext.mc_ds) +#define ES_sig(context) ((context)->uc_mcontext.mc_es) +#define FS_sig(context) ((context)->uc_mcontext.mc_fs) +#define GS_sig(context) ((context)->uc_mcontext.mc_gs) +#define SS_sig(context) ((context)->uc_mcontext.mc_ss) + +#define EFL_sig(context) ((context)->uc_mcontext.mc_rflags) + +#define RIP_sig(context) ((context)->uc_mcontext.mc_rip) +#define RSP_sig(context) ((context)->uc_mcontext.mc_rsp) +#define TRAP_sig(context) ((context)->uc_mcontext.mc_trapno) +#define ERROR_sig(context) ((context)->uc_mcontext.mc_err) + +#define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.mc_fpstate)) + +#elif defined(__NetBSD__) +#include <sys/ucontext.h> +#include <sys/types.h> +#include <signal.h> #define RAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RAX]) #define RBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_RBX]) @@ -171,7 +208,9 @@ extern int arch_prctl(int func, void *ptr); #define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR]) #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs)) -#endif /* __NetBSD__ */ +#else +#error You must define the signal context functions for your platform +#endif enum i386_trap_code {

1 0

Sven Baars : regedit: Fix Dutch translation.
by Alexandre Julliard 01 Jun '10

01 Jun '10

Module: wine Branch: master Commit: ce1be8f82770f346bfe30f650eb34f4684918844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce1be8f82770f346bfe30f650… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon May 31 22:57:39 2010 +0200 regedit: Fix Dutch translation. --- programs/regedit/Nl.rc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/regedit/Nl.rc b/programs/regedit/Nl.rc index f02ab65..4336de2 100644 --- a/programs/regedit/Nl.rc +++ b/programs/regedit/Nl.rc @@ -22,6 +22,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) /* * Menu @@ -56,9 +57,9 @@ BEGIN END MENUITEM SEPARATOR MENUITEM "&Verwijderen\tDel", ID_EDIT_DELETE - MENUITEM "&Naam wijzigen\tF2" ID_EDIT_RENAME + MENUITEM "N&aam wijzigen\tF2" ID_EDIT_RENAME MENUITEM SEPARATOR - MENUITEM "&Sleutelnaam kopi�ren", ID_EDIT_COPYKEYNAME + MENUITEM "&Sleutelnaam kopiëren", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Zoeken\tCtrl+F", ID_EDIT_FIND, GRAYED MENUITEM "Volgende Zoeken\tF3", ID_EDIT_FINDNEXT, GRAYED @@ -110,7 +111,7 @@ BEGIN MENUITEM "&Naam wijzigen\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR MENUITEM "&Exporteren...", ID_EDIT_EXPORT - MENUITEM "&Sleutelnaam kopi�ren", ID_EDIT_COPYKEYNAME + MENUITEM "&Sleutelnaam kopiëren", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR MENUITEM "&Zoeken\tCtrl+F", ID_EDIT_FIND, GRAYED END @@ -281,7 +282,7 @@ BEGIN ID_VIEW_REFRESH "Het venster vernieuwen" ID_EDIT_DELETE "De selectie verwijderen" ID_EDIT_RENAME "De naam van de selectie wijzigen" - ID_EDIT_COPYKEYNAME "De naam van de geselecteerde sleutel naar het Klembord kopi�ren" + ID_EDIT_COPYKEYNAME "De naam van de geselecteerde sleutel naar het Klembord kopiëren" ID_EDIT_FIND "Een tekenreeks zoeken in een sleutel, een waarde of gegevens" ID_EDIT_FINDNEXT "De opgegeven tekst nogmaals zoeken" ID_EDIT_EXPORT "Exporteert de geselecteerde subsleutel van het register naar een tekst bestand"

1 0