wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Hans Leidekker : fusion: Allow quotes around attribute values in display names.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 003efbee0de4c350df15a18509050a45a432e86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=003efbee0de4c350df15a1850… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 16 10:07:35 2012 +0200 fusion: Allow quotes around attribute values in display names. --- dlls/fusion/asmname.c | 52 ++++++++++++++++++++++++++++++++---------- dlls/fusion/tests/asmname.c | 28 ++++++++++++++++++++++- 2 files changed, 66 insertions(+), 14 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 36d794b..d108a4d 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -580,10 +580,32 @@ static HRESULT parse_pubkey(IAssemblyNameImpl *name, LPCWSTR pubkey) return S_OK; } +static WCHAR *parse_value( const WCHAR *str, unsigned int len ) +{ + WCHAR *ret; + const WCHAR *p = str; + BOOL quoted = FALSE; + unsigned int i = 0; + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return NULL; + if (*p == '\"') + { + quoted = TRUE; + p++; + } + while (*p && *p != '\"') ret[i++] = *p++; + if ((quoted && *p != '\"') || (!quoted && *p == '\"')) + { + HeapFree( GetProcessHeap(), 0, ret ); + return NULL; + } + ret[i] = 0; + return ret; +} + static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyName) { - LPWSTR str, save; - LPWSTR ptr, ptr2; + LPWSTR str, save, ptr, ptr2, value; HRESULT hr = S_OK; BOOL done = FALSE; @@ -651,21 +673,25 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam } *ptr2 = '\0'; - + if (!(value = parse_value( ptr, ptr2 - ptr ))) + { + hr = FUSION_E_INVALID_NAME; + goto done; + } while (*str == ' ') str++; - if (!lstrcmpW(str, version)) - hr = parse_version(name, ptr); - else if (!lstrcmpW(str, culture)) - hr = parse_culture(name, ptr); - else if (!lstrcmpW(str, pubkey)) - hr = parse_pubkey(name, ptr); - else if (!lstrcmpW(str, procarch)) + if (!lstrcmpiW(str, version)) + hr = parse_version( name, value ); + else if (!lstrcmpiW(str, culture)) + hr = parse_culture( name, value ); + else if (!lstrcmpiW(str, pubkey)) + hr = parse_pubkey( name, value ); + else if (!lstrcmpiW(str, procarch)) { - name->procarch = strdupW(ptr); - if (!name->procarch) - hr = E_OUTOFMEMORY; + name->procarch = value; + value = NULL; } + HeapFree( GetProcessHeap(), 0, value ); if (FAILED(hr)) goto done; diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index d180b9e..ac5b27b 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -891,6 +891,32 @@ static void test_CreateAssemblyNameObject(void) ok(hr == FUSION_E_INVALID_NAME, "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(name == (IAssemblyName *)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", name); + + /* no spaces */ + to_widechar(namestr, "wine,version=1.0.0.0"); + name = (IAssemblyName *)0xdeadbeef; + hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(name != NULL, "Expected non-NULL name\n"); + hi = lo = 0xdeadbeef; + hr = IAssemblyName_GetVersion(name, &hi, &lo); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hi == 65536, "Expected 536, got %u\n", hi); + ok(lo == 0, "Expected 0, got %u\n", lo); + IAssemblyName_Release(name); + + /* quoted values */ + to_widechar(namestr, "wine, version=\"1.0.0.0\",culture=\"en\""); + name = (IAssemblyName *)0xdeadbeef; + hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(name != NULL, "Expected non-NULL name\n"); + hi = lo = 0xdeadbeef; + hr = IAssemblyName_GetVersion(name, &hi, &lo); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hi == 65536, "Expected 65536, got %u\n", hi); + ok(lo == 0, "Expected 0, got %u\n", lo); + IAssemblyName_Release(name); } static void test_IAssemblyName_IsEqual(void) @@ -951,7 +977,7 @@ static void test_IAssemblyName_IsEqual(void) ok( hr == S_OK, "got %08x\n", hr ); hr = IAssemblyName_IsEqual( name1, name2, ASM_CMPF_IL_ALL ); - todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); + ok( hr == S_FALSE, "got %08x\n", hr ); IAssemblyName_Release( name1 ); hr = pCreateAssemblyNameObject( &name1, wine1, CANOF_PARSE_DISPLAY_NAME, NULL );

1 0

Hans Leidekker : fusion: Allow zero spaces between attributes in display names.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: aa2ad840b9390397e1cb1a2baaad41d0b4b7e74c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2ad840b9390397e1cb1a2ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 16 10:07:12 2012 +0200 fusion: Allow zero spaces between attributes in display names. --- dlls/fusion/asmname.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index be5ccae..36d794b 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -622,7 +622,7 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam if (!ptr) goto done; - str = ptr + 2; + str = ptr + 1; while (!done) { ptr = strchrW(str, '='); @@ -639,7 +639,7 @@ static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyNam goto done; } - if (!(ptr2 = strstrW(ptr, separator))) + if (!(ptr2 = strchrW(ptr, ','))) { if (!(ptr2 = strchrW(ptr, '\0'))) {

1 0

Hans Leidekker : fusion: Implement IAssemblyName::IsEqual.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 509966796d6bcb7903d43602d4ad2f3085adbec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509966796d6bcb7903d43602d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 16 10:06:54 2012 +0200 fusion: Implement IAssemblyName::IsEqual. --- dlls/fusion/asmname.c | 33 +++++++++++++++++-- dlls/fusion/tests/asmname.c | 76 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index 4957ae8..be5ccae 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -407,10 +407,37 @@ static HRESULT WINAPI IAssemblyNameImpl_GetVersion(IAssemblyName *iface, static HRESULT WINAPI IAssemblyNameImpl_IsEqual(IAssemblyName *iface, IAssemblyName *pName, - DWORD dwCmpFlags) + DWORD flags) { - FIXME("(%p, %p, %d) stub!\n", iface, pName, dwCmpFlags); - return E_NOTIMPL; + IAssemblyNameImpl *name1 = impl_from_IAssemblyName(iface); + IAssemblyNameImpl *name2 = impl_from_IAssemblyName(pName); + + TRACE("(%p, %p, 0x%08x)\n", iface, pName, flags); + + if (!pName) return S_FALSE; + if (flags & ~ASM_CMPF_IL_ALL) FIXME("unsupported flags\n"); + + if ((flags & ASM_CMPF_NAME) && strcmpW(name1->name, name2->name)) return S_FALSE; + if (name1->versize && name2->versize) + { + if ((flags & ASM_CMPF_MAJOR_VERSION) && + name1->version[0] != name2->version[0]) return S_FALSE; + if ((flags & ASM_CMPF_MINOR_VERSION) && + name1->version[1] != name2->version[1]) return S_FALSE; + if ((flags & ASM_CMPF_BUILD_NUMBER) && + name1->version[2] != name2->version[2]) return S_FALSE; + if ((flags & ASM_CMPF_REVISION_NUMBER) && + name1->version[3] != name2->version[3]) return S_FALSE; + } + if ((flags & ASM_CMPF_PUBLIC_KEY_TOKEN) && + name1->haspubkey && name2->haspubkey && + memcmp(name1->pubkey, name2->pubkey, sizeof(name1->pubkey))) return S_FALSE; + + if ((flags & ASM_CMPF_CULTURE) && + name1->culture && name2->culture && + strcmpW(name1->culture, name2->culture)) return S_FALSE; + + return S_OK; } static HRESULT WINAPI IAssemblyNameImpl_Clone(IAssemblyName *iface, diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index a99b288..d180b9e 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -893,6 +893,81 @@ static void test_CreateAssemblyNameObject(void) ok(name == (IAssemblyName *)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", name); } +static void test_IAssemblyName_IsEqual(void) +{ + static const WCHAR wine1[] = + {'w','i','n','e',0}; + static const WCHAR wine2[] = + {'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','0','.','0','.','0',0}; + static const WCHAR wine3[] = + {'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','0','.','0','.','0',',', + 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; + static const WCHAR wine4[] = + {'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','0','.','0','.','0',',', + 'c','u','l','t','u','r','e','=','e','n',0}; + static const WCHAR wine5[] = + {'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','0','.','0','.','0',',', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','1','2','3','4','5','6', + '7','8','9','0','a','b','c','d','e','f',0}; + HRESULT hr; + IAssemblyName *name1, *name2; + + hr = pCreateAssemblyNameObject( &name1, wine1, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = pCreateAssemblyNameObject( &name2, wine1, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + if (0) { /* crashes on some old version */ + hr = IAssemblyName_IsEqual( name1, NULL, 0 ); + ok( hr == S_FALSE, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, NULL, ASM_CMPF_IL_ALL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + } + + hr = IAssemblyName_IsEqual( name1, name1, ASM_CMPF_IL_ALL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, name2, ASM_CMPF_IL_ALL ); + ok( hr == S_OK, "got %08x\n", hr ); + + IAssemblyName_Release( name2 ); + hr = pCreateAssemblyNameObject( &name2, wine2, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, name2, ASM_CMPF_IL_ALL ); + ok( hr == S_OK, "got %08x\n", hr ); + + IAssemblyName_Release( name2 ); + hr = pCreateAssemblyNameObject( &name2, wine3, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, name2, ASM_CMPF_IL_ALL ); + ok( hr == S_OK, "got %08x\n", hr ); + + IAssemblyName_Release( name1 ); + hr = pCreateAssemblyNameObject( &name1, wine4, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, name2, ASM_CMPF_IL_ALL ); + todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); + + IAssemblyName_Release( name1 ); + hr = pCreateAssemblyNameObject( &name1, wine1, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + IAssemblyName_Release( name2 ); + hr = pCreateAssemblyNameObject( &name2, wine5, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, name2, ASM_CMPF_IL_ALL ); + ok( hr == S_OK, "got %08x\n", hr ); + + IAssemblyName_Release( name1 ); + IAssemblyName_Release( name2 ); +} + START_TEST(asmname) { if (!init_functionpointers()) @@ -902,4 +977,5 @@ START_TEST(asmname) } test_CreateAssemblyNameObject(); + test_IAssemblyName_IsEqual(); }

1 0

André Hentschel : winedbg: Add partial Thumb2 disassembler.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 97d86f77ec3d7722e5357c4b03f88716a25fcf9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d86f77ec3d7722e5357c4b0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 16 00:21:32 2012 +0200 winedbg: Add partial Thumb2 disassembler. --- programs/winedbg/be_arm.c | 145 +++++++++++++++++++++++++++++++++------------ 1 files changed, 107 insertions(+), 38 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 8ceb14c..c66c2b0 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -38,6 +38,7 @@ static BOOL db_display = FALSE; #define ARM_INSN_SIZE 4 #define THUMB_INSN_SIZE 2 +#define THUMB2_INSN_SIZE 4 #define ROR32(n, r) (((n) >> (r)) | ((n) << (32 - (r)))) @@ -421,21 +422,6 @@ static WORD thumb_disasm_blocktrans(WORD inst, ADDRESS64 *addr) return 0; } -static WORD thumb_disasm_longbl(WORD inst, ADDRESS64 *addr) -{ - WORD inst2; - UINT offset = (inst & 0x07ff) << 12; - - addr->Offset += 2; - inst2 = db_get_inst( memory_to_linear_addr(addr), 2 ); - if (!((inst2 & 0xf800) == 0xf800)) return inst; - - offset += (inst2 & 0x07ff) << 1; - dbg_printf("\n\tbl\t"); - db_printsym(addr->Offset + offset); - return 0; -} - static WORD thumb_disasm_condbranch(WORD inst, ADDRESS64 *addr) { WORD offset = inst & 0x00ff; @@ -561,6 +547,53 @@ static WORD thumb_disasm_movshift(WORD inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_branchlinked(UINT inst, ADDRESS64 *addr) +{ + UINT offset = (((inst & 0x07ff0000) >> 4) | ((inst & 0x000007ff) << 1)) + 4; + + dbg_printf("\n\tbl\t"); + db_printsym(addr->Offset + offset); + return 0; +} + +static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) +{ + WORD op1 = (inst >> 20) & 0x03; + WORD op2 = (inst >> 4) & 0x03; + + if (get_nibble(inst, 4) != get_nibble(inst, 0)) + return inst; + + if (op1 == 3 && op2 == 0) + { + dbg_printf("\n\tclz\t%s, %s\t", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + return 0; + } + + if (op1 == 1) + { + switch (op2) + { + case 0: + dbg_printf("\n\trev\t"); + break; + case 1: + dbg_printf("\n\trev16\t"); + break; + case 2: + dbg_printf("\n\trbit\t"); + break; + case 3: + dbg_printf("\n\trevsh\t"); + break; + } + dbg_printf("%s, %s\t", tbl_regs[get_nibble(inst, 2)], tbl_regs[get_nibble(inst, 0)]); + return 0; + } + + return inst; +} + struct inst_arm { UINT mask; @@ -594,7 +627,6 @@ static const struct inst_thumb16 tbl_thumb16[] = { { 0xfc00, 0x4000, thumb_disasm_aluop }, { 0xf600, 0xb400, thumb_disasm_pushpop }, { 0xf000, 0xc000, thumb_disasm_blocktrans }, - { 0xf800, 0xf000, thumb_disasm_longbl }, { 0xf000, 0xd000, thumb_disasm_condbranch }, { 0xf800, 0xe000, thumb_disasm_uncondbranch }, { 0xf000, 0xa000, thumb_disasm_loadadr }, @@ -613,6 +645,12 @@ static const struct inst_thumb16 tbl_thumb16[] = { { 0x0000, 0x0000, NULL } }; +static const struct inst_arm tbl_thumb32[] = { + { 0xf800f800, 0xf000f800, thumb2_disasm_branchlinked }, + { 0xffc0f0c0, 0xfa80f080, thumb2_disasm_misc }, + { 0x00000000, 0x00000000, NULL } +}; + /*********************************************************************** * disasm_one_insn * @@ -623,6 +661,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) { struct inst_arm *a_ptr = (struct inst_arm *)&tbl_arm; struct inst_thumb16 *t_ptr = (struct inst_thumb16 *)&tbl_thumb16; + struct inst_arm *t2_ptr = (struct inst_arm *)&tbl_thumb32; UINT inst; WORD tinst; int size; @@ -636,49 +675,79 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) else db_disasm_thumb=(*pval & 0x20)?TRUE:FALSE; - if (db_disasm_thumb) size = THUMB_INSN_SIZE; - else size = ARM_INSN_SIZE; - db_display = display; - inst = db_get_inst( memory_to_linear_addr(addr), size ); if (!db_disasm_thumb) { + size = ARM_INSN_SIZE; + inst = db_get_inst( memory_to_linear_addr(addr), size ); while (a_ptr->func) { - if ((inst & a_ptr->mask) == a_ptr->pattern) { - matched = 1; - break; - } - a_ptr++; + if ((inst & a_ptr->mask) == a_ptr->pattern) { + matched = 1; + break; + } + a_ptr++; } if (!matched) { - dbg_printf("\n\tUnknown Instruction: %08x", inst); - addr->Offset += size; - return; + dbg_printf("\n\tUnknown ARM Instruction: %08x", inst); + addr->Offset += size; } else { if (!a_ptr->func(inst, addr)) addr->Offset += size; - return; } + return; } else { - tinst = inst; - while (t_ptr->func) { - if ((tinst & t_ptr->mask) == t_ptr->pattern) { - matched = 1; - break; + WORD *taddr = memory_to_linear_addr(addr); + tinst = db_get_inst( taddr, THUMB_INSN_SIZE ); + switch (tinst & 0xf800) + { + case 0xe800: + case 0xf000: + case 0xf800: + size = THUMB2_INSN_SIZE; + taddr++; + inst = db_get_inst( taddr, THUMB_INSN_SIZE ); + inst |= (tinst << 16); + + while (t2_ptr->func) { + if ((inst & t2_ptr->mask) == t2_ptr->pattern) { + matched = 1; + break; + } + t2_ptr++; + } + + if (!matched) { + dbg_printf("\n\tUnknown Thumb2 Instruction: %08x", inst); + addr->Offset += size; + } + else + { + if (!t2_ptr->func(inst, addr)) + addr->Offset += size; } - t_ptr++; + return; + default: + break; + } + + size = THUMB_INSN_SIZE; + while (t_ptr->func) { + if ((tinst & t_ptr->mask) == t_ptr->pattern) { + matched = 1; + break; + } + t_ptr++; } if (!matched) { - dbg_printf("\n\tUnknown Instruction: %04x", tinst); - addr->Offset += size; - return; + dbg_printf("\n\tUnknown Thumb Instruction: %04x", tinst); + addr->Offset += size; } else {

1 0

Andrew Eikum : dsound: Don't use IAudioClock:: GetPosition to determine buffer fullness.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 1cc9ecb558e09a94e1b92331ca132634e8dac8f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc9ecb558e09a94e1b92331c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 15 14:41:24 2012 -0500 dsound: Don't use IAudioClock::GetPosition to determine buffer fullness. --- dlls/dsound/dsound_private.h | 1 - dlls/dsound/mixer.c | 29 ++++++++++++++--------------- dlls/dsound/primary.c | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 1d43c5a..45c8c5d 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -83,7 +83,6 @@ struct DirectSoundDevice DWORD priolevel; PWAVEFORMATEX pwfx; UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf, helfrags; - UINT64 last_pos_bytes; DWORD fraglen; LPBYTE buffer; DWORD writelead, buflen, state, playpos, mixpos; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 06e5773..fed9165 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -667,8 +667,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) */ static void DSOUND_PerformMix(DirectSoundDevice *device) { - UINT64 clock_pos, clock_freq, pos_bytes; - UINT delta_frags; + UINT32 pad, to_mix_frags, to_mix_bytes; HRESULT hr; TRACE("(%p)\n", device); @@ -676,28 +675,28 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* **** */ EnterCriticalSection(&device->mixlock); - hr = IAudioClock_GetFrequency(device->clock, &clock_freq); + hr = IAudioClient_GetCurrentPadding(device->client, &pad); if(FAILED(hr)){ - WARN("GetFrequency failed: %08x\n", hr); - LeaveCriticalSection(&device->mixlock); + WARN("GetCurrentPadding failed: %08x\n", hr); + LeaveCriticalSection(&device->mixlock); return; } - hr = IAudioClock_GetPosition(device->clock, &clock_pos, NULL); - if(FAILED(hr)){ - WARN("GetCurrentPadding failed: %08x\n", hr); - LeaveCriticalSection(&device->mixlock); + to_mix_frags = device->prebuf - (pad * device->pwfx->nBlockAlign + device->fraglen - 1) / device->fraglen; + + if(to_mix_frags == 0){ + /* nothing to do! */ + LeaveCriticalSection(&device->mixlock); return; } - pos_bytes = (clock_pos * device->pwfx->nSamplesPerSec * device->pwfx->nBlockAlign) / clock_freq; + to_mix_bytes = to_mix_frags * device->fraglen; - delta_frags = (pos_bytes - device->last_pos_bytes) / device->fraglen; - if(delta_frags > 0){ - device->playing_offs_bytes += delta_frags * device->fraglen; + if(device->in_mmdev_bytes > 0){ + DWORD delta_bytes = min(to_mix_bytes, device->in_mmdev_bytes); + device->in_mmdev_bytes -= delta_bytes; + device->playing_offs_bytes += delta_bytes; device->playing_offs_bytes %= device->buflen; - device->in_mmdev_bytes -= delta_frags * device->fraglen; - device->last_pos_bytes = pos_bytes - (pos_bytes % device->fraglen); } if (device->priolevel != DSSCL_WRITEPRIMARY) { diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index b3b77f9..8da12e2 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -196,7 +196,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); FillMemory(device->mix_buffer, device->mix_buffer_len, 0); - device->last_pos_bytes = device->playing_offs_bytes = device->in_mmdev_bytes = device->playpos = device->mixpos = 0; + device->playing_offs_bytes = device->in_mmdev_bytes = device->playpos = device->mixpos = 0; return DS_OK; }

1 0

Matteo Bruni : d3dcompiler: Add a stub lexer.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: d2ddd20054fed95439770121fc872fd80e61da42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ddd20054fed95439770121f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 15 16:12:57 2012 +0200 d3dcompiler: Add a stub lexer. --- .gitignore | 1 + dlls/d3dcompiler_43/Makefile.in | 5 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 15 +++ dlls/d3dcompiler_43/hlsl.l | 146 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/hlsl.y | 11 +- 5 files changed, 171 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7f4bb73..defdcdf 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ dlls/d3dcompiler_43/asmshader.tab.h dlls/d3dcompiler_43/asmshader.yy.c dlls/d3dcompiler_43/hlsl.tab.c dlls/d3dcompiler_43/hlsl.tab.h +dlls/d3dcompiler_43/hlsl.yy.c dlls/dispex/disp_ex.h dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index 15a9dc4..a13fb74 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -12,7 +12,10 @@ C_SRCS = \ reflection.c \ utils.c -LEX_SRCS = asmshader.l +LEX_SRCS = \ + asmshader.l \ + hlsl.l + BISON_SRCS = \ asmshader.y \ hlsl.y diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 2936077..72c2511 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -154,6 +154,21 @@ static inline BOOL d3dcompiler_free(void *ptr) return HeapFree(GetProcessHeap(), 0, ptr); } +static inline char *d3dcompiler_strdup(const char *string) +{ + char *copy; + SIZE_T len; + + if (!string) + return NULL; + + len = strlen(string); + copy = d3dcompiler_alloc(len + 1); + if (copy) + memcpy(copy, string, len + 1); + return copy; +} + struct asm_parser; /* This structure is only used in asmshader.y, but since the .l file accesses the semantic types diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l new file mode 100644 index 0000000..439f384 --- /dev/null +++ b/dlls/d3dcompiler_43/hlsl.l @@ -0,0 +1,146 @@ +/* + * HLSL parser + * + * Copyright 2008 Stefan Dösinger + * Copyright 2012 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +%{ +#include "config.h" +#include "wine/port.h" +#include "wine/debug.h" + +#define YY_NO_UNISTD_H +#include "d3dcompiler_private.h" +#include "hlsl.tab.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); +%} + +%option noyywrap nounput noinput +%option prefix="hlsl_" + +%x pp pp_line pp_pragma pp_ignore + +RESERVED1 auto|case|catch|char|class|const_cast|default|delete|dynamic_cast|enum +RESERVED2 explicit|friend|goto|long|mutable|new|operator|private|protected|public +RESERVED3 reinterpret_cast|short|signed|sizeof|static_cast|template|this|throw|try +RESERVED4 typename|union|unsigned|using|virtual + +WS [ \t] +NEWLINE (\n)|(\r\n) +STRING \"[^\"]*\" + +ANY (.) + +%% +{RESERVED1} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED2} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED3} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } +{RESERVED4} { + hlsl_message("Line %u: Reserved keyword \"%s\" used.\n", hlsl_ctx.line_no, yytext); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + } + +{WS}+ {} +{NEWLINE} { + hlsl_ctx.line_no++; + } + +^# { + BEGIN pp; + } + +<pp>pragma{WS}+ { + TRACE("Got a #pragma.\n"); + BEGIN pp_pragma; + } +<pp_pragma>pack_matrix{WS}*${WS}*row_major{WS}*$ { + TRACE("#pragma setting row_major mode.\n"); + hlsl_ctx.matrix_majority = HLSL_ROW_MAJOR; + BEGIN pp_ignore; + } +<pp_pragma>pack_matrix{WS}*${WS}*column_major{WS}*$ { + TRACE("#pragma setting column_major mode.\n"); + hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; + BEGIN pp_ignore; + } +<pp_pragma>{NEWLINE} { + FIXME("Unsupported preprocessor #pragma directive at line %u.\n", hlsl_ctx.line_no); + BEGIN INITIAL; + } +<pp_pragma>{ANY} {} +<pp>[0-9]+ { + TRACE("Preprocessor line info.\n"); + BEGIN pp_line; + hlsl_lval.intval = (atoi(yytext)); + return PRE_LINE; + } +<pp_line>{STRING} { + char *string = d3dcompiler_strdup(yytext + 1); + + BEGIN pp_ignore; + string[strlen(string) - 1] = 0; + hlsl_lval.name = string; + return STRING; + } +<pp_line>{WS}+ {} +<pp_line>{NEWLINE} { + FIXME("Malformed preprocessor line directive?\n"); + BEGIN INITIAL; + } +<pp_ignore>{NEWLINE} { + BEGIN INITIAL; + } +<pp_ignore>{ANY} {} +<pp>{NEWLINE} { + FIXME("Unexpected preprocessor directive.\n"); + BEGIN INITIAL; + } +<pp>{ANY} {} + +{ANY} { + return yytext[0]; + } + +%% + +struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD version, const char *entrypoint, char **messages); + +struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, + const char *entrypoint, char **messages) +{ + struct bwriter_shader *ret = NULL; + YY_BUFFER_STATE buffer; + + buffer = hlsl__scan_string(text); + hlsl__switch_to_buffer(buffer); + + ret = parse_hlsl(type, version, entrypoint, messages); + + hlsl__delete_buffer(buffer); + return ret; +} diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 2010f5f..5691848 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -28,11 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); -int hlsl_lex(void) -{ - FIXME("Lexer.\n"); - return 0; -} +int hlsl_lex(void); struct hlsl_parse_ctx hlsl_ctx; @@ -83,12 +79,15 @@ preproc_directive: PRE_LINE STRING %% -struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, const char *entrypoint, char **messages) +struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD version, const char *entrypoint, char **messages) { hlsl_ctx.line_no = 1; + hlsl_ctx.source_file = d3dcompiler_strdup(""); hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; hlsl_parse(); + d3dcompiler_free(hlsl_ctx.source_file); + return NULL; }

1 0

Matteo Bruni : d3dcompiler: Add a stub parser.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 949de2e520d25dd8c4fca5cad78346faed981199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949de2e520d25dd8c4fca5cad… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 15 16:12:56 2012 +0200 d3dcompiler: Add a stub parser. --- .gitignore | 2 + dlls/d3dcompiler_43/Makefile.in | 4 +- dlls/d3dcompiler_43/compiler.c | 7 -- dlls/d3dcompiler_43/d3dcompiler_private.h | 29 +++++++++ dlls/d3dcompiler_43/hlsl.y | 94 +++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 3b22ee6..7f4bb73 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,8 @@ dlls/advapi32/svcctl_c.c dlls/d3dcompiler_43/asmshader.tab.c dlls/d3dcompiler_43/asmshader.tab.h dlls/d3dcompiler_43/asmshader.yy.c +dlls/d3dcompiler_43/hlsl.tab.c +dlls/d3dcompiler_43/hlsl.tab.h dlls/dispex/disp_ex.h dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index f69eb77..15a9dc4 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -13,7 +13,9 @@ C_SRCS = \ utils.c LEX_SRCS = asmshader.l -BISON_SRCS = asmshader.y +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 8ed7be1..043d231 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -490,13 +490,6 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena return hr; } -static struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, - const char *entrypoint, char **messages) -{ - FIXME("\n"); - return NULL; -} - static HRESULT compile_shader(const char *preproc_shader, const char *target, const char *entrypoint, ID3DBlob **shader_blob, ID3DBlob **error_messages) { diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index e64f4cf..2936077 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -573,6 +573,35 @@ struct bwriter_shader *SlAssembleShader(const char *text, char **messages) DECLS HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result, DWORD *size) DECLSPEC_HIDDEN; void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; +enum hlsl_matrix_majority +{ + HLSL_COLUMN_MAJOR, + HLSL_ROW_MAJOR +}; + +struct hlsl_parse_ctx +{ + char *source_file; + unsigned int line_no; + enum parse_status status; + struct compilation_messages messages; + + struct hlsl_scope *cur_scope; + struct hlsl_scope *globals; + struct list scopes; + + struct list types; + struct list functions; + + enum hlsl_matrix_majority matrix_majority; +}; + +extern struct hlsl_parse_ctx hlsl_ctx DECLSPEC_HIDDEN; + +void hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; +struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, + const char *entrypoint, char **messages) DECLSPEC_HIDDEN; + #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y new file mode 100644 index 0000000..2010f5f --- /dev/null +++ b/dlls/d3dcompiler_43/hlsl.y @@ -0,0 +1,94 @@ +/* + * HLSL parser + * + * Copyright 2008 Stefan Dösinger + * Copyright 2012 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +%{ +#include "config.h" +#include "wine/debug.h" + +#include <stdio.h> + +#include "d3dcompiler_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); + +int hlsl_lex(void) +{ + FIXME("Lexer.\n"); + return 0; +} + +struct hlsl_parse_ctx hlsl_ctx; + +void hlsl_message(const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + compilation_message(&hlsl_ctx.messages, fmt, args); + va_end(args); +} + +static void hlsl_error(const char *s) +{ + hlsl_message("Line %u: %s\n", hlsl_ctx.line_no, s); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); +} + +%} + +%error-verbose + +%union +{ + char *name; + INT intval; +} + +%token <intval> PRE_LINE + +%token <name> STRING +%% + +hlsl_prog: /* empty */ + { + } + | hlsl_prog preproc_directive + { + } + +preproc_directive: PRE_LINE STRING + { + TRACE("Updating line informations to file %s, line %u\n", debugstr_a($2), $1); + hlsl_ctx.line_no = $1 - 1; + d3dcompiler_free(hlsl_ctx.source_file); + hlsl_ctx.source_file = $2; + } + +%% + +struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, const char *entrypoint, char **messages) +{ + hlsl_ctx.line_no = 1; + hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; + + hlsl_parse(); + + return NULL; +}

1 0

Matteo Bruni : d3dcompiler: Trace compilation messages.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 47a7f7f13dbee2918a89b6d6c53a90066e07d49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a7f7f13dbee2918a89b6d6c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 15 16:12:55 2012 +0200 d3dcompiler: Trace compilation messages. --- dlls/d3dcompiler_43/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index f6a0bcc..4cbad5b 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -753,6 +753,7 @@ void compilation_message(struct compilation_messages *msg, const char *fmt, va_l } else { + TRACE("%s", msg->string + msg->size); msg->size += rc; return; }

1 0

Matteo Bruni : d3dcompiler: Partially implement D3DCompile function.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: 14ec785fc3b2c7fb5e7a7cc3ab9738b07354d533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ec785fc3b2c7fb5e7a7cc3a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 15 16:12:54 2012 +0200 d3dcompiler: Partially implement D3DCompile function. --- dlls/d3dcompiler_43/compiler.c | 101 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 97 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index e273d6b..8ed7be1 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -490,21 +490,114 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena return hr; } +static struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, + const char *entrypoint, char **messages) +{ + FIXME("\n"); + return NULL; +} + +static HRESULT compile_shader(const char *preproc_shader, const char *target, const char *entrypoint, + ID3DBlob **shader_blob, ID3DBlob **error_messages) +{ + struct bwriter_shader *shader; + char *messages = NULL; + HRESULT hr; + DWORD *res, size; + ID3DBlob *buffer; + char *pos; + + FIXME("Parse compilation target.\n"); + shader = parse_hlsl_shader(preproc_shader, ST_VERTEX, 2, entrypoint, &messages); + + if (messages) + { + TRACE("Compiler messages:\n"); + TRACE("%s", messages); + + TRACE("Shader source:\n"); + TRACE("%s\n", debugstr_a(preproc_shader)); + + if (error_messages) + { + const char *preproc_messages = *error_messages ? ID3D10Blob_GetBufferPointer(*error_messages) : NULL; + + size = strlen(messages) + (preproc_messages ? strlen(preproc_messages) : 0) + 1; + hr = D3DCreateBlob(size, &buffer); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, messages); + if (shader) SlDeleteShader(shader); + return hr; + } + pos = ID3D10Blob_GetBufferPointer(buffer); + if (preproc_messages) + { + memcpy(pos, preproc_messages, strlen(preproc_messages) + 1); + pos += strlen(preproc_messages); + } + memcpy(pos, messages, strlen(messages) + 1); + + if (*error_messages) ID3D10Blob_Release(*error_messages); + *error_messages = buffer; + } + HeapFree(GetProcessHeap(), 0, messages); + } + + if (!shader) + { + ERR("HLSL shader parsing failed.\n"); + return D3DXERR_INVALIDDATA; + } + + hr = SlWriteBytecode(shader, 9, &res, &size); + SlDeleteShader(shader); + if (FAILED(hr)) + { + ERR("SlWriteBytecode failed with error 0x%08x.\n", hr); + return D3DXERR_INVALIDDATA; + } + + if (shader_blob) + { + hr = D3DCreateBlob(size, &buffer); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, res); + return hr; + } + memcpy(ID3D10Blob_GetBufferPointer(buffer), res, size); + *shader_blob = buffer; + } + + HeapFree(GetProcessHeap(), 0, res); + + return S_OK; +} + HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) { + HRESULT hr; + FIXME("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p stub!\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, shader, error_messages); - TRACE("Shader source:\n%s\n", debugstr_an(data, data_size)); + if (shader) *shader = NULL; + if (error_messages) *error_messages = NULL; + + EnterCriticalSection(&wpp_mutex); - if (error_messages) - D3DCreateBlob(1, error_messages); /* zero fill used as string end */ + hr = preprocess_shader(data, data_size, defines, include, error_messages); + if (SUCCEEDED(hr)) + hr = compile_shader(wpp_output, target, entrypoint, shader, error_messages); - return D3DERR_INVALIDCALL; + HeapFree(GetProcessHeap(), 0, wpp_output); + LeaveCriticalSection(&wpp_mutex); + return hr; } HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename,

1 0

Matteo Bruni : d3dcompiler: Make SlWriteBytecode return the shader size.
by Alexandre Julliard 16 May '12

16 May '12

Module: wine Branch: master Commit: ddab7fcda9af2d880e2b8e77538f3eb6d2f242a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddab7fcda9af2d880e2b8e775… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 15 16:12:53 2012 +0200 d3dcompiler: Make SlWriteBytecode return the shader size. --- dlls/d3dcompiler_43/bytecodewriter.c | 26 ++++---------------------- dlls/d3dcompiler_43/compiler.c | 8 +++----- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 54321ed..5a3e7f2 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -2543,22 +2543,8 @@ static HRESULT call_instr_handler(struct bc_writer *writer, return E_INVALIDARG; } -/* SlWriteBytecode (wineshader.@) - * - * Writes shader version specific bytecode from the shader passed in. - * The returned bytecode can be passed to the Direct3D runtime like - * IDirect3DDevice9::Create*Shader. - * - * Parameters: - * shader: Shader to translate into bytecode - * version: Shader version to generate(d3d version token) - * dxversion: DirectX version the code targets - * result: the resulting shader bytecode - * - * Return values: - * S_OK on success - */ -DWORD SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result) { +HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result, DWORD *size) +{ struct bc_writer *writer; struct bytecode_buffer *buffer = NULL; HRESULT hr; @@ -2610,12 +2596,8 @@ DWORD SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD goto error; } - /* Cut off unneeded memory from the result buffer */ - *result = d3dcompiler_realloc(buffer->data, - sizeof(DWORD) * buffer->size); - if(!*result) { - *result = buffer->data; - } + *size = buffer->size * sizeof(DWORD); + *result = buffer->data; buffer->data = NULL; hr = S_OK; diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 7f4ebdb..e273d6b 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -396,9 +396,8 @@ static HRESULT assemble_shader(const char *preproc_shader, struct bwriter_shader *shader; char *messages = NULL; HRESULT hr; - DWORD *res; - LPD3DBLOB buffer; - int size; + DWORD *res, size; + ID3DBlob *buffer; char *pos; shader = SlAssembleShader(preproc_shader, &messages); @@ -443,7 +442,7 @@ static HRESULT assemble_shader(const char *preproc_shader, return D3DXERR_INVALIDDATA; } - hr = SlWriteBytecode(shader, 9, &res); + hr = SlWriteBytecode(shader, 9, &res, &size); SlDeleteShader(shader); if (FAILED(hr)) { @@ -453,7 +452,6 @@ static HRESULT assemble_shader(const char *preproc_shader, if (shader_blob) { - size = HeapSize(GetProcessHeap(), 0, res); hr = D3DCreateBlob(size, &buffer); if (FAILED(hr)) { diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index d719021..e64f4cf 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -570,7 +570,7 @@ typedef enum _BWRITERDECLUSAGE { #define T3_REG 5 struct bwriter_shader *SlAssembleShader(const char *text, char **messages) DECLSPEC_HIDDEN; -DWORD SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result) DECLSPEC_HIDDEN; +HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result, DWORD *size) DECLSPEC_HIDDEN; void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; #define MAKE_TAG(ch0, ch1, ch2, ch3) \

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012