wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Andrew Talbot : dbghelp: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 9feb4053fed8154ba7866ed65104025c919b186a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9feb4053fed8154ba7866ed65… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:27 2012 +0000 dbghelp: Indentation fix. --- dlls/dbghelp/elf_module.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 52060e0..92b4a31 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -678,11 +678,11 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table ((struct symt_data*)sym)->container); if (symp) { - if (((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr && - ((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr + symp->st_value) - FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", - sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, - ((struct symt_function*)sym)->address, elf_info->elf_addr + symp->st_value); + if (((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr && + ((struct symt_data*)sym)->u.var.offset != elf_info->elf_addr + symp->st_value) + FIXME("Changing address for %p/%s!%s from %08lx to %08lx\n", + sym, debugstr_w(module->module.ModuleName), sym->hash_elt.name, + ((struct symt_function*)sym)->address, elf_info->elf_addr + symp->st_value); ((struct symt_data*)sym)->u.var.offset = elf_info->elf_addr + symp->st_value; ((struct symt_data*)sym)->kind = (ELF32_ST_BIND(symp->st_info) == STB_LOCAL) ? DataIsFileStatic : DataIsGlobal;

1 0

Andrew Talbot : dsound: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: b0e95d27a9f816ba3319ce5e48e51f175f44713c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e95d27a9f816ba3319ce5e4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:30 2012 +0000 dsound: Indentation fix. --- dlls/dsound/buffer.c | 8 +++----- dlls/dsound/primary.c | 14 ++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index cf4d2ec..e8fc5f3 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -607,11 +607,9 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Unlock(IDirectSoundBuffer8 *iface, if (!p2) x2 = 0; - if((p1 && ((BYTE*)p1 < This->buffer->memory || - (BYTE*)p1 >= This->buffer->memory + This->buflen)) || - (p2 && ((BYTE*)p2 < This->buffer->memory || - (BYTE*)p2 >= This->buffer->memory + This->buflen))) - return DSERR_INVALIDPARAM; + if((p1 && ((BYTE*)p1 < This->buffer->memory || (BYTE*)p1 >= This->buffer->memory + This->buflen)) || + (p2 && ((BYTE*)p2 < This->buffer->memory || (BYTE*)p2 >= This->buffer->memory + This->buflen))) + return DSERR_INVALIDPARAM; if (x1 || x2) { diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0964f9b..3ac928b 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -293,9 +293,9 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) else device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; - FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); - FillMemory(device->mix_buffer, device->mix_buffer_len, 0); - device->playpos = 0; + FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); + FillMemory(device->mix_buffer, device->mix_buffer_len, 0); + device->playpos = 0; if (device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && @@ -1085,11 +1085,9 @@ static HRESULT WINAPI PrimaryBufferImpl_Unlock(IDirectSoundBuffer *iface, void * return DSERR_PRIOLEVELNEEDED; } - if((p1 && ((BYTE*)p1 < device->buffer || - (BYTE*)p1 >= device->buffer + device->buflen)) || - (p2 && ((BYTE*)p2 < device->buffer || - (BYTE*)p2 >= device->buffer + device->buflen))) - return DSERR_INVALIDPARAM; + if ((p1 && ((BYTE*)p1 < device->buffer || (BYTE*)p1 >= device->buffer + device->buflen)) || + (p2 && ((BYTE*)p2 < device->buffer || (BYTE*)p2 >= device->buffer + device->buflen))) + return DSERR_INVALIDPARAM; return DS_OK; }

1 0

Andrew Talbot : krnl386.exe16: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 10fb1eac9c499d3a017729da4d167d12c0425087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fb1eac9c499d3a017729da4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:37 2012 +0000 krnl386.exe16: Indentation fix. --- dlls/krnl386.exe16/int2f.c | 4 ++-- dlls/krnl386.exe16/vga.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/krnl386.exe16/int2f.c b/dlls/krnl386.exe16/int2f.c index 3535ec3..85b9011 100644 --- a/dlls/krnl386.exe16/int2f.c +++ b/dlls/krnl386.exe16/int2f.c @@ -278,7 +278,7 @@ void WINAPI DOSVM_Int2fHandler( CONTEXT *context ) if(BX_reg(context) == 0x5145 && CX_reg(context) == 0x4D4D && DX_reg(context) == 0x3432) TRACE("Check for QEMM v5.0+ (not installed)\n"); - break; + break; default: INT_BARF( context, 0x2f ); break; @@ -302,7 +302,7 @@ void WINAPI DOSVM_Int2fHandler( CONTEXT *context ) if(BX_reg(context) == 0x4450 && CX_reg(context) == 0x4d49 && DX_reg(context) == 0x8f4f) TRACE("Check for QDPMI.SYS (not installed)\n"); - break; + break; default: INT_BARF( context, 0x2f ); break; diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c index 98edcef..f1b632e 100644 --- a/dlls/krnl386.exe16/vga.c +++ b/dlls/krnl386.exe16/vga.c @@ -1007,12 +1007,12 @@ void VGA_SetPalette(PALETTEENTRY*pal,int start,int len) /* set a single [char wide] color in 16 color mode. */ void VGA_SetColor16(int reg,int color) { - PALETTEENTRY *pal; + PALETTEENTRY *pal; if (!lpddraw) return; - pal= &vga_def64_palette[color]; - IDirectDrawPalette_SetEntries(lpddpal,0,reg,1,pal); - vga_16_palette[reg]=(char)color; + pal= &vga_def64_palette[color]; + IDirectDrawPalette_SetEntries(lpddpal,0,reg,1,pal); + vga_16_palette[reg]=(char)color; } /* Get a single [char wide] color in 16 color mode. */ @@ -1020,7 +1020,7 @@ char VGA_GetColor16(int reg) { if (!lpddraw) return 0; - return vga_16_palette[reg]; + return vga_16_palette[reg]; } /* set all 17 [char wide] colors at once in 16 color mode. */

1 0

Andrew Talbot : mapi32: Indentation fix.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: c8e952c9397d8e998a4506d18cd98cb3241017ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e952c9397d8e998a4506d18… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 15 14:43:41 2012 +0000 mapi32: Indentation fix. --- dlls/mapi32/prop.c | 74 ++++++++++++++++++++++++++-------------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index a623424..ce122a3 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -736,44 +736,44 @@ SCODE WINAPI ScCountProps(INT iCount, LPSPropValue lpProps, ULONG *pcBytes) lpProps[i].ulPropTag == PROP_ID_INVALID) return MAPI_E_INVALID_PARAMETER; - if (PROP_TYPE(lpProps[i].ulPropTag) != PT_OBJECT) - { - ulPropSize = UlPropSize(&lpProps[i]); - if (!ulPropSize) - return MAPI_E_INVALID_PARAMETER; - } + if (PROP_TYPE(lpProps[i].ulPropTag) != PT_OBJECT) + { + ulPropSize = UlPropSize(&lpProps[i]); + if (!ulPropSize) + return MAPI_E_INVALID_PARAMETER; + } - switch (PROP_TYPE(lpProps[i].ulPropTag)) - { - case PT_STRING8: - case PT_UNICODE: - case PT_CLSID: - case PT_BINARY: - case PT_MV_I2: - case PT_MV_I4: - case PT_MV_I8: - case PT_MV_R4: - case PT_MV_R8: - case PT_MV_CURRENCY: - case PT_MV_SYSTIME: - case PT_MV_APPTIME: - ulPropSize += sizeof(SPropValue); - break; - case PT_MV_CLSID: - ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); - break; - case PT_MV_STRING8: - case PT_MV_UNICODE: - ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); - break; - case PT_MV_BINARY: - ulPropSize += lpProps[i].Value.MVbin.cValues * sizeof(SBinary) + sizeof(SPropValue); - break; - default: - ulPropSize = sizeof(SPropValue); - break; - } - ulBytes += ulPropSize; + switch (PROP_TYPE(lpProps[i].ulPropTag)) + { + case PT_STRING8: + case PT_UNICODE: + case PT_CLSID: + case PT_BINARY: + case PT_MV_I2: + case PT_MV_I4: + case PT_MV_I8: + case PT_MV_R4: + case PT_MV_R8: + case PT_MV_CURRENCY: + case PT_MV_SYSTIME: + case PT_MV_APPTIME: + ulPropSize += sizeof(SPropValue); + break; + case PT_MV_CLSID: + ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); + break; + case PT_MV_STRING8: + case PT_MV_UNICODE: + ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); + break; + case PT_MV_BINARY: + ulPropSize += lpProps[i].Value.MVbin.cValues * sizeof(SBinary) + sizeof(SPropValue); + break; + default: + ulPropSize = sizeof(SPropValue); + break; + } + ulBytes += ulPropSize; } if (pcBytes) *pcBytes = ulBytes;

1 0

Andrew Eikum : mmdevapi: Send notifications to clients when the user-selected default device changes .
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: d4e9b26cbb757f0d12d4585acf5277e2dd2d2347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4e9b26cbb757f0d12d4585ac… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 14 11:41:56 2012 -0600 mmdevapi: Send notifications to clients when the user-selected default device changes. --- dlls/mmdevapi/devenum.c | 159 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 153 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index f9b9172..21a3530 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -59,6 +59,11 @@ static const WCHAR reg_devicestate[] = { 'D','e','v','i','c','e','S','t','a','t','e',0 }; static const WCHAR reg_properties[] = { 'P','r','o','p','e','r','t','i','e','s',0 }; +static const WCHAR slashW[] = {'\\',0}; +static const WCHAR reg_out_nameW[] = {'D','e','f','a','u','l','t','O','u','t','p','u','t',0}; +static const WCHAR reg_vout_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','O','u','t','p','u','t',0}; +static const WCHAR reg_in_nameW[] = {'D','e','f','a','u','l','t','I','n','p','u','t',0}; +static const WCHAR reg_vin_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','I','n','p','u','t',0}; static HKEY key_render; static HKEY key_capture; @@ -916,12 +921,6 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa HKEY key; HRESULT hr; - static const WCHAR slashW[] = {'\\',0}; - static const WCHAR reg_out_nameW[] = {'D','e','f','a','u','l','t','O','u','t','p','u','t',0}; - static const WCHAR reg_vout_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','O','u','t','p','u','t',0}; - static const WCHAR reg_in_nameW[] = {'D','e','f','a','u','l','t','I','n','p','u','t',0}; - static const WCHAR reg_vin_nameW[] = {'D','e','f','a','u','l','t','V','o','i','c','e','I','n','p','u','t',0}; - TRACE("(%p)->(%u,%u,%p)\n", This, flow, role, device); if (!device) @@ -1042,6 +1041,7 @@ struct NotificationClientWrapper { }; static struct list g_notif_clients = LIST_INIT(g_notif_clients); +static HANDLE g_notif_thread; static CRITICAL_SECTION g_notif_lock; static CRITICAL_SECTION_DEBUG g_notif_lock_debug = @@ -1052,6 +1052,147 @@ static CRITICAL_SECTION_DEBUG g_notif_lock_debug = }; static CRITICAL_SECTION g_notif_lock = { &g_notif_lock_debug, -1, 0, 0, 0, 0 }; +static void notify_clients(EDataFlow flow, ERole role, const WCHAR *id) +{ + struct NotificationClientWrapper *wrapper; + LIST_FOR_EACH_ENTRY(wrapper, &g_notif_clients, + struct NotificationClientWrapper, entry) + IMMNotificationClient_OnDefaultDeviceChanged(wrapper->client, flow, + role, id); + + /* Windows 7 treats changes to eConsole as changes to eMultimedia */ + if(role == eConsole) + notify_clients(flow, eMultimedia, id); +} + +static int notify_if_changed(EDataFlow flow, ERole role, HKEY key, + const WCHAR *val_name, WCHAR *old_val, IMMDevice *def_dev) +{ + WCHAR new_val[64], *id; + DWORD size; + HRESULT hr; + + size = sizeof(new_val); + if(RegQueryValueExW(key, val_name, 0, NULL, + (BYTE*)new_val, &size) != ERROR_SUCCESS){ + if(old_val[0] != 0){ + /* set by user -> system default */ + if(def_dev){ + hr = IMMDevice_GetId(def_dev, &id); + if(FAILED(hr)){ + ERR("GetId failed: %08x\n", hr); + return 0; + } + }else + id = NULL; + + notify_clients(flow, role, id); + old_val[0] = 0; + CoTaskMemFree(id); + + return 1; + } + + /* system default -> system default, noop */ + return 0; + } + + if(!lstrcmpW(old_val, new_val)){ + /* set by user -> same value */ + return 0; + } + + if(new_val[0] != 0){ + /* set by user -> different value */ + notify_clients(flow, role, new_val); + memcpy(old_val, new_val, sizeof(new_val)); + return 1; + } + + /* set by user -> system default */ + if(def_dev){ + hr = IMMDevice_GetId(def_dev, &id); + if(FAILED(hr)){ + ERR("GetId failed: %08x\n", hr); + return 0; + } + }else + id = NULL; + + notify_clients(flow, role, id); + old_val[0] = 0; + CoTaskMemFree(id); + + return 1; +} + +static DWORD WINAPI notif_thread_proc(void *user) +{ + HKEY key; + WCHAR reg_key[256]; + WCHAR out_name[64], vout_name[64], in_name[64], vin_name[64]; + DWORD size; + + lstrcpyW(reg_key, drv_keyW); + lstrcatW(reg_key, slashW); + lstrcatW(reg_key, drvs.module_name); + + if(RegCreateKeyExW(HKEY_CURRENT_USER, reg_key, 0, NULL, 0, + MAXIMUM_ALLOWED, NULL, &key, NULL) != ERROR_SUCCESS){ + ERR("RegCreateKeyEx failed: %u\n", GetLastError()); + return 1; + } + + size = sizeof(out_name); + if(RegQueryValueExW(key, reg_out_nameW, 0, NULL, + (BYTE*)out_name, &size) != ERROR_SUCCESS) + out_name[0] = 0; + + size = sizeof(vout_name); + if(RegQueryValueExW(key, reg_vout_nameW, 0, NULL, + (BYTE*)vout_name, &size) != ERROR_SUCCESS) + vout_name[0] = 0; + + size = sizeof(in_name); + if(RegQueryValueExW(key, reg_in_nameW, 0, NULL, + (BYTE*)in_name, &size) != ERROR_SUCCESS) + in_name[0] = 0; + + size = sizeof(vin_name); + if(RegQueryValueExW(key, reg_vin_nameW, 0, NULL, + (BYTE*)vin_name, &size) != ERROR_SUCCESS) + vin_name[0] = 0; + + while(1){ + if(RegNotifyChangeKeyValue(key, FALSE, REG_NOTIFY_CHANGE_LAST_SET, + NULL, FALSE) != ERROR_SUCCESS){ + ERR("RegNotifyChangeKeyValue failed: %u\n", GetLastError()); + RegCloseKey(key); + g_notif_thread = NULL; + return 1; + } + + EnterCriticalSection(&g_notif_lock); + + notify_if_changed(eRender, eConsole, key, reg_out_nameW, + out_name, &MMDevice_def_play->IMMDevice_iface); + notify_if_changed(eRender, eCommunications, key, reg_vout_nameW, + vout_name, &MMDevice_def_play->IMMDevice_iface); + notify_if_changed(eCapture, eConsole, key, reg_in_nameW, + in_name, &MMDevice_def_rec->IMMDevice_iface); + notify_if_changed(eCapture, eCommunications, key, reg_vin_nameW, + vin_name, &MMDevice_def_rec->IMMDevice_iface); + + LeaveCriticalSection(&g_notif_lock); + } + + RegCloseKey(key); + + g_notif_thread = NULL; + + return 0; +} + static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); @@ -1072,6 +1213,12 @@ static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEn list_add_tail(&g_notif_clients, &wrapper->entry); + if(!g_notif_thread){ + g_notif_thread = CreateThread(NULL, 0, notif_thread_proc, NULL, 0, NULL); + if(!g_notif_thread) + ERR("CreateThread failed: %u\n", GetLastError()); + } + LeaveCriticalSection(&g_notif_lock); return S_OK;

1 0

Andrew Eikum : mmdevapi: Implement (Un)RegisterEndpointNotificationCallback .
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 8d775ec09b80bcc729743ed869fcee896dd399f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d775ec09b80bcc729743ed86… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 14 11:41:53 2012 -0600 mmdevapi: Implement (Un)RegisterEndpointNotificationCallback. --- dlls/mmdevapi/devenum.c | 59 ++++++++++++++++++++++++- dlls/mmdevapi/tests/mmdevenum.c | 91 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d7c5a44..f9b9172 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -27,6 +27,7 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/unicode.h" #include "initguid.h" @@ -1035,20 +1036,72 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA return E_INVALIDARG; } +struct NotificationClientWrapper { + IMMNotificationClient *client; + struct list entry; +}; + +static struct list g_notif_clients = LIST_INIT(g_notif_clients); + +static CRITICAL_SECTION g_notif_lock; +static CRITICAL_SECTION_DEBUG g_notif_lock_debug = +{ + 0, 0, &g_notif_lock, + { &g_notif_lock_debug.ProcessLocksList, &g_notif_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": g_notif_lock") } +}; +static CRITICAL_SECTION g_notif_lock = { &g_notif_lock_debug, -1, 0, 0, 0, 0 }; + static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); + struct NotificationClientWrapper *wrapper; + TRACE("(%p)->(%p)\n", This, client); - FIXME("stub\n"); + + if(!client) + return E_POINTER; + + wrapper = HeapAlloc(GetProcessHeap(), 0, sizeof(*wrapper)); + if(!wrapper) + return E_OUTOFMEMORY; + + wrapper->client = client; + + EnterCriticalSection(&g_notif_lock); + + list_add_tail(&g_notif_clients, &wrapper->entry); + + LeaveCriticalSection(&g_notif_lock); + return S_OK; } static HRESULT WINAPI MMDevEnum_UnregisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); + struct NotificationClientWrapper *wrapper, *wrapper2; + TRACE("(%p)->(%p)\n", This, client); - FIXME("stub\n"); - return S_OK; + + if(!client) + return E_POINTER; + + EnterCriticalSection(&g_notif_lock); + + LIST_FOR_EACH_ENTRY_SAFE(wrapper, wrapper2, &g_notif_clients, + struct NotificationClientWrapper, entry){ + if(wrapper->client == client){ + list_remove(&wrapper->entry); + HeapFree(GetProcessHeap(), 0, wrapper); + LeaveCriticalSection(&g_notif_lock); + return S_OK; + } + } + + LeaveCriticalSection(&g_notif_lock); + + return E_NOTFOUND; } static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl = diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 82dda40..12e2156 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -118,6 +118,73 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) IMMDeviceCollection_Release(col); } +static HRESULT WINAPI notif_QueryInterface(IMMNotificationClient *iface, + const GUID *riid, void **obj) +{ + ok(0, "Unexpected QueryInterface call\n"); + return E_NOTIMPL; +} + +static ULONG WINAPI notif_AddRef(IMMNotificationClient *iface) +{ + ok(0, "Unexpected AddRef call\n"); + return 2; +} + +static ULONG WINAPI notif_Release(IMMNotificationClient *iface) +{ + ok(0, "Unexpected Release call\n"); + return 1; +} + +static HRESULT WINAPI notif_OnDeviceStateChanged(IMMNotificationClient *iface, + const WCHAR *device_id, DWORD new_state) +{ + ok(0, "Unexpected OnDeviceStateChanged call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnDeviceAdded(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + ok(0, "Unexpected OnDeviceAdded call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnDeviceRemoved(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + ok(0, "Unexpected OnDeviceRemoved call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnDefaultDeviceChanged(IMMNotificationClient *iface, + EDataFlow flow, ERole role, const WCHAR *device_id) +{ + ok(0, "Unexpected OnDefaultDeviceChanged call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI notif_OnPropertyValueChanged(IMMNotificationClient *iface, + const WCHAR *device_id, const PROPERTYKEY key) +{ + ok(0, "Unexpected OnPropertyValueChanged call\n"); + return E_NOTIMPL; +} + +static IMMNotificationClientVtbl notif_vtbl = { + notif_QueryInterface, + notif_AddRef, + notif_Release, + notif_OnDeviceStateChanged, + notif_OnDeviceAdded, + notif_OnDeviceRemoved, + notif_OnDefaultDeviceChanged, + notif_OnPropertyValueChanged +}; + +static IMMNotificationClient notif = { &notif_vtbl }; + /* Only do parameter tests here, the actual MMDevice testing should be a separate test */ START_TEST(mmdevenum) { @@ -192,5 +259,29 @@ START_TEST(mmdevenum) test_collection(mme, col); } + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, NULL); + ok(hr == E_POINTER, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "RegisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, NULL); + ok(hr == E_POINTER, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, (IMMNotificationClient*)0xdeadbeef); + ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, &notif); + ok(hr == S_OK, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_UnregisterEndpointNotificationCallback(mme, &notif); + ok(hr == E_NOTFOUND, "UnregisterEndpointNotificationCallback failed: %08x\n", hr); + IMMDeviceEnumerator_Release(mme); }

1 0

Francois Gouget : testbot: Don' t try to dereference $TunnelDefaults if it is undefined.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: 25e1f7303e908b69d022330a8581d32be11088e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=25e1f7303e908b69d022330a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 17:09:29 2012 +0100 testbot: Don't try to dereference $TunnelDefaults if it is undefined. --- testbot/lib/WineTestBot/VMs.pm | 3 ++- testbot/scripts/TestAgent | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index f41453e..ccfa9f2 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -369,7 +369,8 @@ sub _GetTunnel($) { my $ParsedURI = URI->new($URI); - my %TunnelInfo = %$TunnelDefaults; + my %TunnelInfo; + %TunnelInfo = %$TunnelDefaults if ($TunnelDefaults); $TunnelInfo{sshhost} = $ParsedURI->host; $TunnelInfo{sshport} = $ParsedURI->port; $TunnelInfo{username} = $ParsedURI->userinfo; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index f72531c..a4c8e1a 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -244,7 +244,7 @@ my $TunnelInfo; if ($TunnelOpt) { my $ParsedURI = URI->new($TunnelOpt); - %$TunnelInfo = %$TunnelDefaults; + %$TunnelInfo = %$TunnelDefaults if ($TunnelDefaults); $TunnelInfo->{sshhost} = $ParsedURI->host; $TunnelInfo->{sshport} = $ParsedURI->port; $TunnelInfo->{username} = $ParsedURI->userinfo;

1 0

Francois Gouget : testbot/TestAgent: Fix the check for the id_dsa and id_rsa keys.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: a273816ac6c7816a485490d622ef6abe080f7f86 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a273816ac6c7816a485490d6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 16:39:52 2012 +0100 testbot/TestAgent: Fix the check for the id_dsa and id_rsa keys. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index cb63cfd..6b8bff7 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -807,7 +807,7 @@ sub _Connect($) if (defined $ENV{HOME} and !exists $AuthOptions{"privatekey"} and !exists $AuthOptions{"publickey"}) { - foreach my $key ("dsa", "rsa") + foreach my $key ("id_dsa", "id_rsa") { if (-f "$ENV{HOME}/.ssh/$key" and -f "$ENV{HOME}/.ssh/$key.pub") {

1 0

Francois Gouget : testbot/lib: Add parentheses to a LogMsg() call to make perl 5.10 happy.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: da8a256602397b815c0ecdbc03fb894d339a5fc2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da8a256602397b815c0ecdbc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 15:45:15 2012 +0100 testbot/lib: Add parentheses to a LogMsg() call to make perl 5.10 happy. --- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/VMs.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 79622de..fa53b07 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -125,7 +125,7 @@ sub Run delete $ENV{ENV}; exec("$BinDir/${ProjectName}$RunScript", $JobId, $StepNo, $self->No) or require WineTestBot::Log; - WineTestBot::Log::LogMsg "Unable to exec ${ProjectName}$RunScript: $!\n"; + WineTestBot::Log::LogMsg("Unable to exec ${ProjectName}$RunScript: $!\n"); exit(1); } diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2d1c1fd..f41453e 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -539,7 +539,7 @@ sub RunRevert WineTestBot::Log::SetupRedirects(); exec("$BinDir/RevertVM.pl", $self->GetKey()) or require WineTestBot::Log; - WineTestBot::Log::LogMsg "Unable to exec RevertVM.pl: $!\n"; + WineTestBot::Log::LogMsg("Unable to exec RevertVM.pl: $!\n"); exit(1); }

1 0

Francois Gouget : testbot/WineRunTask: 'cls' is only needed on Win9x so remove it.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: tools Branch: master Commit: d5ffbdef47e94b714a0ab21bba306eac575b26fb URL: http://source.winehq.org/git/tools.git/?a=commit;h=d5ffbdef47e94b714a0ab21b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 17 10:02:23 2012 +0100 testbot/WineRunTask: 'cls' is only needed on Win9x so remove it. --- testbot/bin/WineRunTask.pl | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ccb2600..c6ca567 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -307,9 +307,6 @@ elsif ($Step->Type eq "suite") "$FileName -q -s $RptFileName\r\n"; } -# Needed to exit the command prompt on Win9x/WinMe -$Script .= "cls\r\n"; - $ErrMessage = $VM->RunScriptInGuestTimeout($Script, $Task->Timeout + 15); my $LogErrMessage = RetrieveLogFile $Job, $Step, $Task, $RptFileName, $FullLogFileName;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
55
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 December 2012