wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Austin English : setupapi: Add stubs for SetupDiBuildDriverInfoList and SetupDiDeleteDeviceInfo:.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: dab1bbef29c84d11d07b80f5262d70689c216366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab1bbef29c84d11d07b80f52… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 27 03:44:44 2010 -0500 setupapi: Add stubs for SetupDiBuildDriverInfoList and SetupDiDeleteDeviceInfo:. --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 7695c89..6de75b1 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -273,7 +273,7 @@ @ stdcall SetupDiBuildClassInfoList(long ptr long ptr) @ stdcall SetupDiBuildClassInfoListExA(long ptr long ptr str ptr) @ stdcall SetupDiBuildClassInfoListExW(long ptr long ptr wstr ptr) -@ stub SetupDiBuildDriverInfoList +@ stdcall SetupDiBuildDriverInfoList(ptr ptr long) @ stdcall SetupDiCallClassInstaller(long ptr ptr) @ stub SetupDiCancelDriverInfoSearch @ stub SetupDiChangeState @@ -297,7 +297,7 @@ @ stdcall SetupDiCreateDeviceInterfaceRegKeyA(ptr ptr long long ptr ptr) @ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr ptr) @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) -@ stub SetupDiDeleteDeviceInfo +@ stdcall SetupDiDeleteDeviceInfo(ptr ptr) @ stub SetupDiDeleteDeviceInterfaceData @ stdcall SetupDiDeleteDeviceInterfaceRegKey(ptr ptr long) @ stub SetupDiDeleteDeviceRegKey diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index f8e99e0..264a890 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -393,3 +393,27 @@ BOOL WINAPI SetupLogFileA( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * SetupDiBuildDriverInfoList (SETUPAPI.@) + */ + +BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType) + { + FIXME(": stub %p, %p, %d\n", DeviceInfoSet, DeviceInfoData, DriverType); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + +/*********************************************************************** + * SetupDiDeleteDeviceInfo (SETUPAPI.@) + */ + +BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData) + { + FIXME(": stub %p, %p\n", DeviceInfoSet, DeviceInfoData); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + }

1 0

Jaroslav Šmíd : hhctrl.ocx: Make sure pszCaption and pszFile are never 0.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 5b7bd76086e94ca3fb9cfb7c308d334ae35ee9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7bd76086e94ca3fb9cfb7c3… Author: Jaroslav Šmíd <jardasmid(a)gmail.com> Date: Sat Jun 26 22:24:04 2010 +0200 hhctrl.ocx: Make sure pszCaption and pszFile are never 0. --- dlls/hhctrl.ocx/chm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 4c85bd9..f0452fa 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -238,11 +238,11 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) info->WinType.pszIndex = strdupW(null); info->WinType.fsValidMembers=0; info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE; - info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle); + info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle ? info->pCHMInfo->defTitle : null); info->WinType.dwStyles=WS_POPUP; info->WinType.dwExStyles=0; info->WinType.nShowState=SW_SHOW; - info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic); + info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); info->WinType.curNavType=HHWIN_NAVTYPE_TOC; return TRUE; }

1 0

Eric Pouech : dbghelp: Ensure we can try to load COFF symbols if none is found in other debug formats .
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 3ced7b8f40a767ebd4df3b2fce6bfe08b170004d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ced7b8f40a767ebd4df3b2fc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 26 22:54:07 2010 +0200 dbghelp: Ensure we can try to load COFF symbols if none is found in other debug formats. --- dlls/dbghelp/dwarf.c | 7 +++---- dlls/dbghelp/pe_module.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 6daf7d7..4d7ec0d 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3077,10 +3077,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, struct module_format* dwarf2_modfmt; if (!dwarf2_init_section(&section[section_debug], fmap, ".debug_info", &debug_sect)) - { - /* no Dwarf debug info here, so there's no error */ - return TRUE; - } + /* no Dwarf debug info here */ + return FALSE; + dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", &debug_abbrev_sect); dwarf2_init_section(&section[section_string], fmap, ".debug_str", &debug_str_sect); dwarf2_init_section(&section[section_line], fmap, ".debug_line", &debug_line_sect); diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index a46193c..18cec9a 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -183,8 +183,8 @@ static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* /* is the iSym table inside file size ? (including first DWORD of string table, which is its size) */ offset = (DWORD64)nthdr->FileHeader.PointerToSymbolTable; - offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL) + sizeof(DWORD); - if (offset > sz) return FALSE; + offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + if (offset + sizeof(DWORD) > sz) return FALSE; /* is string table (following iSym table) inside file size ? */ offset += *(DWORD*)((const char*)mapping + offset); return offset <= sz;

1 0

Eric Pouech : dbghelp: Test validity of COFF symbol table against file size (and not image size).
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: d97e6a47e59feae67f1e54654e24546d3f01fcc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97e6a47e59feae67f1e54654… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 26 22:54:01 2010 +0200 dbghelp: Test validity of COFF symbol table against file size (and not image size). --- dlls/dbghelp/pe_module.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 7f20ea8..a46193c 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -177,17 +177,17 @@ unsigned pe_get_map_size(const struct image_section_map* ism) * Checks whether the PointerToSymbolTable and NumberOfSymbols in file_header contain * valid information. */ -static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* mapping) +static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* mapping, DWORD64 sz) { DWORD64 offset; - /* is the iSym table inside file image ? */ + /* is the iSym table inside file size ? (including first DWORD of string table, which is its size) */ offset = (DWORD64)nthdr->FileHeader.PointerToSymbolTable; - offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); - if (offset > (DWORD64)nthdr->OptionalHeader.SizeOfImage) return FALSE; - /* is string table (following iSym table) inside file image ? */ + offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL) + sizeof(DWORD); + if (offset > sz) return FALSE; + /* is string table (following iSym table) inside file size ? */ offset += *(DWORD*)((const char*)mapping + offset); - return offset <= (DWORD64)nthdr->OptionalHeader.SizeOfImage; + return offset <= sz; } /****************************************************************** @@ -228,7 +228,9 @@ static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_ty } if (nthdr->FileHeader.PointerToSymbolTable && nthdr->FileHeader.NumberOfSymbols) { - if (pe_is_valid_pointer_table(nthdr, mapping)) + LARGE_INTEGER li; + + if (GetFileSizeEx(file, &li) && pe_is_valid_pointer_table(nthdr, mapping, li.QuadPart)) { /* FIXME ugly: should rather map the relevant content instead of copying it */ const char* src = (const char*)mapping + @@ -243,6 +245,7 @@ static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_ty } else { + WARN("Bad coff table... wipping out\n"); /* we have bad information here, wipe it out */ fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable = 0; fmap->u.pe.ntheader.FileHeader.NumberOfSymbols = 0;

1 0

Eric Pouech : dbghelp: Fix the localization of section table while loading COFF information.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 1f5ff75107e73e6432cddf83215dae79660b23d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5ff75107e73e6432cddf832… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jun 26 22:53:55 2010 +0200 dbghelp: Fix the localization of section table while loading COFF information. --- dlls/dbghelp/pe_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index cd2f248..7f20ea8 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -409,7 +409,7 @@ static BOOL pe_load_coff_symbol_table(struct module* module) isym = (const IMAGE_SYMBOL*)((const char*)mapping + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable); /* FIXME: no way to get strtable size */ strtable = (const char*)&isym[numsym]; - sect = IMAGE_FIRST_SECTION(&fmap->u.pe.ntheader); + sect = IMAGE_FIRST_SECTION(RtlImageNtHeader((HMODULE)mapping)); for (i = 0; i < numsym; i+= naux, isym += naux) {

1 0

Ilya Basin : include: Fix packing bug in shlobj.h. pragma pack 8 for ITEMSPACING, CSFV, SFV_CREATE.
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: fcba27239169267febb3b76de5de40b7f8109d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcba27239169267febb3b76de… Author: Ilya Basin <basinilya(a)gmail.com> Date: Sat Jun 26 17:37:48 2010 +0400 include: Fix packing bug in shlobj.h. pragma pack 8 for ITEMSPACING, CSFV, SFV_CREATE. --- dlls/shell32/tests/generated.c | 116 +++++++++++++++++++++++++++++++++------- include/shlobj.h | 12 ++++ tools/winapi/tests.dat | 2 + 3 files changed, 111 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index e3f0633..ace877e 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -1386,25 +1386,25 @@ static void test_pack_CIDA(void) static void test_pack_CSFV(void) { - /* CSFV (pack 1) */ + /* CSFV (pack 8) */ TEST_FIELD_SIZE (CSFV, cbSize, 4) - TEST_FIELD_ALIGN (CSFV, cbSize, 1) + TEST_FIELD_ALIGN (CSFV, cbSize, 4) TEST_FIELD_OFFSET(CSFV, cbSize, 0) TEST_FIELD_SIZE (CSFV, pshf, 8) - TEST_FIELD_ALIGN (CSFV, pshf, 1) - TEST_FIELD_OFFSET(CSFV, pshf, 4) + TEST_FIELD_ALIGN (CSFV, pshf, 8) + TEST_FIELD_OFFSET(CSFV, pshf, 8) TEST_FIELD_SIZE (CSFV, psvOuter, 8) - TEST_FIELD_ALIGN (CSFV, psvOuter, 1) - TEST_FIELD_OFFSET(CSFV, psvOuter, 12) + TEST_FIELD_ALIGN (CSFV, psvOuter, 8) + TEST_FIELD_OFFSET(CSFV, psvOuter, 16) TEST_FIELD_SIZE (CSFV, pidl, 8) - TEST_FIELD_ALIGN (CSFV, pidl, 1) - TEST_FIELD_OFFSET(CSFV, pidl, 20) + TEST_FIELD_ALIGN (CSFV, pidl, 8) + TEST_FIELD_OFFSET(CSFV, pidl, 24) TEST_FIELD_SIZE (CSFV, lEvents, 4) - TEST_FIELD_ALIGN (CSFV, lEvents, 1) - TEST_FIELD_OFFSET(CSFV, lEvents, 28) + TEST_FIELD_ALIGN (CSFV, lEvents, 4) + TEST_FIELD_OFFSET(CSFV, lEvents, 32) TEST_FIELD_SIZE (CSFV, pfnCallback, 8) - TEST_FIELD_ALIGN (CSFV, pfnCallback, 1) - TEST_FIELD_OFFSET(CSFV, pfnCallback, 32) + TEST_FIELD_ALIGN (CSFV, pfnCallback, 8) + TEST_FIELD_OFFSET(CSFV, pfnCallback, 40) } static void test_pack_DROPFILES(void) @@ -1532,6 +1532,25 @@ static void test_pack_FILEGROUPDESCRIPTORW(void) TEST_FIELD_OFFSET(FILEGROUPDESCRIPTORW, fgd, 4) } +static void test_pack_ITEMSPACING(void) +{ + /* ITEMSPACING (pack 8) */ + TEST_TYPE_SIZE (ITEMSPACING, 16) + TEST_TYPE_ALIGN (ITEMSPACING, 4) + TEST_FIELD_SIZE (ITEMSPACING, cxSmall, 4) + TEST_FIELD_ALIGN (ITEMSPACING, cxSmall, 4) + TEST_FIELD_OFFSET(ITEMSPACING, cxSmall, 0) + TEST_FIELD_SIZE (ITEMSPACING, cySmall, 4) + TEST_FIELD_ALIGN (ITEMSPACING, cySmall, 4) + TEST_FIELD_OFFSET(ITEMSPACING, cySmall, 4) + TEST_FIELD_SIZE (ITEMSPACING, cxLarge, 4) + TEST_FIELD_ALIGN (ITEMSPACING, cxLarge, 4) + TEST_FIELD_OFFSET(ITEMSPACING, cxLarge, 8) + TEST_FIELD_SIZE (ITEMSPACING, cyLarge, 4) + TEST_FIELD_ALIGN (ITEMSPACING, cyLarge, 4) + TEST_FIELD_OFFSET(ITEMSPACING, cyLarge, 12) +} + static void test_pack_LPBROWSEINFOA(void) { /* LPBROWSEINFOA */ @@ -1756,6 +1775,25 @@ static void test_pack_QCMINFO_IDMAP_PLACEMENT(void) TEST_FIELD_OFFSET(QCMINFO_IDMAP_PLACEMENT, fFlags, 4) } +static void test_pack_SFV_CREATE(void) +{ + /* SFV_CREATE (pack 8) */ + TEST_TYPE_SIZE (SFV_CREATE, 32) + TEST_TYPE_ALIGN (SFV_CREATE, 8) + TEST_FIELD_SIZE (SFV_CREATE, cbSize, 4) + TEST_FIELD_ALIGN (SFV_CREATE, cbSize, 4) + TEST_FIELD_OFFSET(SFV_CREATE, cbSize, 0) + TEST_FIELD_SIZE (SFV_CREATE, pshf, 8) + TEST_FIELD_ALIGN (SFV_CREATE, pshf, 8) + TEST_FIELD_OFFSET(SFV_CREATE, pshf, 8) + TEST_FIELD_SIZE (SFV_CREATE, psvOuter, 8) + TEST_FIELD_ALIGN (SFV_CREATE, psvOuter, 8) + TEST_FIELD_OFFSET(SFV_CREATE, psvOuter, 16) + TEST_FIELD_SIZE (SFV_CREATE, psfvcb, 8) + TEST_FIELD_ALIGN (SFV_CREATE, psfvcb, 8) + TEST_FIELD_OFFSET(SFV_CREATE, psfvcb, 24) +} + static void test_pack_SHChangeDWORDAsIDList(void) { /* SHChangeDWORDAsIDList (pack 1) */ @@ -3166,24 +3204,24 @@ static void test_pack_CIDA(void) static void test_pack_CSFV(void) { - /* CSFV (pack 1) */ + /* CSFV (pack 8) */ TEST_FIELD_SIZE (CSFV, cbSize, 4) - TEST_FIELD_ALIGN (CSFV, cbSize, 1) + TEST_FIELD_ALIGN (CSFV, cbSize, 4) TEST_FIELD_OFFSET(CSFV, cbSize, 0) TEST_FIELD_SIZE (CSFV, pshf, 4) - TEST_FIELD_ALIGN (CSFV, pshf, 1) + TEST_FIELD_ALIGN (CSFV, pshf, 4) TEST_FIELD_OFFSET(CSFV, pshf, 4) TEST_FIELD_SIZE (CSFV, psvOuter, 4) - TEST_FIELD_ALIGN (CSFV, psvOuter, 1) + TEST_FIELD_ALIGN (CSFV, psvOuter, 4) TEST_FIELD_OFFSET(CSFV, psvOuter, 8) TEST_FIELD_SIZE (CSFV, pidl, 4) - TEST_FIELD_ALIGN (CSFV, pidl, 1) + TEST_FIELD_ALIGN (CSFV, pidl, 4) TEST_FIELD_OFFSET(CSFV, pidl, 12) TEST_FIELD_SIZE (CSFV, lEvents, 4) - TEST_FIELD_ALIGN (CSFV, lEvents, 1) + TEST_FIELD_ALIGN (CSFV, lEvents, 4) TEST_FIELD_OFFSET(CSFV, lEvents, 16) TEST_FIELD_SIZE (CSFV, pfnCallback, 4) - TEST_FIELD_ALIGN (CSFV, pfnCallback, 1) + TEST_FIELD_ALIGN (CSFV, pfnCallback, 4) TEST_FIELD_OFFSET(CSFV, pfnCallback, 20) } @@ -3312,6 +3350,25 @@ static void test_pack_FILEGROUPDESCRIPTORW(void) TEST_FIELD_OFFSET(FILEGROUPDESCRIPTORW, fgd, 4) } +static void test_pack_ITEMSPACING(void) +{ + /* ITEMSPACING (pack 8) */ + TEST_TYPE_SIZE (ITEMSPACING, 16) + TEST_TYPE_ALIGN (ITEMSPACING, 4) + TEST_FIELD_SIZE (ITEMSPACING, cxSmall, 4) + TEST_FIELD_ALIGN (ITEMSPACING, cxSmall, 4) + TEST_FIELD_OFFSET(ITEMSPACING, cxSmall, 0) + TEST_FIELD_SIZE (ITEMSPACING, cySmall, 4) + TEST_FIELD_ALIGN (ITEMSPACING, cySmall, 4) + TEST_FIELD_OFFSET(ITEMSPACING, cySmall, 4) + TEST_FIELD_SIZE (ITEMSPACING, cxLarge, 4) + TEST_FIELD_ALIGN (ITEMSPACING, cxLarge, 4) + TEST_FIELD_OFFSET(ITEMSPACING, cxLarge, 8) + TEST_FIELD_SIZE (ITEMSPACING, cyLarge, 4) + TEST_FIELD_ALIGN (ITEMSPACING, cyLarge, 4) + TEST_FIELD_OFFSET(ITEMSPACING, cyLarge, 12) +} + static void test_pack_LPBROWSEINFOA(void) { /* LPBROWSEINFOA */ @@ -3536,6 +3593,25 @@ static void test_pack_QCMINFO_IDMAP_PLACEMENT(void) TEST_FIELD_OFFSET(QCMINFO_IDMAP_PLACEMENT, fFlags, 4) } +static void test_pack_SFV_CREATE(void) +{ + /* SFV_CREATE (pack 8) */ + TEST_TYPE_SIZE (SFV_CREATE, 16) + TEST_TYPE_ALIGN (SFV_CREATE, 4) + TEST_FIELD_SIZE (SFV_CREATE, cbSize, 4) + TEST_FIELD_ALIGN (SFV_CREATE, cbSize, 4) + TEST_FIELD_OFFSET(SFV_CREATE, cbSize, 0) + TEST_FIELD_SIZE (SFV_CREATE, pshf, 4) + TEST_FIELD_ALIGN (SFV_CREATE, pshf, 4) + TEST_FIELD_OFFSET(SFV_CREATE, pshf, 4) + TEST_FIELD_SIZE (SFV_CREATE, psvOuter, 4) + TEST_FIELD_ALIGN (SFV_CREATE, psvOuter, 4) + TEST_FIELD_OFFSET(SFV_CREATE, psvOuter, 8) + TEST_FIELD_SIZE (SFV_CREATE, psfvcb, 4) + TEST_FIELD_ALIGN (SFV_CREATE, psfvcb, 4) + TEST_FIELD_OFFSET(SFV_CREATE, psfvcb, 12) +} + static void test_pack_SHChangeDWORDAsIDList(void) { /* SHChangeDWORDAsIDList (pack 1) */ @@ -3682,6 +3758,7 @@ static void test_pack(void) test_pack_HYPER_SIZEDARR(); test_pack_IID(); test_pack_ITEMIDLIST(); + test_pack_ITEMSPACING(); test_pack_LPBLOB(); test_pack_LPBROWSEINFOA(); test_pack_LPBROWSEINFOW(); @@ -3740,6 +3817,7 @@ static void test_pack(void) test_pack_RemHMETAFILEPICT(); test_pack_RemHPALETTE(); test_pack_SCODE(); + test_pack_SFV_CREATE(); test_pack_SHChangeDWORDAsIDList(); test_pack_SHChangeNotifyEntry(); test_pack_SHChangeProductKeyAsIDList(); diff --git a/include/shlobj.h b/include/shlobj.h index df1fc93..dbf8518 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -542,6 +542,8 @@ DECLARE_INTERFACE_(IShellFolderViewCB,IUnknown) * IShellFolderView interface */ +#include <pshpack8.h> + typedef struct _ITEMSPACING { int cxSmall; @@ -550,6 +552,8 @@ typedef struct _ITEMSPACING int cyLarge; } ITEMSPACING; +#include <poppack.h> + #define INTERFACE IShellFolderView DEFINE_GUID(IID_IShellFolderView,0x37a378c0,0xf82d,0x11ce,0xae,0x65,0x08,0x00,0x2b,0x2e,0x12,0x62); DECLARE_INTERFACE_(IShellFolderView, IUnknown) @@ -779,6 +783,8 @@ typedef HRESULT (CALLBACK *LPFNVIEWCALLBACK)( WPARAM wParam, LPARAM lParam); +#include <pshpack8.h> + typedef struct _CSFV { UINT cbSize; @@ -790,6 +796,8 @@ typedef struct _CSFV FOLDERVIEWMODE fvm; } CSFV, *LPCSFV; +#include <poppack.h> + HRESULT WINAPI SHCreateShellFolderViewEx(LPCSFV pshfvi, IShellView **ppshv); /* SHCreateShellFolderViewEx callback messages */ @@ -850,6 +858,8 @@ HRESULT WINAPI SHCreateShellFolderViewEx(LPCSFV pshfvi, IShellView **ppshv); #define SFVM_GET_WEBVIEW_THEME 86 /* undocumented */ #define SFVM_GETDEFERREDVIEWSETTINGS 92 /* undocumented */ +#include <pshpack8.h> + typedef struct _SFV_CREATE { UINT cbSize; @@ -858,6 +868,8 @@ typedef struct _SFV_CREATE IShellFolderViewCB *psfvcb; } SFV_CREATE; +#include <poppack.h> + HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *pscfv, IShellView **ppsv); /* Types and definitions for the SFM_* parameters */ diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 90b490a..ec5e702 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1108,6 +1108,7 @@ IID IShellChangeNotify IShellIcon ITEMIDLIST +ITEMSPACING LPBLOB LPBROWSEINFOA LPBROWSEINFOW @@ -1167,6 +1168,7 @@ RemHGLOBAL RemHMETAFILEPICT RemHPALETTE SCODE +SFV_CREATE SHChangeDWORDAsIDList SHChangeNotifyEntry SHChangeProductKeyAsIDList

1 0

Paul Chitescu : dbghelp: Provide a non-NULL number of bytes read to ReadProcessMemoryProc64 callback .
by Alexandre Julliard 28 Jun '10

28 Jun '10

Module: wine Branch: master Commit: 61a9eef9a1c0a72e6571742dbb830f7b22c05230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a9eef9a1c0a72e6571742db… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Sat Jun 26 13:24:38 2010 +0300 dbghelp: Provide a non-NULL number of bytes read to ReadProcessMemoryProc64 callback. --- dlls/dbghelp/stack.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index e0180ba..3e1ff72 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -95,10 +95,11 @@ static inline void addr_64to32(const ADDRESS64* addr64, ADDRESS* addr32) BOOL sw_read_mem(struct cpu_stack_walk* csw, DWORD64 addr, void* ptr, DWORD sz) { + DWORD bytes_read = 0; if (csw->is32) - return csw->u.s32.f_read_mem(csw->hProcess, addr, ptr, sz, NULL); + return csw->u.s32.f_read_mem(csw->hProcess, addr, ptr, sz, &bytes_read); else - return csw->u.s64.f_read_mem(csw->hProcess, addr, ptr, sz, NULL); + return csw->u.s64.f_read_mem(csw->hProcess, addr, ptr, sz, &bytes_read); } DWORD64 sw_xlat_addr(struct cpu_stack_walk* csw, ADDRESS64* addr)

1 0

André Hentschel : German translation of release news 1 .2-rc5
by Jeremy Newman 28 Jun '10

28 Jun '10

Module: website Branch: master Commit: a02283908b52a3bc4b60a283f2124880b1e35289 URL: http://source.winehq.org/git/website.git/?a=commit;h=a02283908b52a3bc4b60a2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jun 25 21:11:52 2010 +0200 German translation of release news 1.2-rc5 --- news/de/2010062501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/de/2010062501.xml b/news/de/2010062501.xml new file mode 100644 index 0000000..abc6aec --- /dev/null +++ b/news/de/2010062501.xml @@ -0,0 +1,13 @@ +<news> +<date>25. Juni 2010</date> +<title>Wine 1.2-rc4 Freigegeben</title> +<body> + Die Entwicklungsversion 1.2-rc5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.2-rc5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Viele Übersetzungen.</li> + <li>Ein Haufen Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc5.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.2-rc4 and 1.2-rc5
by Jeremy Newman 28 Jun '10

28 Jun '10

Module: website Branch: master Commit: 9982555bc415918e90013d29c64829367fd806cb URL: http://source.winehq.org/git/website.git/?a=commit;h=9982555bc415918e90013d… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jun 25 20:09:25 2010 +0200 Polish translation for release 1.2-rc4 and 1.2-rc5 --- news/pl/2010061801.xml | 13 +++++++++++++ news/pl/2010062501.xml | 13 +++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/news/pl/2010061801.xml b/news/pl/2010061801.xml new file mode 100644 index 0000000..4388167 --- /dev/null +++ b/news/pl/2010061801.xml @@ -0,0 +1,13 @@ +<news> +<date>Czerwiec 18, 2010</date> +<title>Wydano Wine 1.2-rc4</title> +<body> + Wydanie rozwojowe Wine 1.2-rc4 jest już dostępne. + <a href="{$root}/announce/1.2-rc4">Co nowego</a> w tym wydaniu: +<ul> + <li>Wiele aktualizacji tłumaczeń.</li> + <li>Wiele poprawek błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc4.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news> diff --git a/news/pl/2010062501.xml b/news/pl/2010062501.xml new file mode 100644 index 0000000..300c976 --- /dev/null +++ b/news/pl/2010062501.xml @@ -0,0 +1,13 @@ +<news> +<date>Czerwiec 25, 2010</date> +<title>Wydano Wine 1.2-rc5</title> +<body> + Wydanie rozwojowe Wine 1.2-rc5 jest już dostępne. + <a href="{$root}/announce/1.2-rc5">Co nowego</a> w tym wydaniu: +<ul> + <li>Wiele aktualizacji tłumaczeń.</li> + <li>Wiele poprawek błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc5.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.2-rc5
by Alexandre Julliard 25 Jun '10

25 Jun '10

Module: website Branch: master Commit: 0fa2e8226eebc57a257a6ef32f3f45ef69874952 URL: http://source.winehq.org/git/website.git/?a=commit;h=0fa2e8226eebc57a257a6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 25 19:40:05 2010 +0200 Wine release 1.2-rc5 --- news/en/2010062501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/en/2010062501.xml b/news/en/2010062501.xml new file mode 100644 index 0000000..42f93e7 --- /dev/null +++ b/news/en/2010062501.xml @@ -0,0 +1,13 @@ +<news> +<date>June 25, 2010</date> +<title>Wine 1.2-rc5 Released</title> +<body> + The Wine development release 1.2-rc5 is now available. + <a href="{$root}/announce/1.2-rc5">What's new</a> in this release: +<ul> + <li>Many translation updates.</li> + <li>A lot of bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.2-rc5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2010