Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[akhaldi] 69974: [MCIAVI32] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 09:25:00 2015 New Revision: 69974 URL: http://svn.reactos.org/svn/reactos?rev=69974&view=rev Log: [MCIAVI32] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/mciavi32/mciavi.c trunk/reactos/dll/win32/mciavi32/mmoutput.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciavi32/mciavi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mciavi.… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] Sat Nov 21 09:25:00 2015 @@ -391,8 +391,8 @@ { while(next_frame_us <= tc && wma->dwCurrVideoFrame < wma->dwToVideoFrame){ double dur; + dur = MCIAVI_PaintFrame(wma, hDC); ++wma->dwCurrVideoFrame; - dur = MCIAVI_PaintFrame(wma, hDC); if(!dur) break; next_frame_us += dur; @@ -400,14 +400,19 @@ } ReleaseDC(wma->hWndPaint, hDC); } - if(wma->dwCurrVideoFrame >= wma->dwToVideoFrame) - break; + if (wma->dwCurrVideoFrame >= wma->dwToVideoFrame) + { + if (!(dwFlags & MCI_DGV_PLAY_REPEAT)) + break; + TRACE("repeat media as requested\n"); + wma->dwCurrVideoFrame = wma->dwCurrAudioBlock = 0; + } if (wma->lpWaveFormat) MCIAVI_PlayAudioBlocks(wma, nHdr, waveHdr); tc = currenttime_us(); - if(tc < next_frame_us) + if (tc < next_frame_us) delta = next_frame_us - tc; else delta = 0; @@ -530,7 +535,7 @@ if (dwFlags & MCI_DGV_PLAY_REVERSE) return MCIERR_UNSUPPORTED_FUNCTION; if (dwFlags & MCI_TEST) return 0; - if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN|MCI_MCIAVI_PLAY_FULLBY2)) + if (dwFlags & (MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN|MCI_MCIAVI_PLAY_FULLBY2)) FIXME("Unsupported flag %08x\n", dwFlags); EnterCriticalSection(&wma->cs); Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mmoutpu… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] Sat Nov 21 09:25:00 2015 @@ -187,8 +187,11 @@ */ twocc = TWOCCFromFOURCC(mmck->ckid); if (twocc == TWOCCFromFOURCC(wma->inbih->biCompression)) - twocc = cktypeDIBcompressed; - + twocc = cktypeDIBcompressed; + /* Also detect some chunks that seem to be used by Indeo videos where the chunk is named + * after the codec. */ + else if (twocc == LOWORD(wma->ash_video.fccHandler)) + twocc = cktypeDIBcompressed; switch (twocc) { case cktypeDIBbits: case cktypeDIBcompressed: @@ -395,8 +398,8 @@ mmioAscend(wma->hFile, &mmckInfo, 0); } if (alb.numVideoFrames != wma->dwPlayableVideoFrames) { - WARN("Found %d video frames (/%d), reducing playable frames\n", - alb.numVideoFrames, wma->dwPlayableVideoFrames); + WARN("AVI header says %d frames, we found %d video frames, reducing playable frames\n", + wma->dwPlayableVideoFrames, alb.numVideoFrames); wma->dwPlayableVideoFrames = alb.numVideoFrames; } wma->dwPlayableAudioBlocks = alb.numAudioBlocks; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 21 09:25:00 2015 @@ -93,7 +93,7 @@ reactos/dll/win32/localui # Synced to WineStaging-1.7.47 reactos/dll/win32/lz32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mcicda # Synced to WineStaging-1.7.47 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mciseq # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69973: [NTDSAPI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 09:22:06 2015 New Revision: 69973 URL: http://svn.reactos.org/svn/reactos?rev=69973&view=rev Log: [NTDSAPI_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/ntdsapi/ntdsapi.c Modified: trunk/rostests/winetests/ntdsapi/ntdsapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdsapi/ntdsapi… ============================================================================== --- trunk/rostests/winetests/ntdsapi/ntdsapi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdsapi/ntdsapi.c [iso-8859-1] Sat Nov 21 09:22:06 2015 @@ -84,7 +84,38 @@ ok(spn_length == lstrlenW(wszSpn5) + 1, "DsMakeSpnW should have returned spn_length of %d instead of %d\n", lstrlenW(wszSpn5) + 1, spn_length); } +static void test_DsClientMakeSpnForTargetServer(void) +{ + static const WCHAR classW[] = {'c','l','a','s','s',0}; + static const WCHAR hostW[] = {'h','o','s','t','.','d','o','m','a','i','n',0}; + static const WCHAR resultW[] = {'c','l','a','s','s','/','h','o','s','t','.','d','o','m','a','i','n',0}; + DWORD ret, len; + WCHAR buf[256]; + + ret = DsClientMakeSpnForTargetServerW( NULL, NULL, NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = DsClientMakeSpnForTargetServerW( classW, NULL, NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + ret = DsClientMakeSpnForTargetServerW( classW, hostW, NULL, NULL ); + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); + + len = 0; + ret = DsClientMakeSpnForTargetServerW( classW, hostW, &len, NULL ); + ok( ret == ERROR_BUFFER_OVERFLOW, "got %u\n", ret ); + ok( len == lstrlenW(resultW) + 1, "got %u\n", len ); + + len = sizeof(buf)/sizeof(buf[0]); + buf[0] = 0; + ret = DsClientMakeSpnForTargetServerW( classW, hostW, &len, buf ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + ok( len == lstrlenW(resultW) + 1, "got %u\n", len ); + ok( !lstrcmpW( buf, resultW ), "wrong data\n" ); +} + START_TEST( ntdsapi ) { test_DsMakeSpn(); + test_DsClientMakeSpnForTargetServer(); }

1 0

[akhaldi] 69972: [NTDSAPI] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 09:21:43 2015 New Revision: 69972 URL: http://svn.reactos.org/svn/reactos?rev=69972&view=rev Log: [NTDSAPI] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/ntdsapi/ntdsapi.c trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ntdsapi/ntdsapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/ntdsapi.… ============================================================================== --- trunk/reactos/dll/win32/ntdsapi/ntdsapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdsapi/ntdsapi.c [iso-8859-1] Sat Nov 21 09:21:43 2015 @@ -205,3 +205,29 @@ debugstr_w(ServiceClass), debugstr_w(UserObjectDN)); return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD *buflen, LPWSTR buf) +{ + DWORD len; + WCHAR *p; + + TRACE("(%s,%s,%p,%p)\n", debugstr_w(class), debugstr_w(name), buflen, buf); + + if (!class || !name || !buflen) return ERROR_INVALID_PARAMETER; + + len = strlenW(class) + 1 + strlenW(name) + 1; + if (*buflen < len) + { + *buflen = len; + return ERROR_BUFFER_OVERFLOW; + } + *buflen = len; + + memcpy(buf, class, strlenW(class) * sizeof(WCHAR)); + p = buf + strlenW(class); + *p++ = '/'; + memcpy(p, name, strlenW(name) * sizeof(WCHAR)); + buf[len - 1] = 0; + + return ERROR_SUCCESS; +} Modified: trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/ntdsapi.… ============================================================================== --- trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec [iso-8859-1] Sat Nov 21 09:21:43 2015 @@ -7,7 +7,7 @@ @ stub DsBindWithSpnA @ stub DsBindWithSpnW @ stub DsClientMakeSpnForTargetServerA -@ stub DsClientMakeSpnForTargetServerW +@ stdcall DsClientMakeSpnForTargetServerW(wstr wstr ptr ptr) @ stub DsCrackNamesA @ stub DsCrackNamesW @ stub DsCrackSpn2A Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 21 09:21:43 2015 @@ -138,7 +138,7 @@ reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.47 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 reactos/dll/win32/npptools # Synced to WineStaging-1.7.47 -reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.55 reactos/dll/win32/ntprint # Synced to WineStaging-1.7.47 reactos/dll/win32/objsel # Synced to WineStaging-1.7.47 reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC.

1 0

[akhaldi] 69971: [DBGHELP] Sync with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 09:17:26 2015 New Revision: 69971 URL: http://svn.reactos.org/svn/reactos?rev=69971&view=rev Log: [DBGHELP] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/win32/dbghelp/cpu_i386.c trunk/reactos/dll/win32/dbghelp/dbghelp.c trunk/reactos/dll/win32/dbghelp/dbghelp.spec trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/dll/win32/dbghelp/image_private.h trunk/reactos/dll/win32/dbghelp/macho_module.c trunk/reactos/dll/win32/dbghelp/minidump.c trunk/reactos/dll/win32/dbghelp/module.c trunk/reactos/dll/win32/dbghelp/msc.c trunk/reactos/dll/win32/dbghelp/path.c trunk/reactos/dll/win32/dbghelp/rosstubs.c trunk/reactos/dll/win32/dbghelp/symbol.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dbghelp/cpu_i386.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_i386… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_i386.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_i386.c [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -263,7 +263,7 @@ } } else - /* FIXME: this will allow to work when we're not attached to a live target, + /* FIXME: this will allow it to work when we're not attached to a live target, * but the 16 <=> 32 switch facility won't be available. */ curr_switch = 0; Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.c [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -276,7 +276,7 @@ * The initialisation of a dbghelp's context. * Note that hProcess doesn't need to be a valid process handle (except * when fInvadeProcess is TRUE). - * Since, we're also allow to load ELF (pure) libraries and Wine ELF libraries + * Since we also allow loading ELF (pure) libraries and Wine ELF libraries * containing PE (and NE) module(s), here's how we handle it: * - we load every module (ELF, NE, PE) passed in SymLoadModule * - in fInvadeProcess (in SymInitialize) is TRUE, we set up what is called ELF Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.spec [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -187,7 +187,7 @@ @ stdcall SymUnloadModule(long long) @ stdcall SymUnloadModule64(long double) @ stdcall UnDecorateSymbolName(str str long long) -@ stdcall UnDecorateSymbolNameW(str str long long) +@ stdcall UnDecorateSymbolNameW(wstr ptr long long) @ stdcall UnmapDebugInformation(ptr) @ stdcall WinDbgExtensionDllInit(ptr long long) #@ stdcall block Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -621,7 +621,7 @@ /* macho_module.c */ extern BOOL macho_enum_modules(HANDLE hProc, enum_modules_cb, void*) DECLSPEC_HIDDEN; -extern BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, DWORD* size, DWORD* checksum) DECLSPEC_HIDDEN; +extern BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load_addr, DWORD_PTR* base, DWORD* size, DWORD* checksum) DECLSPEC_HIDDEN; extern BOOL macho_load_debug_info(struct module* module) DECLSPEC_HIDDEN; extern struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsigned long) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -1811,6 +1811,9 @@ case DW_TAG_subroutine_type: dwarf2_parse_subroutine_type(subpgm->ctx, di); break; + case DW_TAG_const_type: + dwarf2_parse_const_type(subpgm->ctx, di); + break; case DW_TAG_lexical_block: dwarf2_parse_subprogram_block(subpgm, block, child); break; @@ -1944,6 +1947,9 @@ break; case DW_TAG_pointer_type: dwarf2_parse_pointer_type(subpgm.ctx, di); + break; + case DW_TAG_const_type: + dwarf2_parse_const_type(subpgm.ctx, di); break; case DW_TAG_subprogram: /* FIXME: likely a declaration (to be checked) Modified: trunk/reactos/dll/win32/dbghelp/image_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/image_pr… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/image_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/image_private.h [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -128,6 +128,7 @@ { const macho_section* section; const char* mapped; + unsigned int ignored : 1; }* sect; #endif } macho; Modified: trunk/reactos/dll/win32/dbghelp/macho_module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/macho_mo… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/macho_module.c [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -28,6 +28,7 @@ #include <mach-o/fat.h> #include <mach-o/loader.h> #include <mach-o/nlist.h> +#include <mach-o/dyld.h> #ifdef HAVE_MACH_O_DYLD_IMAGES_H #include <mach-o/dyld_images.h> @@ -77,6 +78,16 @@ #endif +/* Bitmask for Mach-O image header flags indicating that the image is in dyld's + shared cached. That implies that its segments are mapped non-contiguously. + This value isn't defined anywhere in headers. It's used in dyld and in + debuggers which support OS X as a magic number. + + The flag also isn't set in the on-disk image file. It's only set in + memory by dyld. */ +#define MACHO_DYLD_IN_SHARED_CACHE 0x80000000 + + #define UUID_STRING_LEN 37 /* 16 bytes at 2 hex digits apiece, 4 dashes, and the null terminator */ @@ -86,6 +97,12 @@ unsigned long load_addr; unsigned short in_use : 1, is_loader : 1; +}; + +struct section_info +{ + BOOL split_segs; + unsigned int section_index; }; #define MACHO_INFO_DEBUG_HEADER 0x0001 @@ -310,8 +327,9 @@ fmap = &ifm->u.macho; for (i = 0; i < fmap->num_sections; i++) { - if (strcmp(fmap->sect[i].section->sectname, sectname) == 0 && - (!segname || strcmp(fmap->sect[i].section->sectname, segname) == 0)) + if (!fmap->sect[i].ignored && + strcmp(fmap->sect[i].section->sectname, sectname) == 0 && + (!segname || strcmp(fmap->sect[i].section->segname, segname) == 0)) { ism->fmap = ifm; ism->sidx = i; @@ -334,7 +352,7 @@ struct macho_file_map* fmap = &ism->fmap->u.macho; assert(ism->fmap->modtype == DMT_MACHO); - if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.macho.num_sections) + if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.macho.num_sections || fmap->sect[ism->sidx].ignored) return IMAGE_NO_MAP; return macho_map_range(fmap, fmap->sect[ism->sidx].section->offset, fmap->sect[ism->sidx].section->size, @@ -360,7 +378,8 @@ */ DWORD_PTR macho_get_map_rva(const struct image_section_map* ism) { - if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.macho.num_sections) + if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.macho.num_sections || + ism->fmap->u.macho.sect[ism->sidx].ignored) return 0; return ism->fmap->u.macho.sect[ism->sidx].section->addr - ism->fmap->u.macho.segs_start; } @@ -370,7 +389,8 @@ */ unsigned macho_get_map_size(const struct image_section_map* ism) { - if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.macho.num_sections) + if (ism->sidx < 0 || ism->sidx >= ism->fmap->u.macho.num_sections || + ism->fmap->u.macho.sect[ism->sidx].ignored) return 0; return ism->fmap->u.macho.sect[ism->sidx].section->size; } @@ -484,7 +504,8 @@ static int macho_load_section_info(struct macho_file_map* fmap, const struct load_command* lc, void* user) { const macho_segment_command* sc = (const macho_segment_command*)lc; - int* section_index = (int*)user; + struct section_info* info = user; + BOOL ignore; const macho_section* section; int i; unsigned long tmp, page_mask = sysconf( _SC_PAGESIZE ) - 1; @@ -494,10 +515,17 @@ TRACE("Segment command vm: 0x%08lx - 0x%08lx\n", (unsigned long)sc->vmaddr, (unsigned long)(sc->vmaddr + sc->vmsize)); + /* Images in the dyld shared cache have their segments mapped non-contiguously. + We don't know how to properly locate any of the segments other than __TEXT, + so ignore them. */ + ignore = (info->split_segs && strcmp(sc->segname, SEG_TEXT)); + if (!strncmp(sc->segname, "WINE_", 5)) TRACE("Ignoring special Wine segment %s\n", debugstr_an(sc->segname, sizeof(sc->segname))); else if (!strncmp(sc->segname, "__PAGEZERO", 10)) TRACE("Ignoring __PAGEZERO segment\n"); + else if (ignore) + TRACE("Ignoring %s segment because image has split segments\n", sc->segname); else { /* If this segment starts before previously-known earliest, record new earliest. */ @@ -514,9 +542,10 @@ section = (const macho_section*)(sc + 1); for (i = 0; i < sc->nsects; i++) { - fmap->sect[*section_index].section = &section[i]; - fmap->sect[*section_index].mapped = IMAGE_NO_MAP; - (*section_index)++; + fmap->sect[info->section_index].section = &section[i]; + fmap->sect[info->section_index].mapped = IMAGE_NO_MAP; + fmap->sect[info->section_index].ignored = ignore; + info->section_index++; } return 0; @@ -554,7 +583,7 @@ * * Maps a Mach-O file into memory (and checks it's a real Mach-O file) */ -static BOOL macho_map_file(const WCHAR* filenameW, struct image_file_map* ifm) +static BOOL macho_map_file(const WCHAR* filenameW, BOOL split_segs, struct image_file_map* ifm) { struct macho_file_map* fmap = &ifm->u.macho; struct fat_header fat_header; @@ -562,6 +591,7 @@ int i; char* filename; unsigned len; + struct section_info info; BOOL ret = FALSE; TRACE("(%s, %p)\n", debugstr_w(filenameW), fmap); @@ -662,8 +692,9 @@ fmap->segs_size = 0; fmap->segs_start = ~0L; - i = 0; - if (macho_enum_load_commands(fmap, TARGET_SEGMENT_COMMAND, macho_load_section_info, &i) < 0) + info.split_segs = split_segs; + info.section_index = 0; + if (macho_enum_load_commands(fmap, TARGET_SEGMENT_COMMAND, macho_load_section_info, &info) < 0) { fmap->num_sections = 0; goto done; @@ -744,7 +775,7 @@ if (!sectidx) return FALSE; sectidx--; /* convert from 1-based to 0-based */ - if (sectidx >= fmap->num_sections) return FALSE; + if (sectidx >= fmap->num_sections || fmap->sect[sectidx].ignored) return FALSE; ret = (!(fmap->sect[sectidx].section->flags & SECTION_TYPE) && (fmap->sect[sectidx].section->flags & (S_ATTR_PURE_INSTRUCTIONS|S_ATTR_SOME_INSTRUCTIONS))); @@ -1018,7 +1049,7 @@ { struct image_file_map dsym_ifm; - if (macho_map_file(path, &dsym_ifm)) + if (macho_map_file(path, FALSE, &dsym_ifm)) { char uuid_string[UUID_STRING_LEN]; @@ -1128,6 +1159,34 @@ } /****************************************************************** + * image_uses_split_segs + * + * Determine if the Mach-O image loaded at a particular address in + * the given process is in the dyld shared cache and therefore has + * its segments mapped non-contiguously. + * + * The image header has to be loaded from the process's memory + * because the relevant flag is only set in memory, not in the file. + */ +static BOOL image_uses_split_segs(HANDLE process, unsigned long load_addr) +{ + BOOL split_segs = FALSE; + + if (process && load_addr) + { + macho_mach_header header; + if (ReadProcessMemory(process, (void*)load_addr, &header, sizeof(header), NULL) && + header.magic == TARGET_MH_MAGIC && header.cputype == TARGET_CPU_TYPE && + header.flags & MACHO_DYLD_IN_SHARED_CACHE) + { + split_segs = TRUE; + } + } + + return split_segs; +} + +/****************************************************************** * macho_load_debug_info * * Loads Mach-O debugging information from the module image file. @@ -1191,14 +1250,16 @@ * * Gathers some more information for a Mach-O module from a given file */ -BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, +BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load_addr, DWORD_PTR* base, DWORD* size, DWORD* checksum) { struct image_file_map fmap; + BOOL split_segs; TRACE("(%s, %p, %p, %p)\n", debugstr_w(name), base, size, checksum); - if (!macho_map_file(name, &fmap)) return FALSE; + split_segs = image_uses_split_segs(process, load_addr); + if (!macho_map_file(name, split_segs, &fmap)) return FALSE; if (base) *base = fmap.u.macho.segs_start; *size = fmap.u.macho.segs_size; *checksum = calc_crc32(fmap.u.macho.fd); @@ -1213,6 +1274,57 @@ { macho_unmap_file(&modfmt->u.macho_info->file_map); HeapFree(GetProcessHeap(), 0, modfmt); +} + + +/****************************************************************** + * get_dyld_image_info_address + */ +static ULONG_PTR get_dyld_image_info_address(struct process* pcs) +{ + NTSTATUS status; + PROCESS_BASIC_INFORMATION pbi; + ULONG_PTR dyld_image_info_address = 0; + + /* Get address of PEB */ + status = NtQueryInformationProcess(pcs->handle, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); + if (status == STATUS_SUCCESS) + { + /* Read dyld image info address from PEB */ + if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], + &dyld_image_info_address, sizeof(dyld_image_info_address), NULL)) + { + TRACE("got dyld_image_info_address 0x%08lx from PEB %p MacDyldImageInfo %p\n", + (unsigned long)dyld_image_info_address, pbi.PebBaseAddress, &pbi.PebBaseAddress->Reserved); + } + } + +#ifndef __LP64__ /* No reading the symtab with nlist(3) in LP64 */ + if (!dyld_image_info_address) + { + static void* dyld_all_image_infos_addr; + + /* Our next best guess is that dyld was loaded at its base address + and we can find the dyld image infos address by looking up its symbol. */ + if (!dyld_all_image_infos_addr) + { + struct nlist nl[2]; + memset(nl, 0, sizeof(nl)); + nl[0].n_un.n_name = (char*)"_dyld_all_image_infos"; + if (!nlist("/usr/lib/dyld", nl)) + dyld_all_image_infos_addr = (void*)nl[0].n_value; + } + + if (dyld_all_image_infos_addr) + { + TRACE("got dyld_image_info_address %p from /usr/lib/dyld symbol table\n", + dyld_all_image_infos_addr); + dyld_image_info_address = (ULONG_PTR)dyld_all_image_infos_addr; + } + } +#endif + + return dyld_image_info_address; } /****************************************************************** @@ -1229,65 +1341,21 @@ unsigned long load_addr, struct macho_info* macho_info) { BOOL ret = TRUE; + BOOL split_segs; struct image_file_map fmap; TRACE("(%p/%p, %s, 0x%08lx, %p/0x%08x)\n", pcs, pcs->handle, debugstr_w(filename), load_addr, macho_info, macho_info->flags); - if (!macho_map_file(filename, &fmap)) return FALSE; + split_segs = image_uses_split_segs(pcs->handle, load_addr); + if (!macho_map_file(filename, split_segs, &fmap)) return FALSE; /* Find the dynamic loader's table of images loaded into the process. */ if (macho_info->flags & MACHO_INFO_DEBUG_HEADER) { - PROCESS_BASIC_INFORMATION pbi; - NTSTATUS status; - - ret = FALSE; - - /* Get address of PEB */ - status = NtQueryInformationProcess(pcs->handle, ProcessBasicInformation, - &pbi, sizeof(pbi), NULL); - if (status == STATUS_SUCCESS) - { - ULONG_PTR dyld_image_info; - - /* Read dyld image info address from PEB */ - if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], - &dyld_image_info, sizeof(dyld_image_info), NULL)) - { - TRACE("got dyld_image_info 0x%08lx from PEB %p MacDyldImageInfo %p\n", - (unsigned long)dyld_image_info, pbi.PebBaseAddress, &pbi.PebBaseAddress->Reserved); - macho_info->dbg_hdr_addr = dyld_image_info; - ret = TRUE; - } - } - -#ifndef __LP64__ /* No reading the symtab with nlist(3) in LP64 */ - if (!ret) - { - static void* dyld_all_image_infos_addr; - - /* Our next best guess is that dyld was loaded at its base address - and we can find the dyld image infos address by looking up its symbol. */ - if (!dyld_all_image_infos_addr) - { - struct nlist nl[2]; - memset(nl, 0, sizeof(nl)); - nl[0].n_un.n_name = (char*)"_dyld_all_image_infos"; - if (!nlist("/usr/lib/dyld", nl)) - dyld_all_image_infos_addr = (void*)nl[0].n_value; - } - - if (dyld_all_image_infos_addr) - { - TRACE("got dyld_image_info %p from /usr/lib/dyld symbol table\n", - dyld_all_image_infos_addr); - macho_info->dbg_hdr_addr = (unsigned long)dyld_all_image_infos_addr; - ret = TRUE; - } - } -#endif + macho_info->dbg_hdr_addr = (unsigned long)get_dyld_image_info_address(pcs); + ret = TRUE; } if (macho_info->flags & MACHO_INFO_MODULE) @@ -1457,7 +1525,7 @@ if (strstrW(filename, S_libstdcPPW)) return FALSE; /* We know we can't do it */ - /* If has no directories, try LD_LIBRARY_PATH first. */ + /* If has no directories, try PATH first. */ if (!strchrW(filename, '/')) { ret = macho_load_file_from_path(pcs, filename, load_addr, @@ -1477,8 +1545,10 @@ /* Try DYLD_FALLBACK_LIBRARY_PATH, with just the filename (no directories). */ if (!ret) { - ret = macho_load_file_from_path(pcs, p, load_addr, - getenv("DYLD_FALLBACK_LIBRARY_PATH"), macho_info); + const char* fallback = getenv("DYLD_FALLBACK_LIBRARY_PATH"); + if (!fallback) + fallback = "/usr/local/lib:/lib:/usr/lib"; + ret = macho_load_file_from_path(pcs, p, load_addr, fallback, macho_info); } if (!ret && !strchrW(filename, '/')) ret = macho_load_file_from_dll_path(pcs, filename, load_addr, macho_info); @@ -1607,7 +1677,62 @@ */ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_info) { - return macho_search_and_load_file(pcs, get_wine_loader_name(), 0, macho_info); + BOOL ret = FALSE; + ULONG_PTR dyld_image_info_address; + struct dyld_all_image_infos image_infos; + struct dyld_image_info image_info; + uint32_t len; + char path[PATH_MAX]; + BOOL got_path = FALSE; + + dyld_image_info_address = get_dyld_image_info_address(pcs); + if (dyld_image_info_address && + ReadProcessMemory(pcs->handle, (void*)dyld_image_info_address, &image_infos, sizeof(image_infos), NULL) && + image_infos.infoArray && image_infos.infoArrayCount && + ReadProcessMemory(pcs->handle, image_infos.infoArray, &image_info, sizeof(image_info), NULL) && + image_info.imageFilePath) + { + for (len = sizeof(path); len > 0; len /= 2) + { + if (ReadProcessMemory(pcs->handle, image_info.imageFilePath, path, len, NULL)) + { + path[len - 1] = 0; + got_path = TRUE; + TRACE("got executable path from target's dyld image info: %s\n", debugstr_a(path)); + break; + } + } + } + + /* If we couldn't get the executable path from the target process, try our + own. It will almost always be the same. */ + if (!got_path) + { + len = sizeof(path); + if (!_NSGetExecutablePath(path, &len)) + { + got_path = TRUE; + TRACE("using own executable path: %s\n", debugstr_a(path)); + } + } + + if (got_path) + { + WCHAR* pathW; + + len = MultiByteToWideChar(CP_UNIXCP, 0, path, -1, NULL, 0); + pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (pathW) + { + MultiByteToWideChar(CP_UNIXCP, 0, path, -1, pathW, len); + ret = macho_load_file(pcs, pathW, 0, macho_info); + HeapFree(GetProcessHeap(), 0, pathW); + } + } + + if (!ret) + ret = macho_search_and_load_file(pcs, get_wine_loader_name(), 0, macho_info); + return ret; } /****************************************************************** @@ -1755,7 +1880,7 @@ return FALSE; } -BOOL macho_fetch_file_info(const WCHAR* name, DWORD_PTR* base, +BOOL macho_fetch_file_info(HANDLE process, const WCHAR* name, unsigned long load_addr, DWORD_PTR* base, DWORD* size, DWORD* checksum) { return FALSE; Modified: trunk/reactos/dll/win32/dbghelp/minidump.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/minidump… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/minidump.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/minidump.c [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -279,7 +279,7 @@ /* NB: if we have a non-null base from the live-target use it. If we have * a null base, then grab its base address from Mach-O file. */ - if (!macho_fetch_file_info(name, &rbase, &size, &checksum)) + if (!macho_fetch_file_info(dc->hProcess, name, base, &rbase, &size, &checksum)) size = checksum = 0; add_module(dc, name, base ? base : rbase, size, 0 /* FIXME */, checksum, TRUE); return TRUE; Modified: trunk/reactos/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/module.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/module.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/module.c [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -22,8 +22,6 @@ #include "dbghelp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); - -#define DLLPREFIX "" const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'}; const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'}; @@ -422,16 +420,6 @@ size_t len; struct module* module; PCWSTR filename, modname; - static WCHAR* dll_prefix; - static int dll_prefix_len; - - if (!dll_prefix) - { - dll_prefix_len = MultiByteToWideChar( CP_UNIXCP, 0, DLLPREFIX, -1, NULL, 0 ); - dll_prefix = HeapAlloc( GetProcessHeap(), 0, dll_prefix_len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_UNIXCP, 0, DLLPREFIX, -1, dll_prefix, dll_prefix_len ); - dll_prefix_len--; - } if (!base) return FALSE; filename = get_filename(ImageName, NULL); @@ -444,7 +432,6 @@ base < module->module.BaseOfImage + module->module.ImageSize) { modname = get_filename(module->module.LoadedImageName, NULL); - if (dll_prefix_len && !strncmpW( modname, dll_prefix, dll_prefix_len )) modname += dll_prefix_len; if (!strncmpiW(modname, filename, len) && !memcmp(modname + len, S_DotSoW, 3 * sizeof(WCHAR))) { Modified: trunk/reactos/dll/win32/dbghelp/msc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/msc.c?re… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/msc.c [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -208,6 +208,31 @@ cv_basic_types[T_64PINT8] = &symt_new_pointer(module, cv_basic_types[T_INT8], 8)->symt; cv_basic_types[T_64PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8], 8)->symt; cv_basic_types[T_64PHRESULT]= &symt_new_pointer(module, cv_basic_types[T_HRESULT], 8)->symt; + + cv_basic_types[T_PVOID] = &symt_new_pointer(module, cv_basic_types[T_VOID], sizeof(void*))->symt; + cv_basic_types[T_PCHAR] = &symt_new_pointer(module, cv_basic_types[T_CHAR], sizeof(void*))->symt; + cv_basic_types[T_PSHORT] = &symt_new_pointer(module, cv_basic_types[T_SHORT], sizeof(void*))->symt; + cv_basic_types[T_PLONG] = &symt_new_pointer(module, cv_basic_types[T_LONG], sizeof(void*))->symt; + cv_basic_types[T_PQUAD] = &symt_new_pointer(module, cv_basic_types[T_QUAD], sizeof(void*))->symt; + cv_basic_types[T_PUCHAR] = &symt_new_pointer(module, cv_basic_types[T_UCHAR], sizeof(void*))->symt; + cv_basic_types[T_PUSHORT] = &symt_new_pointer(module, cv_basic_types[T_USHORT], sizeof(void*))->symt; + cv_basic_types[T_PULONG] = &symt_new_pointer(module, cv_basic_types[T_ULONG], sizeof(void*))->symt; + cv_basic_types[T_PUQUAD] = &symt_new_pointer(module, cv_basic_types[T_UQUAD], sizeof(void*))->symt; + cv_basic_types[T_PBOOL08] = &symt_new_pointer(module, cv_basic_types[T_BOOL08], sizeof(void*))->symt; + cv_basic_types[T_PBOOL16] = &symt_new_pointer(module, cv_basic_types[T_BOOL16], sizeof(void*))->symt; + cv_basic_types[T_PBOOL32] = &symt_new_pointer(module, cv_basic_types[T_BOOL32], sizeof(void*))->symt; + cv_basic_types[T_PBOOL64] = &symt_new_pointer(module, cv_basic_types[T_BOOL64], sizeof(void*))->symt; + cv_basic_types[T_PREAL32] = &symt_new_pointer(module, cv_basic_types[T_REAL32], sizeof(void*))->symt; + cv_basic_types[T_PREAL64] = &symt_new_pointer(module, cv_basic_types[T_REAL64], sizeof(void*))->symt; + cv_basic_types[T_PREAL80] = &symt_new_pointer(module, cv_basic_types[T_REAL80], sizeof(void*))->symt; + cv_basic_types[T_PRCHAR] = &symt_new_pointer(module, cv_basic_types[T_RCHAR], sizeof(void*))->symt; + cv_basic_types[T_PWCHAR] = &symt_new_pointer(module, cv_basic_types[T_WCHAR], sizeof(void*))->symt; + cv_basic_types[T_PINT2] = &symt_new_pointer(module, cv_basic_types[T_INT2], sizeof(void*))->symt; + cv_basic_types[T_PUINT2] = &symt_new_pointer(module, cv_basic_types[T_UINT2], sizeof(void*))->symt; + cv_basic_types[T_PINT4] = &symt_new_pointer(module, cv_basic_types[T_INT4], sizeof(void*))->symt; + cv_basic_types[T_PUINT4] = &symt_new_pointer(module, cv_basic_types[T_UINT4], sizeof(void*))->symt; + cv_basic_types[T_PINT8] = &symt_new_pointer(module, cv_basic_types[T_INT8], sizeof(void*))->symt; + cv_basic_types[T_PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8], sizeof(void*))->symt; } static int leaf_as_variant(VARIANT* v, const unsigned short int* leaf) @@ -1960,24 +1985,24 @@ break; /* the symbols we can safely ignore for now */ - case 0x112c: + case S_TRAMPOLINE: case S_FRAMEINFO_V2: case S_SECUCOOKIE_V3: case S_SECTINFO_V3: case S_SUBSECTINFO_V3: case S_ENTRYPOINT_V3: - case 0x113e: - case 0x1139: - case 0x1141: - case 0x1142: - case 0x1143: - case 0x1144: - case 0x114c: - case 0x114d: - case 0x114e: - case 0x1145: - case 0x115a: - case 0x1153: + case S_LOCAL_VS2013: + case S_CALLSITEINFO: + case S_DEFRANGE_REGISTER: + case S_DEFRANGE_FRAMEPOINTER_REL: + case S_DEFRANGE_SUBFIELD_REGISTER: + case S_FPOFF_VS2013: + case S_DEFRANGE_REGISTER_REL: + case S_BUILDINFO: + case S_INLINESITE: + case S_INLINESITE_END: + case S_FILESTATIC: + case S_CALLEES: TRACE("Unsupported symbol id %x\n", sym->generic.id); break; Modified: trunk/reactos/dll/win32/dbghelp/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/path.c?r… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/path.c [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -482,7 +482,13 @@ if ((mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0)) != NULL) { IMAGE_NT_HEADERS* nth = RtlImageNtHeader(mapping); - + if (!nth) + { + UnmapViewOfFile(mapping); + CloseHandle(hMap); + CloseHandle(hFile); + return FALSE; + } matched++; timestamp = nth->FileHeader.TimeDateStamp; size = nth->OptionalHeader.SizeOfImage; @@ -514,7 +520,7 @@ } break; case DMT_MACHO: - if (macho_fetch_file_info(buffer, 0, &size, &checksum)) + if (macho_fetch_file_info(NULL, buffer, 0, 0, &size, &checksum)) { matched++; if (checksum == mf->dw1) matched++; Modified: trunk/reactos/dll/win32/dbghelp/rosstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/rosstubs… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/rosstubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/rosstubs.c [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -600,16 +600,6 @@ return NULL; } -DWORD WINAPI -UnDecorateSymbolNameW(PCWSTR DecoratedName, - PWSTR pszUnDecoratedName, - DWORD dwUndecoratedLength, - DWORD dwFlags) -{ - UNIMPLEMENTED; - return 0; -} - HANDLE WINAPI FindDebugInfoFileExW( Modified: trunk/reactos/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/symbol.c… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/symbol.c [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -1760,32 +1760,69 @@ static void * CDECL und_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } static void CDECL und_free (void* ptr) { HeapFree(GetProcessHeap(), 0, ptr); } -/*********************************************************************** - * UnDecorateSymbolName (DBGHELP.@) - */ -DWORD WINAPI UnDecorateSymbolName(PCSTR DecoratedName, PSTR UnDecoratedName, - DWORD UndecoratedLength, DWORD Flags) +static char *und_name(char *buffer, const char *mangled, int buflen, unsigned short flags) { /* undocumented from msvcrt */ static HANDLE hMsvcrt; static char* (CDECL *p_undname)(char*, const char*, int, void* (CDECL*)(size_t), void (CDECL*)(void*), unsigned short); static const WCHAR szMsvcrt[] = {'m','s','v','c','r','t','.','d','l','l',0}; - TRACE("(%s, %p, %d, 0x%08x)\n", - debugstr_a(DecoratedName), UnDecoratedName, UndecoratedLength, Flags); - if (!p_undname) { if (!hMsvcrt) hMsvcrt = LoadLibraryW(szMsvcrt); if (hMsvcrt) p_undname = (void*)GetProcAddress(hMsvcrt, "__unDName"); - if (!p_undname) return 0; - } - - if (!UnDecoratedName) return 0; - if (!p_undname(UnDecoratedName, DecoratedName, UndecoratedLength, - und_alloc, und_free, Flags)) + if (!p_undname) return NULL; + } + + return p_undname(buffer, mangled, buflen, und_alloc, und_free, flags); +} + +/*********************************************************************** + * UnDecorateSymbolName (DBGHELP.@) + */ +DWORD WINAPI UnDecorateSymbolName(const char *decorated_name, char *undecorated_name, + DWORD undecorated_length, DWORD flags) +{ + TRACE("(%s, %p, %d, 0x%08x)\n", + debugstr_a(decorated_name), undecorated_name, undecorated_length, flags); + + if (!undecorated_name || !undecorated_length) return 0; - return strlen(UnDecoratedName); + if (!und_name(undecorated_name, decorated_name, undecorated_length, flags)) + return 0; + return strlen(undecorated_name); +} + +/*********************************************************************** + * UnDecorateSymbolNameW (DBGHELP.@) + */ +DWORD WINAPI UnDecorateSymbolNameW(const WCHAR *decorated_name, WCHAR *undecorated_name, + DWORD undecorated_length, DWORD flags) +{ + char *buf, *ptr; + int len, ret = 0; + + TRACE("(%s, %p, %d, 0x%08x)\n", + debugstr_w(decorated_name), undecorated_name, undecorated_length, flags); + + if (!undecorated_name || !undecorated_length) + return 0; + + len = WideCharToMultiByte(CP_ACP, 0, decorated_name, -1, NULL, 0, NULL, NULL); + if ((buf = HeapAlloc(GetProcessHeap(), 0, len))) + { + WideCharToMultiByte(CP_ACP, 0, decorated_name, -1, buf, len, NULL, NULL); + if ((ptr = und_name(NULL, buf, 0, flags))) + { + MultiByteToWideChar(CP_ACP, 0, ptr, -1, undecorated_name, undecorated_length); + undecorated_name[undecorated_length - 1] = 0; + ret = strlenW(undecorated_name); + und_free(ptr); + } + HeapFree(GetProcessHeap(), 0, buf); + } + + return ret; } #define WILDCHAR(x) (-(x)) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 21 09:17:26 2015 @@ -63,7 +63,7 @@ reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.47 reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.47 reactos/dll/win32/cryptui # Synced to WineStaging-1.7.47 -reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.47 +reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.55 reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.47 reactos/dll/win32/faultrep # Synced to WineStaging-1.7.47 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.47

1 0

[akhaldi] 69970: [INCLUDES/WINE] Update mscvpdb.h. CORE-10536
by akhaldi＠svn.reactos.org 21 Nov '15

21 Nov '15

Author: akhaldi Date: Sat Nov 21 09:10:42 2015 New Revision: 69970 URL: http://svn.reactos.org/svn/reactos?rev=69970&view=rev Log: [INCLUDES/WINE] Update mscvpdb.h. CORE-10536 Modified: trunk/reactos/include/reactos/wine/mscvpdb.h Modified: trunk/reactos/include/reactos/wine/mscvpdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/mscvp… ============================================================================== --- trunk/reactos/include/reactos/wine/mscvpdb.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/mscvpdb.h [iso-8859-1] Sat Nov 21 09:10:42 2015 @@ -1677,10 +1677,13 @@ #define S_COMPILAND_V3 0x1101 #define S_THUNK_V3 0x1102 #define S_BLOCK_V3 0x1103 +#define S_WITH_V3 0x1104 #define S_LABEL_V3 0x1105 #define S_REGISTER_V3 0x1106 #define S_CONSTANT_V3 0x1107 #define S_UDT_V3 0x1108 +#define S_COBOLUDT_V3 0x1109 +#define S_MANYREG_V3 0x110A #define S_BPREL_V3 0x110B #define S_LDATA_V3 0x110C #define S_GDATA_V3 0x110D @@ -1690,15 +1693,85 @@ #define S_REGREL_V3 0x1111 #define S_LTHREAD_V3 0x1112 #define S_GTHREAD_V3 0x1113 +#define S_LPROCMIPS 0x1114 +#define S_GPROCMIPS 0x1115 #define S_MSTOOL_V3 0x1116 /* compiler command line options and build information */ +#define S_MANYREG2 0x1117 +#define S_LPROCIA64 0x1118 +#define S_GPROCIA64 0x1119 +#define S_LOCALSLOT 0x111A +#define S_PARAMSLOT 0x111B +#define S_LMANDATA 0x111C +#define S_GMANDATA 0x111D +#define S_MANFRAMEREL 0x111E +#define S_MANREGISTER 0x111F +#define S_MANSLOT 0x1120 +#define S_MANMANYREG 0x1121 +#define S_MANREGREL 0x1122 +#define S_MANMANYREG2 0x1123 +#define S_UNAMESPACE 0x1124 #define S_PUB_FUNC1_V3 0x1125 /* didn't get the difference between the two */ +#define S_DATAREF_V3 0x1126 #define S_PUB_FUNC2_V3 0x1127 +#define S_ANNOTATIONREF 0x1128 +#define S_TOKENREF 0x1129 +#define S_GMANPROC 0x112A +#define S_LMANPROC 0x112B +#define S_TRAMPOLINE 0x112C +#define S_MANCONSTANT 0x112D +#define S_ATTR_FRAMEREL 0x112E +#define S_ATTR_REGISTER 0x112F +#define S_ATTR_REGREL 0x1130 +#define S_ATTR_MANYREG 0x1131 +#define S_SEPCODE 0x1132 +#define S_LOCAL_2005 0x1133 +#define S_DEFRANGE_2005 0x1134 +#define S_DEFRANGE2_2005 0x1135 #define S_SECTINFO_V3 0x1136 #define S_SUBSECTINFO_V3 0x1137 #define S_ENTRYPOINT_V3 0x1138 +#define S_CALLSITEINFO 0x1139 #define S_SECUCOOKIE_V3 0x113A +#define S_DISCARDED 0x113B #define S_MSTOOLINFO_V3 0x113C #define S_MSTOOLENV_V3 0x113D + +#define S_LOCAL_VS2013 0x113E +#define S_DEFRANGE_VS2013 0x113F +#define S_DEFRANGE_SUBFIELD 0x1140 +#define S_DEFRANGE_REGISTER 0x1141 +#define S_DEFRANGE_FRAMEPOINTER_REL 0x1142 +#define S_DEFRANGE_SUBFIELD_REGISTER 0x1143 +#define S_FPOFF_VS2013 0x1144 +#define S_DEFRANGE_REGISTER_REL 0x1145 +#define S_LPROC32_VS2013 0x1146 +#define S_GPROC32_VS2013 0x1147 +#define S_LPROCMIPS_ID 0x1148 +#define S_GPROCMIPS_ID 0x1149 +#define S_LPROCIA64_ID 0x114A +#define S_GPROCIA64_ID 0x114B +#define S_BUILDINFO 0x114C +#define S_INLINESITE 0x114D +#define S_INLINESITE_END 0x114E +#define S_PROC_ID_END 0x114F +#define S_DEFRANGE_HLSL 0x1150 +#define S_GDATA_HLSL 0x1151 +#define S_LDATA_HLSL 0x1152 + +#define S_FILESTATIC 0x1153 +#define S_ARMSWITCHTABLE 0x1159 +#define S_CALLEES 0x115A +#define S_CALLERS 0x115B +#define S_POGODATA 0x115C +#define S_INLINESITE2 0x115D +#define S_HEAPALLOCSITE 0x115E +#define S_MOD_TYPEREF 0x115F +#define S_REF_MINIPDB 0x1160 +#define S_PDBMAP 0x1161 +#define S_GDATA_HLSL32 0x1162 +#define S_LDATA_HLSL32 0x1163 +#define S_GDATA_HLSL32_EX 0x1164 +#define S_LDATA_HLSL32_EX 0x1165 /* ======================================== * * Line number information

1 0

[rnaumann] 69969: [USRMGR] Update Icons and show imagelists with 32 instead of 8 bit. Patch by Jared Smudde. CORE-10516
by rnaumann＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: rnaumann Date: Fri Nov 20 23:16:50 2015 New Revision: 69969 URL: http://svn.reactos.org/svn/reactos?rev=69969&view=rev Log: [USRMGR] Update Icons and show imagelists with 32 instead of 8 bit. Patch by Jared Smudde. CORE-10516 Modified: trunk/reactos/dll/cpl/usrmgr/groupprops.c trunk/reactos/dll/cpl/usrmgr/resources/group.ico trunk/reactos/dll/cpl/usrmgr/resources/locked.ico trunk/reactos/dll/cpl/usrmgr/resources/user.ico trunk/reactos/dll/cpl/usrmgr/users.c Modified: trunk/reactos/dll/cpl/usrmgr/groupprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groupprops.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groupprops.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groupprops.c [iso-8859-1] Fri Nov 20 23:16:50 2015 @@ -83,7 +83,7 @@ hwndLV = GetDlgItem(hwndDlg, IDC_USER_ADD_MEMBERSHIP_LIST); GetClientRect(hwndLV, &rect); - hImgList = ImageList_Create(16,16,ILC_COLOR8 | ILC_MASK,5,5); + hImgList = ImageList_Create(16,16,ILC_COLOR32 | ILC_MASK,5,5); hIcon = LoadImage(hApplet,MAKEINTRESOURCE(IDI_GROUP),IMAGE_ICON,16,16,LR_DEFAULTCOLOR); ImageList_AddIcon(hImgList,hIcon); DestroyIcon(hIcon); @@ -406,7 +406,7 @@ hwndLV = GetDlgItem(hwndDlg, IDC_GROUP_GENERAL_MEMBERS); /* Create the image list */ - hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 5, 5); + hImgList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 5, 5); hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_GROUP), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); ImageList_AddIcon(hImgList, hIcon); DestroyIcon(hIcon); Modified: trunk/reactos/dll/cpl/usrmgr/resources/group.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resources/g… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/usrmgr/resources/locked.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resources/l… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/usrmgr/resources/user.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/resources/u… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Fri Nov 20 23:16:50 2015 @@ -513,7 +513,7 @@ HICON hIcon; /* Create the image list */ - hImgList = ImageList_Create(16, 16, ILC_COLOR8 | ILC_MASK, 5, 5); + hImgList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 5, 5); hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_USER), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); ImageList_AddIcon(hImgList, hIcon); hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_LOCKED_USER), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);

1 0

[rnaumann] 69968: [DEVMGR] Improve toolbar bitmaps (again). By Jared Smudde CORE-10342
by rnaumann＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: rnaumann Date: Fri Nov 20 23:14:38 2015 New Revision: 69968 URL: http://svn.reactos.org/svn/reactos?rev=69968&view=rev Log: [DEVMGR] Improve toolbar bitmaps (again). By Jared Smudde CORE-10342 Modified: trunk/reactos/dll/win32/devmgr/resources/root.bmp trunk/reactos/dll/win32/devmgr/resources/toolbar.bmp Modified: trunk/reactos/dll/win32/devmgr/resources/root.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/devmgr/resources/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resources… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 69967: * Forgot this file.
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 18:41:49 2015 New Revision: 69967 URL: http://svn.reactos.org/svn/reactos?rev=69967&view=rev Log: * Forgot this file. Modified: trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Fri Nov 20 18:41:49 2015 @@ -38,7 +38,6 @@ add_subdirectory(devmgr) add_subdirectory(dhcpcsvc) add_subdirectory(dnsapi) -add_subdirectory(dwmapi) add_subdirectory(esent) add_subdirectory(faultrep) add_subdirectory(fltlib)

1 0

[akhaldi] 69966: [DWMAPI] Actually we don't seem to be needing this for anything. Zap it.
by akhaldi＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: akhaldi Date: Fri Nov 20 18:40:41 2015 New Revision: 69966 URL: http://svn.reactos.org/svn/reactos?rev=69966&view=rev Log: [DWMAPI] Actually we don't seem to be needing this for anything. Zap it. Removed: trunk/reactos/dll/win32/dwmapi/ Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Fri Nov 20 18:40:41 2015 @@ -65,7 +65,6 @@ reactos/dll/win32/cryptui # Synced to WineStaging-1.7.47 reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.47 reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.55 reactos/dll/win32/faultrep # Synced to WineStaging-1.7.47 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.47 reactos/dll/win32/fusion # Synced to WineStaging-1.7.47

1 0

[tfaber] 69965: [USER32] - Keep an extra reference to user32 around while we're not using imm32 CORE-10540
by tfaber＠svn.reactos.org 20 Nov '15

20 Nov '15

Author: tfaber Date: Fri Nov 20 18:04:50 2015 New Revision: 69965 URL: http://svn.reactos.org/svn/reactos?rev=69965&view=rev Log: [USER32] - Keep an extra reference to user32 around while we're not using imm32 CORE-10540 Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Fri Nov 20 18:04:50 2015 @@ -526,7 +526,12 @@ if (!gfServerProcess) { - //InitializeImmEntryTable(); +#if WIN32K_ISNT_BROKEN + InitializeImmEntryTable(); +#else + /* imm32 takes a refcount and prevents us from unloading */ + LoadLibraryW(L"user32"); +#endif // // Wine is stub and throws an exception so save this for real Imm32.dll testing!!!! //

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
46
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

Ros-diffs November 2015