April 2012 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Set correct date and time format for C locale.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 426e58be698e818ee06ae2b1eebaf51a9aa83245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426e58be698e818ee06ae2b1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 11 15:22:02 2012 +0200 msvcrt: Set correct date and time format for C locale. --- dlls/msvcrt/locale.c | 70 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 53 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 699b028..678550a 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -761,6 +761,12 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) static const char monetary[] = "MONETARY="; static const char numeric[] = "NUMERIC="; static const char time[] = "TIME="; + static const char cloc_short_date[] = "MM/dd/yy"; + static const MSVCRT_wchar_t cloc_short_dateW[] = {'M','M','/','d','d','/','y','y',0}; + static const char cloc_long_date[] = "dddd, MMMM dd, yyyy"; + static const MSVCRT_wchar_t cloc_long_dateW[] = {'d','d','d','d',',',' ','M','M','M','M',' ','d','d',',',' ','y','y','y','y',0}; + static const char cloc_time[] = "HH:mm:ss"; + static const MSVCRT_wchar_t cloc_timeW[] = {'H','H',':','m','m',':','s','s',0}; MSVCRT__locale_t loc; LCID lcid[6] = { 0 }; @@ -1205,21 +1211,29 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) size = sizeof(MSVCRT___lc_time_data); for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { - ret = GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i] - |LOCALE_NOUSEROVERRIDE, NULL, 0); - if(!ret) { - MSVCRT__free_locale(loc); - return NULL; - } - size += ret; + if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + size += sizeof(cloc_short_date) + sizeof(cloc_short_dateW); + }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + size += sizeof(cloc_long_date) + sizeof(cloc_long_dateW); + }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) { + size += sizeof(cloc_time) + sizeof(cloc_timeW); + }else { + ret = GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i] + |LOCALE_NOUSEROVERRIDE, NULL, 0); + if(!ret) { + MSVCRT__free_locale(loc); + return NULL; + } + size += ret; - ret = GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i] - |LOCALE_NOUSEROVERRIDE, NULL, 0); - if(!ret) { - MSVCRT__free_locale(loc); - return NULL; + ret = GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i] + |LOCALE_NOUSEROVERRIDE, NULL, 0); + if(!ret) { + MSVCRT__free_locale(loc); + return NULL; + } + size += ret*sizeof(MSVCRT_wchar_t); } - size += ret*sizeof(MSVCRT_wchar_t); } loc->locinfo->lc_time_curr = MSVCRT_malloc(size); @@ -1231,13 +1245,35 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) ret = 0; for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { loc->locinfo->lc_time_curr->str[i] = &loc->locinfo->lc_time_curr->data[ret]; - ret += GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, - &loc->locinfo->lc_time_curr->data[ret], size-ret); + if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_short_date, sizeof(cloc_short_date)); + ret += sizeof(cloc_short_date); + }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_long_date, sizeof(cloc_long_date)); + ret += sizeof(cloc_long_date); + }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) { + memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_time, sizeof(cloc_time)); + ret += sizeof(cloc_time); + }else { + ret += GetLocaleInfoA(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, + &loc->locinfo->lc_time_curr->data[ret], size-ret); + } } 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]; - ret += GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, - (MSVCRT_wchar_t*)&loc->locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); + 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); + }else if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { + memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_long_dateW, sizeof(cloc_long_dateW)); + ret += sizeof(cloc_long_dateW); + }else if(time_data[i]==LOCALE_STIMEFORMAT && !lcid[MSVCRT_LC_TIME]) { + memcpy(&loc->locinfo->lc_time_curr->data[ret], cloc_timeW, sizeof(cloc_timeW)); + ret += sizeof(cloc_timeW); + }else { + ret += GetLocaleInfoW(lcid[MSVCRT_LC_TIME], time_data[i]|LOCALE_NOUSEROVERRIDE, + (MSVCRT_wchar_t*)&loc->locinfo->lc_time_curr->data[ret], size-ret)*sizeof(MSVCRT_wchar_t); + } } loc->locinfo->lc_time_curr->lcid = lcid[MSVCRT_LC_TIME];

1 0

Piotr Caban : msvcrt: Added field names to MSVCRT___lc_time_data structure.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: b58cfb40b9ca4dccac459d2a184ff5cd2e1d3895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b58cfb40b9ca4dccac459d2a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 11 15:22:12 2012 +0200 msvcrt: Added field names to MSVCRT___lc_time_data structure. --- dlls/msvcrt/locale.c | 32 +++++++++++++++----------------- dlls/msvcrt/msvcrt.h | 26 ++++++++++++++------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 678550a..a24a5b9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -427,7 +427,7 @@ char* CDECL _Getdays(void) TRACE("\n"); - size = cur->str[2*7]-cur->str[0]; + size = cur->str.names.short_mon[0]-cur->str.names.short_wday[0]; out = MSVCRT_malloc(size+1); if(!out) return NULL; @@ -435,13 +435,13 @@ char* CDECL _Getdays(void) size = 0; for(i=0; i<7; i++) { out[size++] = ':'; - len = strlen(cur->str[i]); - memcpy(&out[size], cur->str[i], len); + len = strlen(cur->str.names.short_wday[i]); + memcpy(&out[size], cur->str.names.short_wday[i], len); size += len; out[size++] = ':'; - len = strlen(cur->str[7+i]); - memcpy(&out[size], cur->str[7+i], len); + len = strlen(cur->str.names.wday[i]); + memcpy(&out[size], cur->str.names.wday[i], len); size += len; } out[size] = '\0'; @@ -454,15 +454,13 @@ char* CDECL _Getdays(void) */ char* CDECL _Getmonths(void) { - static const int months_offset = 14; - MSVCRT___lc_time_data *cur = get_locinfo()->lc_time_curr; int i, len, size; char *out; TRACE("\n"); - size = cur->str[months_offset+2*12]-cur->str[months_offset]; + size = cur->str.names.am-cur->str.names.short_mon[0]; out = MSVCRT_malloc(size+1); if(!out) return NULL; @@ -470,13 +468,13 @@ char* CDECL _Getmonths(void) size = 0; for(i=0; i<12; i++) { out[size++] = ':'; - len = strlen(cur->str[months_offset+i]); - memcpy(&out[size], cur->str[months_offset+i], len); + len = strlen(cur->str.names.short_mon[i]); + memcpy(&out[size], cur->str.names.short_mon[i], len); size += len; out[size++] = ':'; - len = strlen(cur->str[months_offset+12+i]); - memcpy(&out[size], cur->str[months_offset+12+i], len); + len = strlen(cur->str.names.mon[i]); + memcpy(&out[size], cur->str.names.mon[i], len); size += len; } out[size] = '\0'; @@ -494,8 +492,8 @@ void* CDECL _Gettnames(void) TRACE("\n"); - for(i=0; i<sizeof(cur->str)/sizeof(cur->str[0]); i++) - size += strlen(cur->str[i])+1; + for(i=0; i<sizeof(cur->str.str)/sizeof(cur->str.str[0]); i++) + size += strlen(cur->str.str[i])+1; ret = MSVCRT_malloc(size); if(!ret) @@ -503,8 +501,8 @@ void* CDECL _Gettnames(void) memcpy(ret, cur, size); size = 0; - for(i=0; i<sizeof(cur->str)/sizeof(cur->str[0]); i++) { - ret->str[i] = &ret->data[size]; + for(i=0; i<sizeof(cur->str.str)/sizeof(cur->str.str[0]); i++) { + ret->str.str[i] = &ret->data[size]; size += strlen(&ret->data[size])+1; } @@ -1244,7 +1242,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) ret = 0; for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { - loc->locinfo->lc_time_curr->str[i] = &loc->locinfo->lc_time_curr->data[ret]; + loc->locinfo->lc_time_curr->str.str[i] = &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_date, sizeof(cloc_short_date)); ret += sizeof(cloc_short_date); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 26a1177..0fd3410 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -109,18 +109,20 @@ typedef struct MSVCRT_tagLC_ID { } MSVCRT_LC_ID, *MSVCRT_LPLC_ID; typedef struct { - /* str table contains following strings: - * short weekday names [7]; - * weekday names [7]; - * short month names [12]; - * month names [12]; - * s1159 (AM); - * s2359 (PM); - * short date format; - * date format; - * time format; - */ - char *str[43]; + union { + char *str[43]; + struct { + char *short_wday[7]; + char *wday[7]; + char *short_mon[12]; + char *mon[12]; + char *am; + char *pm; + char *short_date; + char *date; + char *time; + } names; + } str; LCID lcid; int unk[2]; MSVCRT_wchar_t *wstr[43];

1 0

Piotr Caban : msvcrt: Added _Strftime implementation.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: ef08e807651bcb7687e1a68660fc83e3931dc30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef08e807651bcb7687e1a6866… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 11 15:22:25 2012 +0200 msvcrt: Added _Strftime implementation. --- dlls/msvcrt/locale.c | 11 -- dlls/msvcrt/tests/time.c | 3 - dlls/msvcrt/time.c | 279 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 272 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef08e807651bcb7687e1a…

1 0

Piotr Caban : msvcrt/tests: Added more strftime tests.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 43d208d215fa1a344fddbd7d9c4eebd9b716f23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d208d215fa1a344fddbd7d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 11 15:22:44 2012 +0200 msvcrt/tests: Added more strftime tests. --- dlls/msvcrt/tests/time.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 36ef8eb..6fb7491 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -599,9 +599,47 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = strftime(NULL, 0, "copy", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + + retA = strftime(bufA, 256, "copy", NULL); + ok(retA == 4, "expected 4, got %ld\n", retA); + ok(!strcmp(bufA, "copy"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "copy it", gmt_tm); + ok(retA == 7, "expected 7, got %ld\n", retA); + ok(!strcmp(bufA, "copy it"), "got %s\n", bufA); + + errno = 0xdeadbeef; + retA = strftime(bufA, 2, "copy", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(!strcmp(bufA, "") || broken(!strcmp(bufA, "copy it")), "got %s\n", bufA); + ok(errno==ERANGE || errno==0xdeadbeef, "errno = %d\n", errno); + + errno = 0xdeadbeef; + retA = strftime(bufA, 256, "a%e", gmt_tm); + ok(retA==0 || broken(retA==1), "expected 0, got %ld\n", retA); + ok(!strcmp(bufA, "") || broken(!strcmp(bufA, "a")), "got %s\n", bufA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + + if(0) { /* crashes on Win2k */ + errno = 0xdeadbeef; + retA = strftime(bufA, 256, "%c", NULL); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(!strcmp(bufA, ""), "got %s\n", bufA); + ok(errno == EINVAL, "errno = %d\n", errno); + } + + retA = strftime(bufA, 256, "e%#%e", gmt_tm); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "e%e"), "got %s\n", bufA); + retA = strftime(bufA, 256, "%c", gmt_tm); ok(retA == 17, "expected 17, got %ld\n", retA); ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA); + retW = wcsftime(bufW, 256, cW, gmt_tm); ok(retW == 17, "expected 17, got %ld\n", retW); ok(retA == retW, "expected %ld, got %ld\n", retA, retW); @@ -609,6 +647,70 @@ static void test_strftime(void) retA = WideCharToMultiByte(CP_ACP, 0, bufW, retW, buf, 256, NULL, NULL); buf[retA] = 0; ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); + + retA = strftime(bufA, 256, "%x", gmt_tm); + ok(retA == 8, "expected 8, got %ld\n", retA); + ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%X", gmt_tm); + ok(retA == 8, "expected 8, got %ld\n", retA); + ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%a", gmt_tm); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "Thu"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%A", gmt_tm); + ok(retA == 8, "expected 8, got %ld\n", retA); + ok(!strcmp(bufA, "Thursday"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%b", gmt_tm); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%B", gmt_tm); + ok(retA == 7, "expected 7, got %ld\n", retA); + ok(!strcmp(bufA, "January"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%d", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%#d", gmt_tm); + ok(retA == 1, "expected 1, got %ld\n", retA); + ok(!strcmp(bufA, "1"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%H", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "00"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%I", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "12"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%j", gmt_tm); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "001"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%m", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%#M", gmt_tm); + ok(retA == 1, "expected 1, got %ld\n", retA); + ok(!strcmp(bufA, "0"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%p", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "AM"), "got %s\n", bufA); + + gmt_tm->tm_mon = 1; + gmt_tm->tm_mday = 30; + retA = strftime(bufA, 256, "%c", gmt_tm); + todo_wine { + ok(retA == 17, "expected 17, got %ld\n", retA); + ok(!strcmp(bufA, "02/30/70 00:00:00"), "got %s\n", bufA); + } } static void test_asctime(void)

1 0

Christian Costa : kernel32: Limit dwTotalPageFile in GlobalMemoryStatus to 4Gb minus 512kb for apps that do not expect so much memory .
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: d8822cf3d2708dccb3e04d72ddf73662e7992f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8822cf3d2708dccb3e04d72d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 10 22:04:30 2012 +0200 kernel32: Limit dwTotalPageFile in GlobalMemoryStatus to 4Gb minus 512kb for apps that do not expect so much memory. --- dlls/kernel32/heap.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index db21b7a..d730a8a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1305,7 +1305,7 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) * roughly how much they are able to allocate * * RETURNS - * None + * None */ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) { @@ -1333,13 +1333,14 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) { lpBuffer->dwTotalPhys = min( memstatus.ullTotalPhys, MAXDWORD ); lpBuffer->dwAvailPhys = min( memstatus.ullAvailPhys, MAXDWORD ); - lpBuffer->dwTotalPageFile = min( memstatus.ullTotalPageFile, MAXDWORD ); + /* Limit value for apps that do not expect so much memory. Remove last 512 kb to make Sacrifice demo happy. */ + lpBuffer->dwTotalPageFile = min( memstatus.ullTotalPageFile, 0xfff7ffff ); lpBuffer->dwAvailPageFile = min( memstatus.ullAvailPageFile, MAXDWORD ); lpBuffer->dwTotalVirtual = min( memstatus.ullTotalVirtual, MAXDWORD ); lpBuffer->dwAvailVirtual = min( memstatus.ullAvailVirtual, MAXDWORD ); } - else /* duplicate NT bug */ + else /* duplicate NT bug */ { lpBuffer->dwTotalPhys = memstatus.ullTotalPhys; lpBuffer->dwAvailPhys = memstatus.ullAvailPhys;

1 0

Christian Costa : dmusic: Replace debugstr_DMUS_OBJECTDESC by a specific dump function to avoid debug buffer overflow .
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 7a772ed83a99c5b516e6500d544885dda6deedbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a772ed83a99c5b516e6500d5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 10 22:30:21 2012 +0200 dmusic: Replace debugstr_DMUS_OBJECTDESC by a specific dump function to avoid debug buffer overflow. --- dlls/dmusic/collection.c | 30 +++++++++++++++++++++++------- dlls/dmusic/dmusic_main.c | 39 ++++++++++++++++----------------------- dlls/dmusic/dmusic_private.h | 6 +++--- 3 files changed, 42 insertions(+), 33 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index faafd64..3d9dc18 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -189,9 +189,20 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescripto return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { +static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor(LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) +{ ICOM_THIS_MULTI(IDirectMusicCollectionImpl, ObjectVtbl, iface); - TRACE("(%p, %p): setting descriptor:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC (pDesc)); + + TRACE("(%p, %p)\n", iface, pDesc); + + if (!pDesc) + return E_POINTER; + + if (TRACE_ON(dmusic)) + { + TRACE("Setting descriptor:\n"); + dump_DMUS_OBJECTDESC(pDesc); + } /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) @@ -223,7 +234,8 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor (LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc) { +static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor(LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc) +{ ICOM_THIS_MULTI(IDirectMusicCollectionImpl, ObjectVtbl, iface); DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; @@ -384,10 +396,14 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ return DMUS_E_INVALIDFILE; } - } - - TRACE(": returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (pDesc)); - + } + + if (TRACE_ON(dmusic)) + { + TRACE("Returning descriptor:\n"); + dump_DMUS_OBJECTDESC(pDesc); + } + return S_OK; } diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 723b90a..be6fb56 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -446,27 +446,20 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0])); } -/* dump whole DMUS_OBJECTDESC struct */ -const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024] = "", *ptr = &buffer[0]; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = %d\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = FIXME\n"); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return wine_dbg_sprintf("(NULL)"); - } +/* Dump whole DMUS_OBJECTDESC struct */ +void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) +{ + TRACE("DMUS_OBJECTDESC (%p):\n", desc); + TRACE(" - dwSize = %d\n", desc->dwSize); + TRACE(" - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (desc->dwValidData)); + if (desc->dwValidData & DMUS_OBJ_CLASS) TRACE(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + if (desc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = FIXME\n"); + if (desc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&desc->vVersion)); + if (desc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s\n - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index c05adf0..498df9e 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -274,7 +274,7 @@ extern int even_or_odd (DWORD number) DECLSPEC_HIDDEN; extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; -/* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +/* Dump whole DMUS_OBJECTDESC struct */ +extern void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) DECLSPEC_HIDDEN; -#endif /* __WINE_DMUSIC_PRIVATE_H */ +#endif /* __WINE_DMUSIC_PRIVATE_H */

1 0

Christian Costa : dmusic: Add dump function for DMUS_PORTPARAMS struct.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 7776591ff43e9a98f1d3d6412ffe3e282670d894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7776591ff43e9a98f1d3d6412… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 10 22:30:29 2012 +0200 dmusic: Add dump function for DMUS_PORTPARAMS struct. --- dlls/dmusic/dmusic.c | 3 +++ dlls/dmusic/dmusic_main.c | 28 ++++++++++++++++++++++++++++ dlls/dmusic/dmusic_private.h | 2 ++ 3 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index ef3143f..eab3770 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -178,6 +178,9 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLS TRACE("(%p, %s, %p, %p, %p)\n", This, debugstr_dmguid(rclsidPort), pPortParams, ppPort, pUnkOuter); + if (TRACE_ON(dmusic)) + dump_DMUS_PORTPARAMS(pPortParams); + if(!rclsidPort) return E_POINTER; diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index be6fb56..66080a7 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -463,3 +463,31 @@ void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); if (desc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", desc->pStream); } + +/* Dump DMUS_PORTPARAMS flags */ +static const char* debugstr_DMUS_PORTPARAMS_FLAGS(DWORD flagmask) +{ + static const flag_info flags[] = { + FE(DMUS_PORTPARAMS_VOICES), + FE(DMUS_PORTPARAMS_CHANNELGROUPS), + FE(DMUS_PORTPARAMS_AUDIOCHANNELS), + FE(DMUS_PORTPARAMS_SAMPLERATE), + FE(DMUS_PORTPARAMS_EFFECTS), + FE(DMUS_PORTPARAMS_SHARE) + }; + return debugstr_flags(flagmask, flags, sizeof(flags)/sizeof(flags[0])); +} + +/* Dump whole DMUS_PORTPARAMS struct */ +void dump_DMUS_PORTPARAMS(LPDMUS_PORTPARAMS params) +{ + TRACE("DMUS_PORTPARAMS (%p):\n", params); + TRACE(" - dwSize = %d\n", params->dwSize); + TRACE(" - dwValidParams = %s\n", debugstr_DMUS_PORTPARAMS_FLAGS(params->dwValidParams)); + if (params->dwValidParams & DMUS_PORTPARAMS_VOICES) TRACE(" - dwVoices = %u\n", params->dwVoices); + if (params->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) TRACE(" - dwChannelGroup = %u\n", params->dwChannelGroups); + if (params->dwValidParams & DMUS_PORTPARAMS_AUDIOCHANNELS) TRACE(" - dwAudioChannels = %u\n", params->dwAudioChannels); + if (params->dwValidParams & DMUS_PORTPARAMS_SAMPLERATE) TRACE(" - dwSampleRate = %u\n", params->dwSampleRate); + if (params->dwValidParams & DMUS_PORTPARAMS_EFFECTS) TRACE(" - dwEffectFlags = %x\n", params->dwEffectFlags); + if (params->dwValidParams & DMUS_PORTPARAMS_SHARE) TRACE(" - fShare = %u\n", params->fShare); +} diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 498df9e..cffea34 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -276,5 +276,7 @@ extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* Dump whole DMUS_OBJECTDESC struct */ extern void dump_DMUS_OBJECTDESC(LPDMUS_OBJECTDESC desc) DECLSPEC_HIDDEN; +/* Dump whole DMUS_PORTPARAMS struct */ +extern void dump_DMUS_PORTPARAMS(LPDMUS_PORTPARAMS params) DECLSPEC_HIDDEN; #endif /* __WINE_DMUSIC_PRIVATE_H */

1 0

Henri Verbeet : d3d9: Introduce a separate function for swapchain creation.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 8b95d8d2e3f3faba7c928386b173825bb77bc364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b95d8d2e3f3faba7c928386b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 10 22:06:19 2012 +0200 d3d9: Introduce a separate function for swapchain creation. --- dlls/d3d9/d3d9_private.h | 4 ++-- dlls/d3d9/device.c | 30 +++++++----------------------- dlls/d3d9/swapchain.c | 27 ++++++++++++++++++++++++++- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 7d1821c..f0262f5 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -211,8 +211,8 @@ typedef struct IDirect3DSwapChain9Impl IDirect3DDevice9Ex *parentDevice; } IDirect3DSwapChain9Impl; -HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device, - D3DPRESENT_PARAMETERS *present_parameters) DECLSPEC_HIDDEN; +HRESULT d3d9_swapchain_create(IDirect3DDevice9Impl *device, D3DPRESENT_PARAMETERS *present_parameters, + IDirect3DSwapChain9Impl **swapchain) DECLSPEC_HIDDEN; /* ----------------- */ /* IDirect3DSurface9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bec3c4b..f828d26 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -443,32 +443,17 @@ static BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(IDirect3DDevice9Ex *iface, BO static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDevice9Ex *iface, D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain9 **swapchain) { - IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface); IDirect3DSwapChain9Impl *object; HRESULT hr; TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - ERR("Failed to allocate swapchain memory.\n"); - return E_OUTOFMEMORY; - } + if (SUCCEEDED(hr = d3d9_swapchain_create(device, present_parameters, &object))) + *swapchain = (IDirect3DSwapChain9 *)object; - hr = swapchain_init(object, This, present_parameters); - if (FAILED(hr)) - { - WARN("Failed to initialize swapchain, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - TRACE("Created swapchain %p.\n", object); - *swapchain = (IDirect3DSwapChain9 *)object; - - return D3D_OK; + return hr; } static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(IDirect3DDevice9Ex *iface, @@ -3291,7 +3276,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent { struct IDirect3DDevice9Impl *device = device_from_device_parent(device_parent); D3DPRESENT_PARAMETERS local_parameters; - IDirect3DSwapChain9 *d3d_swapchain; + IDirect3DSwapChain9Impl *d3d_swapchain; HRESULT hr; TRACE("device_parent %p, desc %p, swapchain %p\n", device_parent, desc, swapchain); @@ -3312,8 +3297,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent local_parameters.FullScreen_RefreshRateInHz = desc->refresh_rate; local_parameters.PresentationInterval = desc->swap_interval; - hr = IDirect3DDevice9Impl_CreateAdditionalSwapChain(&device->IDirect3DDevice9Ex_iface, - &local_parameters, &d3d_swapchain); + hr = d3d9_swapchain_create(device, &local_parameters, &d3d_swapchain); if (FAILED(hr)) { WARN("Failed to create swapchain, hr %#x.\n", hr); @@ -3321,7 +3305,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent return hr; } - *swapchain = ((IDirect3DSwapChain9Impl *)d3d_swapchain)->wined3d_swapchain; + *swapchain = d3d_swapchain->wined3d_swapchain; wined3d_swapchain_incref(*swapchain); IDirect3DSwapChain9_Release((IDirect3DSwapChain9 *)d3d_swapchain); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 7a13848..8cbecdd 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -237,7 +237,7 @@ static const struct wined3d_parent_ops d3d9_swapchain_wined3d_parent_ops = d3d9_swapchain_wined3d_object_released, }; -HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device, +static HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl *device, D3DPRESENT_PARAMETERS *present_parameters) { struct wined3d_swapchain_desc desc; @@ -294,3 +294,28 @@ HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl return D3D_OK; } + +HRESULT d3d9_swapchain_create(IDirect3DDevice9Impl *device, D3DPRESENT_PARAMETERS *present_parameters, + IDirect3DSwapChain9Impl **swapchain) +{ + IDirect3DSwapChain9Impl *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + ERR("Failed to allocate swapchain memory.\n"); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = swapchain_init(object, device, present_parameters))) + { + WARN("Failed to initialize swapchain, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created swapchain %p.\n", object); + *swapchain = object; + + return D3D_OK; +}

1 0

Henri Verbeet : d3d9: COM cleanup for the IDirect3DSwapChain9 interface.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 53b3f9d40e548270f61096c3c742bcaf050bb0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b3f9d40e548270f61096c3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 10 22:06:20 2012 +0200 d3d9: COM cleanup for the IDirect3DSwapChain9 interface. This is mostly based on the COM cleanup scripts by Michael Stefaniuc. --- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 4 +- dlls/d3d9/swapchain.c | 95 ++++++++++++++++++++++++++------------------- 3 files changed, 58 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53b3f9d40e548270f6109…

1 0

Henri Verbeet : ddraw: Get rid of IDirect3DExecuteBufferImpl.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 4d1a659c3adaeaa37f89b11a7d8907f7502464af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1a659c3adaeaa37f89b11a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 10 22:06:21 2012 +0200 ddraw: Get rid of IDirect3DExecuteBufferImpl. --- dlls/ddraw/ddraw_private.h | 9 +- dlls/ddraw/device.c | 8 +- dlls/ddraw/executebuffer.c | 201 +++++++++++++++++++------------------------ 3 files changed, 97 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d1a659c3adaeaa37f89b…

1 0