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

Zebediah Figura : include: Add event trace flags and guid to evntrace.h.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 0399b100a78257f7225dd9f1530d9a5356996206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0399b100a78257f7225dd9f15… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 22:56:52 2015 -0500 include: Add event trace flags and guid to evntrace.h. --- include/evntrace.h | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/include/evntrace.h b/include/evntrace.h index cc442dc..191f232 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -38,6 +38,35 @@ extern "C" { #define TRACE_LEVEL_INFORMATION 4 #define TRACE_LEVEL_VERBOSE 5 +#define EVENT_TRACE_FILE_MODE_NONE 0x00000000 +#define EVENT_TRACE_FILE_MODE_SEQUENTIAL 0x00000001 +#define EVENT_TRACE_FILE_MODE_CIRCULAR 0x00000002 +#define EVENT_TRACE_FILE_MODE_APPEND 0x00000004 +#define EVENT_TRACE_FILE_MODE_NEWFILE 0x00000008 +#define EVENT_TRACE_FILE_MODE_PREALLOCATE 0x00000020 +#define EVENT_TRACE_NONSTOPPABLE_MODE 0x00000040 +#define EVENT_TRACE_SECURE_MODE 0x00000080 +#define EVENT_TRACE_REAL_TIME_MODE 0x00000100 +#define EVENT_TRACE_DELAY_OPEN_FILE_MODE 0x00000200 +#define EVENT_TRACE_BUFFERING_MODE 0x00000400 +#define EVENT_TRACE_PRIVATE_LOGGER_MODE 0x00000800 +#define EVENT_TRACE_ADD_HEADER_MODE 0x00001000 +#define EVENT_TRACE_USE_KBYTES_FOR_SIZE 0x00002000 +#define EVENT_TRACE_USE_GLOBAL_SEQUENCE 0x00004000 +#define EVENT_TRACE_USE_LOCAL_SEQUENCE 0x00008000 +#define EVENT_TRACE_RELOG_MODE 0x00010000 +#define EVENT_TRACE_PRIVATE_IN_PROC 0x00020000 +#define EVENT_TRACE_MODE_RESERVED 0x00100000 +#define EVENT_TRACE_STOP_ON_HYBRID_SHUTDOWN 0x00400000 +#define EVENT_TRACE_PERSIST_ON_HYBRID_SHUTDOWN 0x00800000 +#define EVENT_TRACE_USE_PAGED_MEMORY 0x01000000 +#define EVENT_TRACE_SYSTEM_LOGGER_MODE 0x02000000 +#define EVENT_TRACE_INDEPENDENT_SESSION_MODE 0x08000000 +#define EVENT_TRACE_NO_PER_PROCESSOR_BUFFERING 0x10000000 +#define EVENT_TRACE_ADDTO_TRIAGE_DUMP 0x80000000 + +DEFINE_GUID (SystemTraceControlGuid, 0x9e814aad, 0x3204, 0x11d2, 0x9a, 0x82, 0x00, 0x60, 0x08, 0xa8, 0x69, 0x39); + typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; struct _EVENT_TRACE_LOGFILEA; @@ -215,7 +244,7 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG LogBuffersLost; ULONG RealTimeBuffersLost; HANDLE LoggerThreadId; - ULONG LoggerFileNameOffset; + ULONG LogFileNameOffset; ULONG LoggerNameOffset; } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES;

1 0

Austin English : api-ms-win-core-processthreads-l1-1-1: Add advapi32 forwards.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 0a0b0b46e9506b61f46907c33da23af1ba36ea13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a0b0b46e9506b61f46907c33… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 9 14:32:31 2015 -0700 api-ms-win-core-processthreads-l1-1-1: Add advapi32 forwards. --- .../api-ms-win-core-processthreads-l1-1-1.spec | 8 ++++---- tools/make_specfiles | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index adc7284..9fb1941 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -1,5 +1,5 @@ @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA -@ stub CreateProcessAsUserW +@ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread @ stub CreateRemoteThreadEx @@ -35,9 +35,9 @@ @ stub InitializeProcThreadAttributeList @ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent @ stdcall OpenProcess(long long long) kernel32.OpenProcess -@ stub OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stub OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @@ -51,7 +51,7 @@ @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee -@ stub SetThreadToken +@ stdcall SetThreadToken(ptr ptr) advapi32.SetThreadToken @ stdcall SuspendThread(long) kernel32.SuspendThread @ stdcall SwitchToThread() kernel32.SwitchToThread @ stdcall TerminateProcess(long long) kernel32.TerminateProcess diff --git a/tools/make_specfiles b/tools/make_specfiles index 0184a9e..179e6d5 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -139,7 +139,6 @@ my @dll_groups = "kernel32", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0", - "api-ms-win-core-processthreads-l1-1-1", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1", "api-ms-win-core-errorhandling-l1-1-0", @@ -195,6 +194,7 @@ my @dll_groups = "advapi32", "api-ms-win-core-namedpipe-l1-1-0", "api-ms-win-core-namedpipe-l1-2-0", + "api-ms-win-core-processthreads-l1-1-1", ], [ "ole32",

1 0

Nikolay Sivov : gdiplus: Implement trivial case of GdipCreateRegionRgnData for empty and infinite regions.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 0a15e163dbfcd568963465c9c56c96023089a5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a15e163dbfcd568963465c9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 9 09:35:38 2015 +0300 gdiplus: Implement trivial case of GdipCreateRegionRgnData for empty and infinite regions. --- dlls/gdiplus/gdiplus_private.h | 3 +- dlls/gdiplus/region.c | 99 ++++++++++++++++++++++++++++++++++-------- dlls/gdiplus/tests/region.c | 63 +++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 20 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 57b3de3..1f0f47d 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -39,7 +39,8 @@ #define MAX_DASHLEN (16) /* this is a limitation of gdi */ #define INCH_HIMETRIC (2540) -#define VERSION_MAGIC 0xdbc01001 +#define VERSION_MAGIC 0xdbc01001 +#define VERSION_MAGIC2 0xdbc01002 #define TENSION_CONST (0.3) #define GIF_DISPOSE_UNSPECIFIED 0 diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 4ba86eb..572df62 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -522,15 +522,6 @@ GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *rect, return GdipCreateRegionRect(&rectf, region); } -GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region) -{ - FIXME("(%p, %d, %p): stub\n", data, size, region); - - *region = NULL; - return NotImplemented; -} - - /****************************************************************************** * GdipCreateRegionHrgn [GDIPLUS.@] */ @@ -787,6 +778,14 @@ static void write_element(const region_element* element, DWORD *buffer, } } +struct region_header +{ + DWORD size; + DWORD checksum; + DWORD magic; + DWORD num_children; +}; + /***************************************************************************** * GdipGetRegionData [GDIPLUS.@] * @@ -823,13 +822,7 @@ static void write_element(const region_element* element, DWORD *buffer, GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, UINT *needed) { - struct _region_header - { - DWORD size; - DWORD checksum; - DWORD magic; - DWORD num_children; - } *region_header; + struct region_header *region_header; INT filled = 0; UINT required; GpStatus status; @@ -847,7 +840,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, return InsufficientBuffer; } - region_header = (struct _region_header *)buffer; + region_header = (struct region_header *)buffer; region_header->size = sizeheader_size + get_element_size(&region->node); region_header->checksum = 0; region_header->magic = VERSION_MAGIC; @@ -863,6 +856,74 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, return Ok; } +static inline GpStatus read_dword(DWORD **buffer, INT *size, DWORD *ret) +{ + if (*size < sizeof(DWORD)) + return GenericError; + + *ret = **buffer; + (*buffer)++; + (*size) -= sizeof(DWORD); + return Ok; +} + +static GpStatus read_element(GpRegion *region, region_element *element, DWORD **buffer, INT *size) +{ + GpStatus status; + + status = read_dword(buffer, size, &element->type); + if (status != Ok) + return status; + + switch (element->type) + { + case RegionDataInfiniteRect: + case RegionDataEmptyRect: + break; + default: + FIXME("region element type 0x%08x not supported\n", element->type); + return NotImplemented; + } + + return Ok; +} + +/***************************************************************************** + * GdipCreateRegionRgnData [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region) +{ + struct region_header *region_header; + DWORD *buffer = (DWORD*)data; + GpStatus status; + + TRACE("(%p, %d, %p)\n", data, size, region); + + if (!data || size < sizeof(*region_header) || !region) + return InvalidParameter; + + region_header = (struct region_header *)buffer; + if (region_header->magic != VERSION_MAGIC && region_header->magic != VERSION_MAGIC2) + return InvalidParameter; + + status = GdipCreateRegion(region); + if (status != Ok) + return status; + + /* skip header */ + buffer += 4; + size -= sizeof(*region_header); + + status = read_element(*region, &(*region)->node, &buffer, &size); + if (status != Ok) + { + GdipDeleteRegion(*region); + *region = NULL; + } + + return status; +} + /***************************************************************************** * GdipGetRegionDataSize [GDIPLUS.@] */ @@ -988,7 +1049,7 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap case CombineModeIntersect: return get_region_hrgn(element->elementdata.combine.right, graphics, hrgn); case CombineModeXor: case CombineModeExclude: - left = CreateRectRgn(-4194304, -4194304, 4194304, 4194304); + left = CreateRectRgn(-(1 << 22), -(1 << 22), 1 << 22, 1 << 22); break; case CombineModeUnion: case CombineModeComplement: *hrgn = NULL; @@ -1013,7 +1074,7 @@ static GpStatus get_region_hrgn(struct region_element *element, GpGraphics *grap *hrgn = left; return Ok; case CombineModeXor: case CombineModeComplement: - right = CreateRectRgn(-4194304, -4194304, 4194304, 4194304); + right = CreateRectRgn(-(1 << 22), -(1 << 22), 1 << 22, 1 << 22); break; case CombineModeUnion: case CombineModeExclude: DeleteObject(left); diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 5632e4d..92569c7 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -2132,6 +2132,68 @@ static void test_excludeinfinite(void) GdipDeleteMatrix(identity); } +static void test_GdipCreateRegionRgnData(void) +{ + GpGraphics *graphics = NULL; + GpRegion *region, *region2; + HDC hdc = GetDC(0); + GpStatus status; + BYTE buf[512]; + UINT needed; + BOOL ret; + + status = GdipCreateRegionRgnData(NULL, 0, NULL); + ok(status == InvalidParameter, "status %d\n", status); + + status = GdipCreateFromHDC(hdc, &graphics); + ok(status == Ok, "status %d\n", status); + + status = GdipCreateRegion(&region); + ok(status == Ok, "status %d\n", status); + + /* infinite region */ + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %d\n", status); + expect(20, needed); + + status = GdipCreateRegionRgnData(buf, needed, NULL); + ok(status == InvalidParameter, "status %d\n", status); + + status = GdipCreateRegionRgnData(buf, needed, &region2); + ok(status == Ok, "status %d\n", status); + + ret = FALSE; + status = GdipIsInfiniteRegion(region2, graphics, &ret); + ok(status == Ok, "status %d\n", status); + ok(ret, "got %d\n", ret); + GdipDeleteRegion(region2); + + /* empty region */ + status = GdipSetEmpty(region); + ok(status == Ok, "status %d\n", status); + + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %d\n", status); + expect(20, needed); + + status = GdipCreateRegionRgnData(buf, needed, &region2); + ok(status == Ok, "status %d\n", status); + + ret = FALSE; + status = GdipIsEmptyRegion(region2, graphics, &ret); + ok(status == Ok, "status %d\n", status); + ok(ret, "got %d\n", ret); + GdipDeleteRegion(region2); + + GdipDeleteGraphics(graphics); + GdipDeleteRegion(region); + ReleaseDC(0, hdc); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2158,6 +2220,7 @@ START_TEST(region) test_isvisiblepoint(); test_isvisiblerect(); test_excludeinfinite(); + test_GdipCreateRegionRgnData(); GdiplusShutdown(gdiplusToken); }

1 0

Daniel Lehman : msvcrt: Add _W_Getdays.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: bc1eaf7a0fbc7ee0aa58fe603b42c225dea11249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1eaf7a0fbc7ee0aa58fe603… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jun 8 16:24:00 2015 -0700 msvcrt: Add _W_Getdays. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/locale.c | 36 +++++++++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.h | 15 ++++++++++++++- 5 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e99df42..2438b5e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -864,7 +864,7 @@ @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) @ stub _Unlock_shared_ptr_spin_lock -@ stub _W_Getdays +@ cdecl _W_Getdays() @ stub _W_Getmonths @ stub _W_Gettnames @ stub _Wcsftime diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2beb51b..dbbf05f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -846,7 +846,7 @@ @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) -@ stub _W_Getdays +@ cdecl _W_Getdays() @ stub _W_Getmonths @ stub _W_Gettnames @ stub _Wcsftime diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e262aa9..6f6a980 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -842,7 +842,7 @@ @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) msvcr120._Strftime -@ stub _W_Getdays +@ cdecl _W_Getdays() msvcr120._W_Getdays @ stub _W_Getmonths @ stub _W_Gettnames @ stub _Wcsftime diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 2b1efc6..8a5c110 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -35,6 +35,7 @@ #include "mtdll.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -440,6 +441,39 @@ char* CDECL _Getdays(void) } /********************************************************************* + * _W_Getdays (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL _W_Getdays(void) +{ + MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; + MSVCRT_wchar_t *out; + int i, len, size; + + TRACE("\n"); + + size = cur->wstr.names.short_mon[0]-cur->wstr.names.short_wday[0]; + out = MSVCRT_malloc((size+1)*sizeof(*out)); + if(!out) + return NULL; + + size = 0; + for(i=0; i<7; i++) { + out[size++] = ':'; + len = strlenW(cur->wstr.names.short_wday[i]); + memcpy(&out[size], cur->wstr.names.short_wday[i], len*sizeof(*out)); + size += len; + + out[size++] = ':'; + len = strlenW(cur->wstr.names.wday[i]); + memcpy(&out[size], cur->wstr.names.wday[i], len*sizeof(*out)); + size += len; + } + out[size] = '\0'; + + return out; +} + +/********************************************************************* * _Getmonths (MSVCRT.@) */ char* CDECL _Getmonths(void) @@ -1381,7 +1415,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } } for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { - loc->locinfo->lc_time_curr->wstr[i] = (MSVCRT_wchar_t*)&loc->locinfo->lc_time_curr->data[ret]; + loc->locinfo->lc_time_curr->wstr.wstr[i] = (MSVCRT_wchar_t*)&loc->locinfo->lc_time_curr->data[ret]; if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_short_dateW, sizeof(cloc_short_dateW)); ret += sizeof(cloc_short_dateW); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 806c4bf..e11400b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -134,7 +134,20 @@ typedef struct { } str; LCID lcid; int unk[2]; - MSVCRT_wchar_t *wstr[43]; + union { + MSVCRT_wchar_t *wstr[43]; + struct { + MSVCRT_wchar_t *short_wday[7]; + MSVCRT_wchar_t *wday[7]; + MSVCRT_wchar_t *short_mon[12]; + MSVCRT_wchar_t *mon[12]; + MSVCRT_wchar_t *am; + MSVCRT_wchar_t *pm; + MSVCRT_wchar_t *short_date; + MSVCRT_wchar_t *date; + MSVCRT_wchar_t *time; + } names; + } wstr; char data[1]; } MSVCRT___lc_time_data;

1 0

Michael Stefaniuc : dswave: Use the generic DirectMusicObject implementation for DSWave.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 834a92cc8be784453e37958e2608ef91480db196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=834a92cc8be784453e37958e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 01:04:56 2015 +0200 dswave: Use the generic DirectMusicObject implementation for DSWave. --- dlls/dswave/Makefile.in | 1 + dlls/dswave/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++++++ dlls/dswave/dmobject.h | 55 +++++++++++++ dlls/dswave/dswave.c | 151 ++++++++--------------------------- dlls/dswave/dswave_private.h | 9 --- dlls/dswave/tests/dswave.c | 6 +- 6 files changed, 277 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=834a92cc8be784453e379…

1 0

Michael Stefaniuc : dswave: COM cleanup for the IUnknown interface of DirectSoundWave.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 5843a1a00207e25959d35d3f94e2cfe89d2d6af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5843a1a00207e25959d35d3f9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 01:00:28 2015 +0200 dswave: COM cleanup for the IUnknown interface of DirectSoundWave. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dswave/dswave.c | 129 ++++++++++++++++++++++++------------------- dlls/dswave/dswave_private.h | 21 ------- 2 files changed, 71 insertions(+), 79 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index 2c1746f..ad83ca0 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -26,86 +26,95 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); as some sort of bridge between object and loader? */ static const GUID IID_IDirectMusicWavePRIVATE = {0x69e934e4,0x97f1,0x4f1d,{0x88,0xe8,0xf2,0xac,0x88,0x67,0x13,0x27}}; -static ULONG WINAPI IDirectMusicWaveImpl_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface); -static ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicWaveImpl implementation */ +typedef struct IDirectMusicWaveImpl { + IUnknown IUnknown_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + LPDMUS_OBJECTDESC pDesc; +} IDirectMusicWaveImpl; + /* IDirectMusicWaveImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicWaveImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface); - - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IDirectMusicWaveImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IDirectMusicWaveImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicWavePRIVATE)) { - WARN(": requested private interface, expect crash\n"); - return E_NOINTERFACE; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; +static inline IDirectMusicWaveImpl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicWaveImpl, IUnknown_iface); } -static ULONG WINAPI IDirectMusicWaveImpl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface); - ULONG refCount = InterlockedIncrement(&This->ref); +static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ret_iface) +{ + IDirectMusicWaveImpl *This = impl_from_IUnknown(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IDirectMusicObject)) + *ret_iface = &This->ObjectVtbl; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else if (IsEqualIID(riid, &IID_IDirectMusicWavePRIVATE)) { + FIXME("(%p, %s, %p): Unsupported private interface\n", This, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; + } else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; +} - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); +static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) +{ + IDirectMusicWaveImpl *This = impl_from_IUnknown(iface); + LONG ref = InterlockedIncrement(&This->ref); - DSWAVE_LockModule(); + TRACE("(%p) ref=%d\n", This, ref); - return refCount; + return ref; } -static ULONG WINAPI IDirectMusicWaveImpl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface); - ULONG refCount = InterlockedDecrement(&This->ref); +static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) +{ + IDirectMusicWaveImpl *This = impl_from_IUnknown(iface); + LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p) ref=%d\n", This, ref); - if (!refCount) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) { + HeapFree(GetProcessHeap(), 0, This->pDesc); + HeapFree(GetProcessHeap(), 0, This); + DSWAVE_UnlockModule(); + } - DSWAVE_UnlockModule(); - - return refCount; + return ref; } -static const IUnknownVtbl DirectMusicWave_Unknown_Vtbl = { - IDirectMusicWaveImpl_IUnknown_QueryInterface, - IDirectMusicWaveImpl_IUnknown_AddRef, - IDirectMusicWaveImpl_IUnknown_Release +static const IUnknownVtbl unknown_vtbl = { + IUnknownImpl_QueryInterface, + IUnknownImpl_AddRef, + IUnknownImpl_Release }; /* IDirectMusicWaveImpl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IUnknown_QueryInterface(&This->IUnknown_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_AddRef(&This->IUnknown_iface); } static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_Release(&This->IUnknown_iface); } static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -309,17 +318,17 @@ static const IDirectMusicObjectVtbl DirectMusicWave_Object_Vtbl = { /* IDirectMusicWaveImpl IPersistStream part: */ static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IUnknown_QueryInterface(&This->IUnknown_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_AddRef(&This->IUnknown_iface); } static ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface); - return IDirectMusicWaveImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IUnknown_Release(&This->IUnknown_iface); } static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -501,20 +510,24 @@ static const IPersistStreamVtbl DirectMusicWave_PersistStream_Vtbl = { HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ppobj) { IDirectMusicWaveImpl* obj; - + HRESULT hr; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveImpl)); if (NULL == obj) { *ppobj = NULL; return E_OUTOFMEMORY; } - obj->UnknownVtbl = &DirectMusicWave_Unknown_Vtbl; + obj->IUnknown_iface.lpVtbl = &unknown_vtbl; obj->ObjectVtbl = &DirectMusicWave_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicWave_PersistStream_Vtbl; obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicSegment; /* shown by tests */ - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; - return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + DSWAVE_LockModule(); + hr = IUnknown_QueryInterface(&obj->IUnknown_iface, lpcGUID, ppobj); + IUnknown_Release(&obj->IUnknown_iface); + return hr; } diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 3b6850a..febdcfc 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -41,31 +41,10 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicWaveImpl IDirectMusicWaveImpl; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ret_iface) DECLSPEC_HIDDEN; - -/***************************************************************************** - * IDirectMusicWaveImpl implementation structure - */ -struct IDirectMusicWaveImpl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicWaveImpl fields */ - LPDMUS_OBJECTDESC pDesc; - -}; - /********************************************************************** * Dll lifetime tracking declaration for dswave.dll */

1 0

Michael Müller : winebuild: Set a valid major and minor linker version.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 6b4ac9971af18d9851b62b05f3b0d095a2dbc655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b4ac9971af18d9851b62b05f… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Aug 21 05:57:24 2014 +0200 winebuild: Set a valid major and minor linker version. Some apps expect a nonzero linker version. --- tools/winebuild/spec32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index c27f0dd..cb56abe 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -529,8 +529,8 @@ void output_module( DLLSPEC *spec ) spec->characteristics ); output( "\t.short 0x%04x\n", /* Magic */ get_ptr_size() == 8 ? IMAGE_NT_OPTIONAL_HDR64_MAGIC : IMAGE_NT_OPTIONAL_HDR32_MAGIC ); - output( "\t.byte 0\n" ); /* MajorLinkerVersion */ - output( "\t.byte 0\n" ); /* MinorLinkerVersion */ + output( "\t.byte 7\n" ); /* MajorLinkerVersion */ + output( "\t.byte 10\n" ); /* MinorLinkerVersion */ output( "\t.long 0\n" ); /* SizeOfCode */ output( "\t.long 0\n" ); /* SizeOfInitializedData */ output( "\t.long 0\n" ); /* SizeOfUninitializedData */ @@ -710,8 +710,8 @@ void output_fake_module( DLLSPEC *spec ) put_word( get_ptr_size() == 8 ? IMAGE_NT_OPTIONAL_HDR64_MAGIC : IMAGE_NT_OPTIONAL_HDR32_MAGIC ); /* Magic */ - put_byte( 0 ); /* MajorLinkerVersion */ - put_byte( 0 ); /* MinorLinkerVersion */ + put_byte( 7 ); /* MajorLinkerVersion */ + put_byte( 10 ); /* MinorLinkerVersion */ put_dword( text_size ); /* SizeOfCode */ put_dword( 0 ); /* SizeOfInitializedData */ put_dword( 0 ); /* SizeOfUninitializedData */

1 0

Daniel Lehman : msvcrt: Add _W_GetMonths.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 1a4db7cdf5c669f0a0c5b0f698eeb8fef831a269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a4db7cdf5c669f0a0c5b0f69… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jun 8 17:10:01 2015 -0700 msvcrt: Add _W_GetMonths. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/locale.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2438b5e..66ec34c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -865,7 +865,7 @@ @ cdecl _Strftime(str long str ptr ptr) @ stub _Unlock_shared_ptr_spin_lock @ cdecl _W_Getdays() -@ stub _W_Getmonths +@ cdecl _W_Getmonths() @ stub _W_Gettnames @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dbbf05f..2a3a813 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -847,7 +847,7 @@ @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) @ cdecl _W_Getdays() -@ stub _W_Getmonths +@ cdecl _W_Getmonths() @ stub _W_Gettnames @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 6f6a980..0c66cc2 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -843,7 +843,7 @@ @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) msvcr120._Strftime @ cdecl _W_Getdays() msvcr120._W_Getdays -@ stub _W_Getmonths +@ cdecl _W_Getmonths() msvcr120._W_Getmonths @ stub _W_Gettnames @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) msvcr120._XcptFilter diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 8a5c110..3e9e99b 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -507,6 +507,39 @@ char* CDECL _Getmonths(void) } /********************************************************************* + * _W_Getmonths (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL _W_Getmonths(void) +{ + MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; + MSVCRT_wchar_t *out; + int i, len, size; + + TRACE("\n"); + + size = cur->wstr.names.am-cur->wstr.names.short_mon[0]; + out = MSVCRT_malloc((size+1)*sizeof(*out)); + if(!out) + return NULL; + + size = 0; + for(i=0; i<12; i++) { + out[size++] = ':'; + len = strlenW(cur->wstr.names.short_mon[i]); + memcpy(&out[size], cur->wstr.names.short_mon[i], len*sizeof(*out)); + size += len; + + out[size++] = ':'; + len = strlenW(cur->wstr.names.mon[i]); + memcpy(&out[size], cur->wstr.names.mon[i], len*sizeof(*out)); + size += len; + } + out[size] = '\0'; + + return out; +} + +/********************************************************************* * _Gettnames (MSVCRT.@) */ void* CDECL _Gettnames(void)

1 0

Michael Stefaniuc : dswave: Finish the cleanup of create_dswave().
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: e444c31f9ef3a81d7750d3c70fa2f3eca84e80bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e444c31f9ef3a81d7750d3c70… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 10 01:07:49 2015 +0200 dswave: Finish the cleanup of create_dswave(). --- dlls/dswave/dswave.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index b93908d..0127634 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -425,14 +425,14 @@ static const IPersistStreamVtbl persiststream_vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dswave(REFIID lpcGUID, void **ppobj) { - IDirectMusicWaveImpl* obj; + IDirectMusicWaveImpl *obj; HRESULT hr; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveImpl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + obj = HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectMusicWaveImpl)); + if (!obj) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } obj->IUnknown_iface.lpVtbl = &unknown_vtbl; obj->ref = 1; dmobject_init(&obj->dmobj, &CLSID_DirectSoundWave, &obj->IUnknown_iface);

1 0

Jacek Caban : kernel32: Treat empty locale name as LOCALE_INVARIANT.
by Alexandre Julliard June 10, 2015

June 10, 2015

Module: wine Branch: master Commit: 09176c3aa020bac945e529829c0e809f70b5d6d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09176c3aa020bac945e529829… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 9 23:18:47 2015 +0200 kernel32: Treat empty locale name as LOCALE_INVARIANT. --- dlls/kernel32/locale.c | 7 +++++++ dlls/kernel32/tests/locale.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index bf4ace5..eaf1183 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -453,6 +453,13 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) name->win_name[0] = 0; lstrcpynW( name->lang, str, sizeof(name->lang)/sizeof(WCHAR) ); + if (!*name->lang) + { + name->lcid = LOCALE_INVARIANT; + name->matches = 4; + return; + } + if (!(p = strpbrkW( name->lang, sepW ))) { if (!strcmpW( name->lang, posixW ) || !strcmpW( name->lang, cW )) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9920dfc..061e331 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2418,9 +2418,9 @@ static void test_LocaleNameToLCID(void) buffer[0] = 0; SetLastError(0xdeadbeef); lcid = pLocaleNameToLCID(LOCALE_NAME_INVARIANT, 0); - todo_wine ok(lcid == 0x7F, "Expected lcid = 0x7F, got %08x, error %d\n", lcid, GetLastError()); + ok(lcid == 0x7F, "Expected lcid = 0x7F, got %08x, error %d\n", lcid, GetLastError()); ret = pLCIDToLocaleName(lcid, buffer, LOCALE_NAME_MAX_LENGTH, 0); - ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); + todo_wine ok(ret > 0, "Expected ret > 0, got %d, error %d\n", ret, GetLastError()); trace("%08x, %s\n", lcid, wine_dbgstr_w(buffer)); /* bad name */ @@ -4091,6 +4091,8 @@ static void test_IsValidLocaleName(void) ok(!ret, "IsValidLocaleName should have failed\n"); ret = pIsValidLocaleName(zzzzW); ok(!ret, "IsValidLocaleName should have failed\n"); + ret = pIsValidLocaleName(LOCALE_NAME_INVARIANT); + ok(ret, "IsValidLocaleName failed\n"); } static void test_CompareStringOrdinal(void)

1 0