May 2012 - Wine-Commits - list.winehq.org

Huw Davies : wineps: Use the get_pagesize helper to look up the default pagesize.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: cd770d907adf1f301fb3947631d62d96f815951b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd770d907adf1f301fb394763… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 16 13:15:17 2012 +0100 wineps: Use the get_pagesize helper to look up the default pagesize. --- dlls/wineps.drv/ppd.c | 49 +++++++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 5620885..42969df 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -459,14 +459,12 @@ static BOOL PSDRV_PPDGetNextTuple(FILE *fp, PPDTuple *tuple) } /********************************************************************* + * get_pagesize * - * PSDRV_PPDGetPageSizeInfo - * - * Searches ppd PageSize list to return entry matching name or creates new + * Searches ppd PageSize list to return entry matching name or optionally creates new * entry which is appended to the list if name is not found. - * */ -static PAGESIZE *PSDRV_PPDGetPageSizeInfo(PPD *ppd, char *name) +static PAGESIZE *get_pagesize( PPD *ppd, char *name, BOOL create ) { PAGESIZE *page; @@ -476,6 +474,8 @@ static PAGESIZE *PSDRV_PPDGetPageSizeInfo(PPD *ppd, char *name) return page; } + if (!create) return NULL; + page = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(*page) ); list_add_tail(&ppd->PageSizes, &page->entry); return page; @@ -711,7 +711,7 @@ PPD *PSDRV_ParsePPD(char *fname) } else if(!strcmp("*PageSize", tuple.key)) { - page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option); + page = get_pagesize( ppd, tuple.option, TRUE ); if(!page->Name) { int i; @@ -747,17 +747,17 @@ PPD *PSDRV_ParsePPD(char *fname) } } - else if(!strcmp("*DefaultPageSize", tuple.key)) { - if(default_pagesize) { - WARN("Already set default pagesize\n"); - } else { + else if(!strcmp("*DefaultPageSize", tuple.key)) + { + if (!default_pagesize) + { default_pagesize = tuple.value; tuple.value = NULL; - } + } } else if(!strcmp("*ImageableArea", tuple.key)) { - page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option); + page = get_pagesize( ppd, tuple.option, TRUE ); if(!page->Name) { page->Name = tuple.option; @@ -779,9 +779,8 @@ PPD *PSDRV_ParsePPD(char *fname) #undef PIA } - else if(!strcmp("*PaperDimension", tuple.key)) { - page = PSDRV_PPDGetPageSizeInfo(ppd, tuple.option); + page = get_pagesize( ppd, tuple.option, TRUE ); if(!page->Name) { page->Name = tuple.option; @@ -932,20 +931,18 @@ PPD *PSDRV_ParsePPD(char *fname) } ppd->DefaultPageSize = NULL; - if(default_pagesize) { - LIST_FOR_EACH_ENTRY(page, &ppd->PageSizes, PAGESIZE, entry) { - if(!strcmp(page->Name, default_pagesize)) { - ppd->DefaultPageSize = page; - TRACE("DefaultPageSize: %s\n", page->Name); - break; - } - } - HeapFree(PSDRV_Heap, 0, default_pagesize); - } - if(!ppd->DefaultPageSize) { - ppd->DefaultPageSize = LIST_ENTRY(list_head(&ppd->PageSizes), PAGESIZE, entry); + if (default_pagesize) + ppd->DefaultPageSize = get_pagesize( ppd, default_pagesize, FALSE ); + + if (!ppd->DefaultPageSize) + { + struct list *head = list_head( &ppd->PageSizes ); + if (head) ppd->DefaultPageSize = LIST_ENTRY( head, PAGESIZE, entry ); TRACE("Setting DefaultPageSize to first in list\n"); } + TRACE( "DefaultPageSize: %s\n", ppd->DefaultPageSize ? ppd->DefaultPageSize->Name : "<not set>" ); + + HeapFree( PSDRV_Heap, 0, default_pagesize ); ppd->DefaultDuplex = NULL; if (default_duplex)

1 0

Huw Davies : wineps: Add a helper to perform duplex lookup by name.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: e6398a554483f454a23e21c85d6760af96cbdd41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6398a554483f454a23e21c85… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 16 13:15:18 2012 +0100 wineps: Add a helper to perform duplex lookup by name. --- dlls/wineps.drv/ppd.c | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 42969df..dc598e8 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -481,6 +481,19 @@ static PAGESIZE *get_pagesize( PPD *ppd, char *name, BOOL create ) return page; } +static DUPLEX *get_duplex( PPD *ppd, const char *name ) +{ + DUPLEX *duplex; + + LIST_FOR_EACH_ENTRY( duplex, &ppd->Duplexes, DUPLEX, entry ) + { + if (!strcmp( duplex->Name, name )) + return duplex; + } + + return NULL; +} + /********************************************************************** * * PSDRV_PPDGetWord @@ -896,13 +909,13 @@ PPD *PSDRV_ParsePPD(char *fname) list_add_tail( &ppd->Duplexes, &duplex->entry ); } - else if(!strcmp("*DefaultDuplex", tuple.key)) { - if(default_duplex) { - WARN("Already set default duplex\n"); - } else { + else if (!strcmp("*DefaultDuplex", tuple.key)) + { + if (!default_duplex) + { default_duplex = tuple.value; tuple.value = NULL; - } + } } HeapFree(PSDRV_Heap, 0, tuple.key); @@ -946,24 +959,17 @@ PPD *PSDRV_ParsePPD(char *fname) ppd->DefaultDuplex = NULL; if (default_duplex) - { - DUPLEX *duplex; - LIST_FOR_EACH_ENTRY( duplex, &ppd->Duplexes, DUPLEX, entry ) - { - if (!strcmp(duplex->Name, default_duplex)) - { - ppd->DefaultDuplex = duplex; - TRACE("DefaultDuplex: %s\n", duplex->Name); - break; - } - } - HeapFree(PSDRV_Heap, 0, default_duplex); - } + ppd->DefaultDuplex = get_duplex( ppd, default_duplex ); + if (!ppd->DefaultDuplex) { - ppd->DefaultDuplex = LIST_ENTRY( list_head( &ppd->Duplexes ), DUPLEX, entry ); + struct list *head = list_head( &ppd->Duplexes ); + if (head) ppd->DefaultDuplex = LIST_ENTRY( head, DUPLEX, entry ); TRACE("Setting DefaultDuplex to first in list\n"); } + TRACE( "DefaultDuplex: %s\n", ppd->DefaultDuplex ? ppd->DefaultDuplex->Name : "<not set>" ); + + HeapFree( PSDRV_Heap, 0, default_duplex ); {

1 0

Michael Stefaniuc : user32/tests: Remove duplicated ok() call.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: ca64393e990b3f265dd32532b517104d09d2141e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca64393e990b3f265dd32532b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 16 10:37:33 2012 +0200 user32/tests: Remove duplicated ok() call. --- dlls/user32/tests/dde.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 195de70..3ad48f0 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2460,7 +2460,6 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(!lstrcmpA(str, test_topic), "Expected %s, got %s, msg_index=%d\n", test_topic, str, msg_index); ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); - ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); size = DdeGetData(hdata, NULL, 0, 0); ok((buffer = HeapAlloc(GetProcessHeap(), 0, size)) != NULL, "should not be null\n");

1 0

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

May 16, 2012

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

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

May 16, 2012

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

André Hentschel : winedbg: Add partial Thumb2 disassembler.
by Alexandre Julliard May 16, 2012

May 16, 2012

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

Hans Leidekker : fusion: Implement IAssemblyName::IsEqual.
by Alexandre Julliard May 16, 2012

May 16, 2012

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

Michael Stefaniuc : quartz/tests: Remove misplaced ok() call.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: b69811f5ee67a2e6c1f83a922c17ebaec71a9792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69811f5ee67a2e6c1f83a922… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 16 10:42:59 2012 +0200 quartz/tests: Remove misplaced ok() call. --- dlls/quartz/tests/avisplitter.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 59e277e..250c631 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -303,7 +303,6 @@ static void test_threads(void) */ while (IEnumPins_Next(enumpins, 1, &avipin, NULL) == S_OK) { - ok(hr == S_OK, "hr: %08x\n", hr); IPin_QueryDirection(avipin, &dir); if (dir == PINDIR_OUTPUT) {

1 0

Michael Stefaniuc : shlwapi/tests: Remove useless ok() call on the "out" variable.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: 24a01dfef8cafd358e8f5f7647515dbf75d73a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a01dfef8cafd358e8f5f764… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 16 10:38:59 2012 +0200 shlwapi/tests: Remove useless ok() call on the "out" variable. --- dlls/shlwapi/tests/ordinal.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 5d2fa0a..e787daa 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1538,7 +1538,6 @@ static void test_SHPropertyBag_ReadLONG(void) ok(out == 0xfeedface, "value should not have changed\n"); rc = pSHPropertyBag_ReadLONG(&pb->IPropertyBag_iface, szName1, NULL); ok(rc == E_INVALIDARG || broken(rc == 0) || broken(rc == 1), "incorrect return %x\n",rc); - ok(out == 0xfeedface, "value should not have changed\n"); rc = pSHPropertyBag_ReadLONG(&pb->IPropertyBag_iface, szName1, &out); ok(rc == DISP_E_BADVARTYPE || broken(rc == 0) || broken(rc == 1), "incorrect return %x\n",rc); ok(out == 0xfeedface || broken(out == 0xfeedfa00), "value should not have changed %x\n",out);

1 0

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

May 16, 2012

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