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

Rico Schüller : d3dx9: Improve effect sampler parsing.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 4f55c9eab1578915c83f73e7c491bd42da80ca08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f55c9eab1578915c83f73e7c… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jun 8 09:12:01 2011 +0200 d3dx9: Improve effect sampler parsing. --- dlls/d3dx9_36/effect.c | 125 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 99 insertions(+), 26 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0e3ecf3..c18d581 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -112,6 +112,12 @@ struct d3dx_state D3DXHANDLE parameter; }; +struct d3dx_sampler +{ + UINT state_count; + struct d3dx_state *states; +}; + struct d3dx_pass { char *name; @@ -169,6 +175,8 @@ struct ID3DXEffectCompilerImpl static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl *base, struct d3dx_parameter *parameter, LPCSTR name); static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_parameter *parameter, LPCSTR name); +static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, const char **ptr, D3DXHANDLE *objects); +static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child); static const struct { @@ -542,12 +550,28 @@ static struct d3dx_parameter *is_valid_parameter(struct ID3DXBaseEffectImpl *bas return NULL; } +static void free_state(struct d3dx_state *state) +{ + free_parameter(state->parameter, FALSE, FALSE); +} + +static void free_sampler(struct d3dx_sampler *sampler) +{ + UINT i; + + for (i = 0; i < sampler->state_count; ++i) + { + free_state(&sampler->states[i]); + } + HeapFree(GetProcessHeap(), 0, sampler->states); +} + static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { unsigned int i; struct d3dx_parameter *param = get_parameter_struct(handle); - TRACE("Free parameter %p, child %s\n", param, child ? "yes" : "no"); + TRACE("Free parameter %p, name %s, child %s\n", param, param->name, child ? "yes" : "no"); if (!param) { @@ -583,6 +607,7 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { case D3DXPT_STRING: HeapFree(GetProcessHeap(), 0, *(LPSTR *)param->data); + if (!child) HeapFree(GetProcessHeap(), 0, param->data); break; case D3DXPT_TEXTURE: @@ -593,6 +618,7 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) case D3DXPT_PIXELSHADER: case D3DXPT_VERTEXSHADER: if (*(IUnknown **)param->data) IUnknown_Release(*(IUnknown **)param->data); + if (!child) HeapFree(GetProcessHeap(), 0, param->data); break; case D3DXPT_SAMPLER: @@ -600,7 +626,9 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) case D3DXPT_SAMPLER2D: case D3DXPT_SAMPLER3D: case D3DXPT_SAMPLERCUBE: - /* Todo: free sampler */ + free_sampler((struct d3dx_sampler *)param->data); + /* samplers have always own data, so free that */ + HeapFree(GetProcessHeap(), 0, param->data); break; default: @@ -608,10 +636,12 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) break; } } - - if (!child) + else { - HeapFree(GetProcessHeap(), 0, param->data); + if (!child) + { + HeapFree(GetProcessHeap(), 0, param->data); + } } /* only the parent has to release name and semantic */ @@ -624,11 +654,6 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) HeapFree(GetProcessHeap(), 0, param); } -static void free_state(struct d3dx_state *state) -{ - free_parameter(state->parameter, FALSE, FALSE); -} - static void free_pass(D3DXHANDLE handle) { unsigned int i; @@ -3629,7 +3654,49 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, }; -static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, const char **ptr, D3DXHANDLE *objects) +static HRESULT d3dx9_parse_sampler(struct d3dx_sampler *sampler, const char *data, const char **ptr, D3DXHANDLE *objects) +{ + HRESULT hr; + UINT i; + struct d3dx_state *states; + + read_dword(ptr, &sampler->state_count); + TRACE("Count: %u\n", sampler->state_count); + + states = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*states) * sampler->state_count); + if (!states) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < sampler->state_count; ++i) + { + hr = d3dx9_parse_state(&states[i], data, ptr, objects); + if (hr != D3D_OK) + { + WARN("Failed to parse state\n"); + goto err_out; + } + } + + sampler->states = states; + + return D3D_OK; + +err_out: + + for (i = 0; i < sampler->state_count; ++i) + { + free_state(&states[i]); + } + + HeapFree(GetProcessHeap(), 0, states); + + return hr; +} + +static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, const char *data, const char **ptr, D3DXHANDLE *objects) { unsigned int i; HRESULT hr; @@ -3644,7 +3711,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons { struct d3dx_parameter *member = get_parameter_struct(param->member_handles[i]); - hr = d3dx9_parse_value(member, value ? (char *)value + old_size : NULL, ptr, objects); + hr = d3dx9_parse_value(member, value ? (char *)value + old_size : NULL, data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -3673,7 +3740,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons { struct d3dx_parameter *member = get_parameter_struct(param->member_handles[i]); - hr = d3dx9_parse_value(member, (char *)value + old_size, ptr, objects); + hr = d3dx9_parse_value(member, (char *)value + old_size, data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -3707,16 +3774,24 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons case D3DXPT_SAMPLER3D: case D3DXPT_SAMPLERCUBE: { - UINT state_count; + struct d3dx_sampler *sampler; - read_dword(ptr, &state_count); - TRACE("Count: %u\n", state_count); + sampler = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*sampler)); + if (!sampler) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } - for (i = 0; i < state_count; ++i) + hr = d3dx9_parse_sampler(sampler, data, ptr, objects); + if (hr != D3D_OK) { - /* Todo: parse states */ - skip_dword_unknown(ptr, 4); + HeapFree(GetProcessHeap(), 0, sampler); + WARN("Failed to parse sampler\n"); + return hr; } + + param->data = sampler; break; } @@ -3734,7 +3809,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons return D3D_OK; } -static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char *ptr, D3DXHANDLE *objects) +static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char *data, const char *ptr, D3DXHANDLE *objects) { UINT size = param->bytes; HRESULT hr; @@ -3755,7 +3830,7 @@ static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char * memcpy(value, ptr, size); } - hr = d3dx9_parse_value(param, value, &ptr, objects); + hr = d3dx9_parse_value(param, value, data, &ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -3763,8 +3838,6 @@ static HRESULT d3dx9_parse_init_value(struct d3dx_parameter *param, const char * return hr; } - param->data = value; - return D3D_OK; } @@ -4104,7 +4177,7 @@ static HRESULT d3dx9_parse_effect_annotation(struct d3dx_parameter *anno, const read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx9_parse_init_value(anno, data + offset, objects); + hr = d3dx9_parse_init_value(anno, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -4146,7 +4219,7 @@ static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, con read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx9_parse_init_value(parameter, data + offset, objects); + hr = d3dx9_parse_init_value(parameter, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -4192,7 +4265,7 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx_parameter *param, const return hr; } - hr = d3dx9_parse_init_value(param, data + offset, objects); + hr = d3dx9_parse_init_value(param, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n");

1 0

Aric Stewart : usp10: Execute half after pstf.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: b913e44d897f00e59ecfd62061c8fed2e0509410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b913e44d897f00e59ecfd6206… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 8 10:12:06 2011 -0500 usp10: Execute half after pstf. --- dlls/usp10/shape.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 47700dc..bc22b4a 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -466,8 +466,8 @@ static OPENTYPE_FEATURE_RECORD bengali_features[] = { MS_MAKE_TAG('a','k','h','n'), 1}, { MS_MAKE_TAG('r','p','h','f'), 1}, { MS_MAKE_TAG('b','l','w','f'), 1}, - { MS_MAKE_TAG('h','a','l','f'), 1}, { MS_MAKE_TAG('p','s','t','f'), 1}, + { MS_MAKE_TAG('h','a','l','f'), 1}, { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ @@ -508,8 +508,8 @@ static OPENTYPE_FEATURE_RECORD gurmukhi_features[] = { MS_MAKE_TAG('a','k','h','n'), 1}, { MS_MAKE_TAG('r','p','h','f'), 1}, { MS_MAKE_TAG('b','l','w','f'), 1}, - { MS_MAKE_TAG('h','a','l','f'), 1}, { MS_MAKE_TAG('p','s','t','f'), 1}, + { MS_MAKE_TAG('h','a','l','f'), 1}, { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ @@ -621,8 +621,8 @@ static OPENTYPE_FEATURE_RECORD telugu_features[] = { MS_MAKE_TAG('r','p','h','f'), 1}, { MS_MAKE_TAG('p','r','e','f'), 1}, { MS_MAKE_TAG('b','l','w','f'), 1}, - { MS_MAKE_TAG('h','a','l','f'), 1}, { MS_MAKE_TAG('p','s','t','f'), 1}, + { MS_MAKE_TAG('h','a','l','f'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1},

1 0

Aric Stewart : usp10: Bengali initial form is only applied to the beginning of words.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 4fbb13a2c85effcb7b0aed1d95eb54456995c6f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbb13a2c85effcb7b0aed1d9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 8 10:12:27 2011 -0500 usp10: Bengali initial form is only applied to the beginning of words. --- dlls/usp10/shape.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index bc22b4a..5d0c3d4 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -471,7 +471,6 @@ static OPENTYPE_FEATURE_RECORD bengali_features[] = { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ - { MS_MAKE_TAG('i','n','i','t'), 1}, { MS_MAKE_TAG('p','r','e','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, { MS_MAKE_TAG('b','l','w','s'), 1}, @@ -2204,6 +2203,19 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * GetGlyphIndicesW(hdc, input, cCount, pwOutGlyphs, 0); *pcGlyphs = cCount; + /* Step 3: Initial form is only applied to the beginning of words */ + for (cCount = cCount - 1 ; cCount >= 0; cCount --) + { + if (cCount == 0 || input[cCount] == 0x0020) /* space */ + { + int index = cCount; + int gCount = 1; + if (index > 0) index++; + + apply_GSUB_feature_to_glyph(hdc, psa, psc, &pwOutGlyphs[index], 0, 1, &gCount, "init"); + } + } + HeapFree(GetProcessHeap(),0,input); }

1 0

André Hentschel : include: Add ATA ioctls.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: b70aeabcc80f3e5132ecda8f0fedb3d59e789826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b70aeabcc80f3e5132ecda8f0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 7 22:31:48 2011 +0200 include: Add ATA ioctls. --- include/ntddscsi.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ntddscsi.h b/include/ntddscsi.h index 3e4d525..390b653 100644 --- a/include/ntddscsi.h +++ b/include/ntddscsi.h @@ -38,6 +38,8 @@ extern "C" { #define IOCTL_SCSI_GET_DUMP_POINTERS CTL_CODE(IOCTL_SCSI_BASE, 0x0408, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_SCSI_FREE_DUMP_POINTERS CTL_CODE(IOCTL_SCSI_BASE, 0x0409, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_IDE_PASS_THROUGH CTL_CODE(IOCTL_SCSI_BASE, 0x040a, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_ATA_PASS_THROUGH CTL_CODE(IOCTL_SCSI_BASE, 0x040b, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_ATA_PASS_THROUGH_DIRECT CTL_CODE(IOCTL_SCSI_BASE, 0x040c, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define SCSI_IOCTL_DATA_OUT 0 #define SCSI_IOCTL_DATA_IN 1

1 0

Aric Stewart : usp10: Refine Ralf reordering location for Devanagari and Gujarati.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 3cc612968130ab8b2a6a8336c4fd5f61fe1a8cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc612968130ab8b2a6a8336c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 8 07:27:13 2011 -0500 usp10: Refine Ralf reordering location for Devanagari and Gujarati. --- dlls/usp10/shape.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 1d25414..47700dc 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1858,17 +1858,16 @@ static void Reorder_Ra_follows_base(LPWSTR pwChar, INT start, INT main, INT end, } } -static void Reorder_Ra_follows_matra_post(LPWSTR pwChar, INT start, INT main, INT end, lexical_function lexical) +static void Reorder_Ra_follows_matra(LPWSTR pwChar, INT start, INT main, INT end, lexical_function lexical) { if (start != main && end > start+1 && lexical(pwChar[start]) == lex_Ra && lexical(pwChar[start+1]) == lex_Halant) { int j,loc; WORD Ra = pwChar[start]; WORD H = pwChar[start+1]; - for (loc = main; loc > end; loc++) - if (lexical(pwChar[loc]) == lex_Matra_post) + for (loc = end; loc > main; loc--) + if (lexical(pwChar[loc]) == lex_Matra_post || lexical(pwChar[loc]) == lex_Matra_below) break; - if (loc == end) loc = main; TRACE("Doing reorder of Ra to %i\n",loc); for (j = start; j < loc-1; j++) @@ -1958,7 +1957,7 @@ static void Reorder_Like_Devanagari(LPWSTR pwChar, INT start, INT main, INT end, main = Indic_FindBaseConsonant(pwChar, start, main, end, lexical); if (lexical(pwChar[main]) == lex_Vowel) return; - Reorder_Ra_follows_matra_post(pwChar, start, main, end, lexical); + Reorder_Ra_follows_matra(pwChar, start, main, end, lexical); Reorder_Matra_precede_syllable(pwChar, start, main, end, lexical); } @@ -1994,7 +1993,7 @@ static void Reorder_Like_Malayalam(LPWSTR pwChar, INT start, INT main, INT end, main = Indic_FindBaseConsonant(pwChar, start, main, end, lexical); if (lexical(pwChar[main]) == lex_Vowel) return; - Reorder_Ra_follows_matra_post(pwChar, start, main, end, lexical); + Reorder_Ra_follows_matra(pwChar, start, main, end, lexical); Reorder_Matra_precede_base(pwChar, start, main, end, lexical); }

1 0

Dylan Smith : d3dx9: Support optional parameters for D3DXLoadMeshFromXInMemory.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: fe8615f88998f9c8d13b3db13b7a37ad404355a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8615f88998f9c8d13b3db13… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 7 19:43:07 2011 -0400 d3dx9: Support optional parameters for D3DXLoadMeshFromXInMemory. --- dlls/d3dx9_36/mesh.c | 132 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 119 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe8615f88998f9c8d13b3…

1 0

Dylan Smith : d3dx9: Implement D3DXLoadMeshFromXInMemory.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 85307b6b4917cedca8220766ec3e012a0de31c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=85307b6b4917cedca8220766e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 7 19:42:56 2011 -0400 d3dx9: Implement D3DXLoadMeshFromXInMemory. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 301 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 302 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85307b6b4917cedca8220…

1 0

André Hentschel : mscoree/tests: Mark a weird w2k3 result as broken.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 53218eb50baab23d1bb80e2bb94c7f3a0ec238d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53218eb50baab23d1bb80e2bb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 7 22:31:40 2011 +0200 mscoree/tests: Mark a weird w2k3 result as broken. --- dlls/mscoree/tests/mscoree.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 3731f6f..894e9de 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -287,7 +287,8 @@ static void test_createconfigstream(void) hr = pCreateConfigStream(NULL, &stream); todo_wine ok(hr == E_FAIL || - broken(hr == HRESULT_FROM_WIN32(ERROR_PROC_NOT_FOUND)), /* some WinXP, Win2K3 and Win7 */ + broken(hr == HRESULT_FROM_WIN32(ERROR_PROC_NOT_FOUND)) || /* some WinXP, Win2K3 and Win7 */ + broken(hr == S_OK && !stream), /* some Win2K3 */ "CreateConfigStream returned %x\n", hr); hr = pCreateConfigStream(path, NULL);

1 0

Alexandre Julliard : kernel32: Fix the handling of CAL_ITWODIGITYEARMAX in GetCalendarInfo.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 81183c1e207e81b09bc93ace389e8bb7c369ca79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81183c1e207e81b09bc93ace3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 16:18:26 2011 +0200 kernel32: Fix the handling of CAL_ITWODIGITYEARMAX in GetCalendarInfo. --- dlls/kernel32/tests/time.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 27 ++++++++++++++++++- 2 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index b0d8a46..e8df15b 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -25,6 +25,8 @@ static BOOL (WINAPI *pTzSpecificLocalTimeToSystemTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME); static BOOL (WINAPI *pSystemTimeToTzSpecificLocalTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME); +static int (WINAPI *pGetCalendarInfoA)(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD); +static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD); #define SECSPERMIN 60 #define SECSPERDAY 86400 @@ -637,11 +639,69 @@ static void test_FileTimeToDosDateTime(void) "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); } +static void test_GetCalendarInfo(void) +{ + char bufferA[20]; + WCHAR bufferW[20]; + DWORD val1, val2; + int ret; + + if (!pGetCalendarInfoA || !pGetCalendarInfoW) + { + trace( "GetCalendarInfo missing\n" ); + return; + } + + ret = pGetCalendarInfoA( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX | CAL_RETURN_NUMBER, + NULL, 0, &val1 ); + ok( ret, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ok( ret == sizeof(val1), "wrong size %u\n", ret ); + ok( val1 >= 2000 && val1 < 2100, "wrong value %u\n", val1 ); + + ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX | CAL_RETURN_NUMBER, + NULL, 0, &val2 ); + ok( ret, "GetCalendarInfoW failed err %u\n", GetLastError() ); + ok( ret == sizeof(val2)/sizeof(WCHAR), "wrong size %u\n", ret ); + ok( val1 == val2, "A/W mismatch %u/%u\n", val1, val2 ); + + ret = pGetCalendarInfoA( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, bufferA, sizeof(bufferA), NULL ); + ok( ret, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ok( ret == 5, "wrong size %u\n", ret ); + ok( atoi( bufferA ) == val1, "wrong value %s/%u\n", bufferA, val1 ); + + ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, bufferW, sizeof(bufferW), NULL ); + ok( ret, "GetCalendarInfoW failed err %u\n", GetLastError() ); + ok( ret == 5, "wrong size %u\n", ret ); + memset( bufferA, 0x55, sizeof(bufferA) ); + WideCharToMultiByte( CP_ACP, 0, bufferW, -1, bufferA, sizeof(bufferA), NULL, NULL ); + ok( atoi( bufferA ) == val1, "wrong value %s/%u\n", bufferA, val1 ); + + ret = pGetCalendarInfoA( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX | CAL_RETURN_NUMBER, + NULL, 0, NULL ); + ok( !ret, "GetCalendarInfoA succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + ret = pGetCalendarInfoA( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, NULL, 0, NULL ); + ok( ret, "GetCalendarInfoA failed err %u\n", GetLastError() ); + ok( ret == 5, "wrong size %u\n", ret ); + + ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX | CAL_RETURN_NUMBER, + NULL, 0, NULL ); + ok( !ret, "GetCalendarInfoW succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + ret = pGetCalendarInfoW( 0x0409, CAL_GREGORIAN, CAL_ITWODIGITYEARMAX, NULL, 0, NULL ); + ok( ret, "GetCalendarInfoW failed err %u\n", GetLastError() ); + ok( ret == 5, "wrong size %u\n", ret ); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandle("kernel32"); pTzSpecificLocalTimeToSystemTime = (void *)GetProcAddress(hKernel, "TzSpecificLocalTimeToSystemTime"); pSystemTimeToTzSpecificLocalTime = (void *)GetProcAddress( hKernel, "SystemTimeToTzSpecificLocalTime"); + pGetCalendarInfoA = (void *)GetProcAddress(hKernel, "GetCalendarInfoA"); + pGetCalendarInfoW = (void *)GetProcAddress(hKernel, "GetCalendarInfoW"); test_conversions(); test_invalid_arg(); @@ -650,4 +710,5 @@ START_TEST(time) test_FileTimeToLocalFileTime(); test_TzSpecificLocalTimeToSystemTime(); test_FileTimeToDosDateTime(); + test_GetCalendarInfo(); } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 5dff796..deb0c33 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -618,6 +618,8 @@ int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchData, lpValue); if(ret && lpCalDataW && lpCalData) WideCharToMultiByte(CP_ACP, 0, lpCalDataW, cchData, lpCalData, cchData, NULL, NULL); + else if (CalType & CAL_RETURN_NUMBER) + ret *= sizeof(WCHAR); HeapFree(GetProcessHeap(), 0, lpCalDataW); return ret; @@ -636,6 +638,11 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, FIXME("flag CAL_USE_CP_ACP used, not fully implemented\n"); if (CalType & CAL_RETURN_NUMBER) { + if (!lpValue) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } if (lpCalData != NULL) WARN("lpCalData not NULL (%p) when it should!\n", lpCalData); if (cchData != 0) @@ -747,7 +754,25 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_SYEARMONTH: return GetLocaleInfoW(Locale, LOCALE_SYEARMONTH, lpCalData, cchData); case CAL_ITWODIGITYEARMAX: - if (lpValue) *lpValue = CALINFO_MAX_YEAR; + if (CalType & CAL_RETURN_NUMBER) + { + *lpValue = CALINFO_MAX_YEAR; + return sizeof(DWORD) / sizeof(WCHAR); + } + else + { + static const WCHAR fmtW[] = {'%','u',0}; + WCHAR buffer[10]; + int ret = snprintfW( buffer, 10, fmtW, CALINFO_MAX_YEAR ) + 1; + if (!lpCalData) return ret; + if (ret <= cchData) + { + strcpyW( lpCalData, buffer ); + return ret; + } + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } break; default: FIXME("Unknown caltype %d\n",CalType & 0xffff);

1 0

Dylan Smith : d3dx9: Implement D3DXLoadMeshFromX and D3DXLoadMeshFromXResource.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: c6f5f10434c3f6b9844f83e92597bdb369e728f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f5f10434c3f6b9844f83e92… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jun 7 19:43:18 2011 -0400 d3dx9: Implement D3DXLoadMeshFromX and D3DXLoadMeshFromXResource. --- dlls/d3dx9_36/d3dx9_36.spec | 6 +- dlls/d3dx9_36/mesh.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 4a28e02..ca85b7d 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -168,10 +168,10 @@ @ stub D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stub D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) -@ stub D3DXLoadMeshFromXA(ptr long ptr ptr ptr ptr ptr ptr) +@ stdcall D3DXLoadMeshFromXA(str long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) -@ stub D3DXLoadMeshFromXResource(long ptr ptr long ptr ptr ptr ptr ptr ptr) -@ stub D3DXLoadMeshFromXW(ptr long ptr ptr ptr ptr ptr ptr) +@ stdcall D3DXLoadMeshFromXResource(long str str long ptr ptr ptr ptr ptr ptr) +@ stdcall D3DXLoadMeshFromXW(wstr long ptr ptr ptr ptr ptr ptr) @ stub D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 58df295..cfadb75 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3066,6 +3066,98 @@ HRESULT WINAPI D3DXFrameDestroy(LPD3DXFRAME frame, LPD3DXALLOCATEHIERARCHY alloc return D3D_OK; } +HRESULT WINAPI D3DXLoadMeshFromXA(LPCSTR filename, + DWORD options, + LPDIRECT3DDEVICE9 device, + LPD3DXBUFFER *adjacency, + LPD3DXBUFFER *materials, + LPD3DXBUFFER *effect_instances, + DWORD *num_materials, + LPD3DXMESH *mesh) +{ + HRESULT hr; + int len; + LPWSTR filenameW; + + TRACE("(%s, %x, %p, %p, %p, %p, %p, %p)\n", debugstr_a(filename), options, + device, adjacency, materials, effect_instances, num_materials, mesh); + + if (!filename) + return D3DERR_INVALIDCALL; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + filenameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filenameW) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, len); + + hr = D3DXLoadMeshFromXW(filenameW, options, device, adjacency, materials, + effect_instances, num_materials, mesh); + HeapFree(GetProcessHeap(), 0, filenameW); + + return hr; +} + +HRESULT WINAPI D3DXLoadMeshFromXW(LPCWSTR filename, + DWORD options, + LPDIRECT3DDEVICE9 device, + LPD3DXBUFFER *adjacency, + LPD3DXBUFFER *materials, + LPD3DXBUFFER *effect_instances, + DWORD *num_materials, + LPD3DXMESH *mesh) +{ + HRESULT hr; + DWORD size; + LPVOID buffer; + + TRACE("(%s, %x, %p, %p, %p, %p, %p, %p)\n", debugstr_w(filename), options, + device, adjacency, materials, effect_instances, num_materials, mesh); + + if (!filename) + return D3DERR_INVALIDCALL; + + hr = map_view_of_file(filename, &buffer, &size); + if (FAILED(hr)) + return D3DXERR_INVALIDDATA; + + hr = D3DXLoadMeshFromXInMemory(buffer, size, options, device, adjacency, + materials, effect_instances, num_materials, mesh); + + UnmapViewOfFile(buffer); + + return hr; +} + +HRESULT WINAPI D3DXLoadMeshFromXResource(HMODULE module, + LPCSTR name, + LPCSTR type, + DWORD options, + LPDIRECT3DDEVICE9 device, + LPD3DXBUFFER *adjacency, + LPD3DXBUFFER *materials, + LPD3DXBUFFER *effect_instances, + DWORD *num_materials, + LPD3DXMESH *mesh) +{ + HRESULT hr; + HRSRC resinfo; + DWORD size; + LPVOID buffer; + + TRACE("(%p, %s, %s, %x, %p, %p, %p, %p, %p, %p)\n", + module, debugstr_a(name), debugstr_a(type), options, device, + adjacency, materials, effect_instances, num_materials, mesh); + + resinfo = FindResourceA(module, name, type); + if (!resinfo) return D3DXERR_INVALIDDATA; + + hr = load_resource_into_memory(module, resinfo, &buffer, &size); + if (!FAILED(hr)) return D3DXERR_INVALIDDATA; + + return D3DXLoadMeshFromXInMemory(buffer, size, options, device, adjacency, + materials, effect_instances, num_materials, mesh); +} + struct mesh_container { struct list entry;

1 0