December 2012 - Wine-Commits

Dmitry Timoshkov : wineps.drv: Update dmPaperWidth/ Height when dmPaperSize is being changed through UI.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 95d98d0bfc1fbf8d3d24dc235d60fcdf3228c201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d98d0bfc1fbf8d3d24dc235… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 25 12:18:33 2012 +0800 wineps.drv: Update dmPaperWidth/Height when dmPaperSize is being changed through UI. --- dlls/wineps.drv/driver.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index c1e49d7..8ec51a2 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -340,10 +340,15 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, if(i >= Cursel) break; i++; } - TRACE("Setting pagesize to item %d Winpage = %d\n", Cursel, ps->WinPage); + TRACE("Setting pagesize to item %d, WinPage %d (%s), PaperSize %.2fx%.2f\n", Cursel, + ps->WinPage, ps->FullName, ps->PaperDimension->x, ps->PaperDimension->y); di->dlgdm->dmPublic.u1.s1.dmPaperSize = ps->WinPage; di->dlgdm->dmPublic.dmFields |= DM_PAPERSIZE; + di->dlgdm->dmPublic.u1.s1.dmPaperWidth = paper_size_from_points(ps->PaperDimension->x); + di->dlgdm->dmPublic.u1.s1.dmPaperLength = paper_size_from_points(ps->PaperDimension->y); + di->dlgdm->dmPublic.dmFields |= DM_PAPERLENGTH | DM_PAPERWIDTH; + if (di->dlgdm->dmPublic.dmSize >= FIELD_OFFSET(DEVMODEW, dmFormName) + CCHFORMNAME * sizeof(WCHAR)) { MultiByteToWideChar(CP_ACP, 0, ps->FullName, -1, di->dlgdm->dmPublic.dmFormName, CCHFORMNAME);

1 0

Jacek Caban : atl: Use atlbase.h in tests.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 65493cf137183635cecdb966800593a004c7a32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65493cf137183635cecdb9668… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 26 13:49:50 2012 +0100 atl: Use atlbase.h in tests. --- dlls/atl/tests/module.c | 87 ++++++++++++----------------------------------- 1 files changed, 22 insertions(+), 65 deletions(-) diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 2a97ef9..ffa62ad 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -24,84 +24,41 @@ #define COBJMACROS -#include <wine/test.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wingdi.h> -#include <winnls.h> -#include <winerror.h> -#include <winnt.h> -#include <wtypes.h> -#include <olectl.h> -#include <ocidl.h> - -struct _ATL_OBJMAP_ENTRYW; -struct _AtlCreateWndData; -struct _ATL_TERMFUNC_ELEM; - -struct _ATL_MODULEW -{ - UINT cbSize; - HINSTANCE m_hInst; - HINSTANCE m_hInstResource; - HINSTANCE m_hInstTypeLib; - struct _ATL_OBJMAP_ENTRYW* m_pObjMap; - LONG m_nLockCnt; - HANDLE m_hHeap; - union - { - CRITICAL_SECTION m_csTypeInfoHolder; - CRITICAL_SECTION m_csStaticDataInit; - } u; - CRITICAL_SECTION m_csWindowCreate; - CRITICAL_SECTION m_csObjMap; - - DWORD dwAtlBuildVer; - struct _AtlCreateWndData* m_pCreateWndList; - BOOL m_bDestroyHeap; - GUID* pguidVer; - DWORD m_dwHeaps; - HANDLE* m_phHeaps; - int m_nHeap; - struct _ATL_TERMFUNC_ELEM* m_pTermFuncs; -}; +#include <atlbase.h> -HRESULT WINAPI AtlModuleInit(struct _ATL_MODULEW* pM, struct _ATL_OBJMAP_ENTRYW* p, HINSTANCE h); +#include <wine/test.h> #define MAXSIZE 512 static void test_StructSize(void) { - struct _ATL_MODULEW *tst; - HRESULT hres; - int i; + _ATL_MODULEW *tst; + HRESULT hres; + int i; - tst = HeapAlloc (GetProcessHeap(),HEAP_ZERO_MEMORY,MAXSIZE); + tst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAXSIZE); - for (i=0;i<MAXSIZE;i++) { - tst->cbSize = i; - hres = AtlModuleInit(tst, NULL, NULL); + for (i=0;i<MAXSIZE;i++) { + tst->cbSize = i; + hres = AtlModuleInit(tst, NULL, NULL); - switch (i) { - case FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer ): - case sizeof(struct _ATL_MODULEW): + switch (i) { + case FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer): + case sizeof(_ATL_MODULEW): #ifdef _WIN64 - case sizeof(struct _ATL_MODULEW) + sizeof(void *): + case sizeof(_ATL_MODULEW) + sizeof(void *): #endif - ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); - break; - default: - ok (FAILED(hres) || - broken((i > FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer )) && (hres == S_OK)), /* Win95 */ - "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); - break; - } - } + ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); + break; + default: + ok (FAILED(hres), "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); + break; + } + } - HeapFree (GetProcessHeap(), 0, tst); + HeapFree (GetProcessHeap(), 0, tst); } START_TEST(module) { - test_StructSize(); + test_StructSize(); }

1 0

André Hentschel : cacls: Print out arguments.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 04f40b7059ef99238573152d6257df450e0e6cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f40b7059ef99238573152d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 25 17:30:51 2012 +0100 cacls: Print out arguments. --- programs/cacls/cacls_main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/cacls/cacls_main.c b/programs/cacls/cacls_main.c index a6a2949..eebd6d0 100644 --- a/programs/cacls/cacls_main.c +++ b/programs/cacls/cacls_main.c @@ -26,6 +26,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(cacls); int main(int argc, char** argv) { + int i; + WINE_FIXME("This is dummy cacls, not performing ACL manipulations\n"); + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_a(argv[i])); + WINE_FIXME("\n"); + return 0; }

1 0

Ken Thomases : makedep: Add support for Objective-C . m files and #import directive.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: dd2f2e4ee582a825632d43b753f62c33ecbdf299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2f2e4ee582a825632d43b75… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:20 2012 -0600 makedep: Add support for Objective-C .m files and #import directive. --- tools/makedep.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2d3e5b4..c70b5a9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -653,8 +653,9 @@ static void parse_c_file( INCL_FILE *pFile, FILE *file ) while (*p && isspace(*p)) p++; if (*p++ != '#') continue; while (*p && isspace(*p)) p++; - if (strncmp( p, "include", 7 )) continue; - p += 7; + if (!strncmp( p, "include", 7 )) p += 7; + else if (!strncmp( p, "import", 6 )) p += 6; + else continue; while (*p && isspace(*p)) p++; if (*p != '\"' && *p != '<' ) continue; quote = *p++; @@ -805,6 +806,7 @@ static void parse_file( INCL_FILE *pFile, int src ) else if (strendswith( pFile->filename, ".idl" )) parse_idl_file( pFile, file, 0 ); else if (strendswith( pFile->filename, ".c" ) || + strendswith( pFile->filename, ".m" ) || strendswith( pFile->filename, ".h" ) || strendswith( pFile->filename, ".l" ) || strendswith( pFile->filename, ".y" ))

1 0

Andrew Eikum : winmm: Rearrange device mapping when a new default device is chosen.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 4ab4bc5d095647ad1e4ca30c2749f0e3c337ad9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab4bc5d095647ad1e4ca30c2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 26 08:40:03 2012 -0600 winmm: Rearrange device mapping when a new default device is chosen. --- dlls/winmm/waveform.c | 159 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 142 insertions(+), 17 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 18f3bb9..11ae66c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -278,6 +278,15 @@ static void WINMM_InitDevice(WINMM_Device *device, device->parent = parent; } +static inline WINMM_MMDevice *read_map(WINMM_MMDevice **map, UINT index) +{ + WINMM_MMDevice *ret; + EnterCriticalSection(&g_devthread_lock); + ret = map[index]; + LeaveCriticalSection(&g_devthread_lock); + return ret; +} + /* finds the first unused Device, marks it as "open", and returns * a pointer to the device * @@ -290,9 +299,9 @@ static WINMM_Device *WINMM_FindUnusedDevice(BOOL is_out, UINT mmdevice_index) UINT i; if(is_out) - mmdevice = g_out_map[mmdevice_index]; + mmdevice = read_map(g_out_map, mmdevice_index); else - mmdevice = g_in_map[mmdevice_index]; + mmdevice = read_map(g_in_map, mmdevice_index); EnterCriticalSection(&mmdevice->lock); for(i = 0; i < MAX_DEVICES; ++i){ @@ -629,6 +638,112 @@ static HRESULT WINMM_EnumDevices(WINMM_MMDevice **devices, return S_OK; } +static HRESULT WINAPI notif_QueryInterface(IMMNotificationClient *iface, + const GUID *riid, void **obj) +{ + ERR("Unexpected QueryInterface call: %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI notif_AddRef(IMMNotificationClient *iface) +{ + return 2; +} + +static ULONG WINAPI notif_Release(IMMNotificationClient *iface) +{ + return 1; +} + +static HRESULT WINAPI notif_OnDeviceStateChanged(IMMNotificationClient *iface, + const WCHAR *device_id, DWORD new_state) +{ + TRACE("Ignoring OnDeviceStateChanged callback\n"); + return S_OK; +} + +static HRESULT WINAPI notif_OnDeviceAdded(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + TRACE("Ignoring OnDeviceAdded callback\n"); + return S_OK; +} + +static HRESULT WINAPI notif_OnDeviceRemoved(IMMNotificationClient *iface, + const WCHAR *device_id) +{ + TRACE("Ignoring OnDeviceRemoved callback\n"); + return S_OK; +} + +static HRESULT WINAPI notif_OnDefaultDeviceChanged(IMMNotificationClient *iface, + EDataFlow flow, ERole role, const WCHAR *device_id) +{ + WINMM_MMDevice ***map; + WINMM_MMDevice *prev; + UINT count, i; + + TRACE("%u %u %s\n", flow, role, wine_dbgstr_w(device_id)); + + if(role != eConsole) + return S_OK; + + EnterCriticalSection(&g_devthread_lock); + + if(flow == eRender){ + map = &g_out_map; + count = g_outmmdevices_count; + }else{ + map = &g_in_map; + count = g_inmmdevices_count; + } + + prev = (*map)[0]; + for(i = 0; i < count; ++i){ + WINMM_MMDevice *tmp; + + if(!lstrcmpW((*map)[i]->dev_id, device_id)){ + (*map)[0] = (*map)[i]; + (*map)[i] = prev; + + LeaveCriticalSection(&g_devthread_lock); + + return S_OK; + } + + tmp = (*map)[i]; + (*map)[i] = prev; + prev = tmp; + } + + WARN("Couldn't find new default device! Rearranged map for no reason.\n"); + (*map)[0] = prev; + + LeaveCriticalSection(&g_devthread_lock); + + return S_OK; +} + +static HRESULT WINAPI notif_OnPropertyValueChanged(IMMNotificationClient *iface, + const WCHAR *device_id, const PROPERTYKEY key) +{ + TRACE("Ignoring OnPropertyValueChanged callback\n"); + return S_OK; +} + +static IMMNotificationClientVtbl g_notif_vtbl = { + notif_QueryInterface, + notif_AddRef, + notif_Release, + notif_OnDeviceStateChanged, + notif_OnDeviceAdded, + notif_OnDeviceRemoved, + notif_OnDefaultDeviceChanged, + notif_OnPropertyValueChanged +}; + +static IMMNotificationClient g_notif = { &g_notif_vtbl }; + static HRESULT WINMM_InitMMDevices(void) { HRESULT hr, init_hr; @@ -644,6 +759,10 @@ static HRESULT WINMM_InitMMDevices(void) if(FAILED(hr)) goto exit; + hr = IMMDeviceEnumerator_RegisterEndpointNotificationCallback(devenum, &g_notif); + if(FAILED(hr)) + WARN("RegisterEndpointNotificationCallback failed: %08x\n", hr); + hr = WINMM_EnumDevices(&g_out_mmdevices, &g_out_map, &g_outmmdevices_count, eRender, devenum); if(FAILED(hr)){ @@ -1087,7 +1206,7 @@ static LRESULT WOD_Open(WINMM_OpenInfo *info) if(info->req_device >= g_outmmdevices_count) return MMSYSERR_BADDEVICEID; - mmdevice = g_out_map[info->req_device]; + mmdevice = read_map(g_out_map, info->req_device); if(!mmdevice->out_caps.szPname[0]) return MMSYSERR_NOTENABLED; @@ -1160,7 +1279,7 @@ static LRESULT WID_Open(WINMM_OpenInfo *info) if(info->req_device >= g_inmmdevices_count) return MMSYSERR_BADDEVICEID; - mmdevice = g_in_map[info->req_device]; + mmdevice = read_map(g_in_map, info->req_device); if(!mmdevice->in_caps.szPname[0]) return MMSYSERR_NOTENABLED; @@ -1900,10 +2019,10 @@ static WINMM_MMDevice *WINMM_GetMixerMMDevice(HMIXEROBJ hmix, DWORD flags, case MIXER_OBJECTF_MIXER: /* == 0 */ *out = HandleToULong(hmix); if(*out < g_outmmdevices_count) - return g_out_map[*out]; + return read_map(g_out_map, *out); if(*out - g_outmmdevices_count < g_inmmdevices_count){ *out -= g_outmmdevices_count; - return g_in_map[*out]; + return read_map(g_in_map, *out); } /* fall through -- if it's not a valid mixer device, then * it could be a valid mixer handle. windows seems to do @@ -1916,17 +2035,17 @@ static WINMM_MMDevice *WINMM_GetMixerMMDevice(HMIXEROBJ hmix, DWORD flags, (!is_out && *out >= g_inmmdevices_count)) return NULL; if(is_out) - return g_out_map[*out]; - return g_in_map[*out]; + return read_map(g_out_map, *out); + return read_map(g_in_map, *out); case MIXER_OBJECTF_WAVEOUT: *out = HandleToULong(hmix); if(*out < g_outmmdevices_count) - return g_out_map[*out]; + return read_map(g_out_map, *out); return NULL; case MIXER_OBJECTF_WAVEIN: *out = HandleToULong(hmix); if(*out < g_inmmdevices_count) - return g_in_map[*out]; + return read_map(g_in_map, *out); return NULL; } @@ -2440,7 +2559,7 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, if(uDeviceID >= g_outmmdevices_count) return MMSYSERR_BADDEVICEID; - caps = &g_out_map[uDeviceID]->out_caps; + caps = &read_map(g_out_map, uDeviceID)->out_caps; } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); @@ -2939,7 +3058,9 @@ static UINT WINMM_QueryInstanceIDSize(UINT device, DWORD_PTR *len, BOOL is_out) if(device >= count) return MMSYSERR_INVALHANDLE; + EnterCriticalSection(&g_devthread_lock); *len = (lstrlenW(devices[device]->dev_id) + 1) * sizeof(WCHAR); + LeaveCriticalSection(&g_devthread_lock); return MMSYSERR_NOERROR; } @@ -2963,11 +3084,15 @@ static UINT WINMM_QueryInstanceID(UINT device, WCHAR *str, DWORD_PTR len, if(device >= count) return MMSYSERR_INVALHANDLE; + EnterCriticalSection(&g_devthread_lock); id_len = (lstrlenW(devices[device]->dev_id) + 1) * sizeof(WCHAR); - if(len < id_len) + if(len < id_len){ + LeaveCriticalSection(&g_devthread_lock); return MMSYSERR_ERROR; + } memcpy(str, devices[device]->dev_id, id_len); + LeaveCriticalSection(&g_devthread_lock); return MMSYSERR_NOERROR; } @@ -3082,7 +3207,7 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi if(uDeviceID >= g_inmmdevices_count) return MMSYSERR_BADDEVICEID; - caps = &g_in_map[uDeviceID]->in_caps; + caps = &read_map(g_in_map, uDeviceID)->in_caps; } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); @@ -3495,10 +3620,10 @@ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize return MMSYSERR_BADDEVICEID; if(uDeviceID < g_outmmdevices_count){ - mmdevice = g_out_map[uDeviceID]; + mmdevice = read_map(g_out_map, uDeviceID); memcpy(caps.szPname, mmdevice->out_caps.szPname, sizeof(caps.szPname)); }else{ - mmdevice = g_in_map[uDeviceID - g_outmmdevices_count]; + mmdevice = read_map(g_in_map, uDeviceID - g_outmmdevices_count); memcpy(caps.szPname, mmdevice->in_caps.szPname, sizeof(caps.szPname)); } @@ -3541,11 +3666,11 @@ UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, return MMSYSERR_BADDEVICEID; if(uDeviceID < g_outmmdevices_count){ - mmdevice = g_out_map[uDeviceID]; + mmdevice = read_map(g_out_map, uDeviceID); *lphMix = (HMIXER)WINMM_MakeHWAVE(uDeviceID, TRUE, mmdevice->mixer_count); }else{ - mmdevice = g_in_map[uDeviceID - g_outmmdevices_count]; + mmdevice = read_map(g_in_map, uDeviceID - g_outmmdevices_count); *lphMix = (HMIXER)WINMM_MakeHWAVE(uDeviceID - g_outmmdevices_count, FALSE, mmdevice->mixer_count); }

1 0

Jacek Caban : atl: Backport some tests from atl100.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 99065bb65fa41fc49a50452eae75aace5eb4c2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99065bb65fa41fc49a50452ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 26 13:50:11 2012 +0100 atl: Backport some tests from atl100. --- dlls/atl/tests/module.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index ffa62ad..45cff06 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -58,7 +58,63 @@ static void test_StructSize(void) HeapFree (GetProcessHeap(), 0, tst); } +static void test_winmodule(void) +{ + _AtlCreateWndData create_data[3]; + _ATL_MODULEW winmod; + void *p; + HRESULT hres; + + winmod.cbSize = sizeof(winmod); + winmod.m_pCreateWndList = (void*)0xdeadbeef; + winmod.m_csWindowCreate.LockCount = 0xdeadbeef; + hres = AtlModuleInit(&winmod, NULL, NULL); + ok(hres == S_OK, "AtlModuleInit failed: %08x\n", hres); + ok(!winmod.m_pCreateWndList, "winmod.m_pCreateWndList = %p\n", winmod.m_pCreateWndList); + ok(winmod.m_csWindowCreate.LockCount == -1, "winmod.m_csWindowCreate.LockCount = %d\n", + winmod.m_csWindowCreate.LockCount); + + AtlModuleAddCreateWndData(&winmod, create_data, (void*)0xdead0001); + ok(winmod.m_pCreateWndList == create_data, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[0].m_pThis == (void*)0xdead0001, "unexpected create_data[0].m_pThis %p\n", create_data[0].m_pThis); + ok(create_data[0].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[0].m_dwThreadID %x\n", + create_data[0].m_dwThreadID); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + + AtlModuleAddCreateWndData(&winmod, create_data+1, (void*)0xdead0002); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[1].m_pThis == (void*)0xdead0002, "unexpected create_data[1].m_pThis %p\n", create_data[1].m_pThis); + ok(create_data[1].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[1].m_dwThreadID %x\n", + create_data[1].m_dwThreadID); + ok(create_data[1].m_pNext == create_data, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + AtlModuleAddCreateWndData(&winmod, create_data+2, (void*)0xdead0003); + ok(winmod.m_pCreateWndList == create_data+2, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pThis == (void*)0xdead0003, "unexpected create_data[2].m_pThis %p\n", create_data[2].m_pThis); + ok(create_data[2].m_dwThreadID == GetCurrentThreadId(), "unexpected create_data[2].m_dwThreadID %x\n", + create_data[2].m_dwThreadID); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + p = AtlModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0003, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(create_data[2].m_pNext == create_data+1, "unexpected create_data[2].m_pNext %p\n", create_data[2].m_pNext); + + create_data[1].m_dwThreadID = 0xdeadbeef; + + p = AtlModuleExtractCreateWndData(&winmod); + ok(p == (void*)0xdead0001, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); + ok(!create_data[0].m_pNext, "unexpected create_data[0].m_pNext %p\n", create_data[0].m_pNext); + ok(!create_data[1].m_pNext, "unexpected create_data[1].m_pNext %p\n", create_data[1].m_pNext); + + p = AtlModuleExtractCreateWndData(&winmod); + ok(!p, "unexpected AtlModuleExtractCreateWndData result %p\n", p); + ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); +} + START_TEST(module) { test_StructSize(); + test_winmodule(); }

1 0

Frédéric Delanoy : xdg: Fix a file handle leak ( coverity).
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: 04fb8a913cba1da03aeef0ca3dc4e4062316a306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04fb8a913cba1da03aeef0ca3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 26 12:09:58 2012 +0100 xdg: Fix a file handle leak (coverity). --- dlls/shell32/xdg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index ce8c203..d05539c 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -942,7 +942,10 @@ HRESULT XDG_UserDirLookup(const char * const *xdg_dirs, const unsigned int num_d if (FAILED(hr)) { if (hr == E_OUTOFMEMORY) + { + fclose(file); goto xdg_user_dir_lookup_error; + } continue; } }

1 0

Nikolay Sivov : xmllite: Shrink buffer when enough data processed.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: beffac006ce867c51da145ec28648432eaa9fb66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beffac006ce867c51da145ec2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 21 09:35:30 2012 +0400 xmllite: Shrink buffer when enough data processed. --- dlls/xmllite/reader.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9e32216..38c7a5e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -481,6 +481,7 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding { readerinput_grow(readerinput, len); memcpy(dest->data, src->cur, len); + dest->written += len*sizeof(WCHAR); readerinput->buffer->code_page = cp; return; } @@ -491,6 +492,22 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding MultiByteToWideChar(cp, 0, src->cur, len, ptr, dest_len); ptr[dest_len] = 0; readerinput->buffer->code_page = cp; + dest->written += dest_len*sizeof(WCHAR); +} + +/* shrinks parsed data a buffer begins with */ +static void reader_shrink(xmlreader *reader) +{ + encoded_buffer *buffer = &reader->input->buffer->utf16; + + /* avoid to move too often using threshold shrink length */ + if (buffer->cur - buffer->data > buffer->written / 2) + { + buffer->written -= buffer->cur - buffer->data; + memmove(buffer->data, buffer->cur, buffer->written); + buffer->cur = buffer->data; + *(WCHAR*)&buffer->cur[buffer->written] = 0; + } } static inline const WCHAR *reader_get_cur(xmlreader *reader) @@ -772,6 +789,7 @@ static HRESULT reader_parse_comment(xmlreader *reader) /* skip '<!--' */ reader_skipn(reader, 4); + reader_shrink(reader); ptr = start = reader_get_cur(reader); while (*ptr)

1 0

Ken Thomases : winemac.drv: Implement GetMonitorInfo.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: d8a0da9d8f28cb5aad99c35aa7398b77b1e9dd04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a0da9d8f28cb5aad99c35aa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:32 2012 -0600 winemac.drv: Implement GetMonitorInfo. --- dlls/winemac.drv/display.c | 51 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 1b791e4..a1bea38 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -105,3 +105,54 @@ BOOL CDECL macdrv_EnumDisplayMonitors(HDC hdc, LPRECT rect, MONITORENUMPROC proc return ret; } + + +/*********************************************************************** + * GetMonitorInfo (MACDRV.@) + */ +BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info) +{ + static const WCHAR adapter_name[] = { '\\','\\','.','\\','D','I','S','P','L','A','Y','1',0 }; + struct macdrv_display *displays; + int num_displays; + CGDirectDisplayID display_id; + int i; + + TRACE("%p, %p\n", monitor, info); + + if (macdrv_get_displays(&displays, &num_displays)) + { + ERR("couldn't get display list\n"); + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + + display_id = monitor_to_display_id(monitor); + for (i = 0; i < num_displays; i++) + { + if (displays[i].displayID == display_id) + break; + } + + if (i < num_displays) + { + info->rcMonitor = rect_from_cgrect(displays[i].frame); + info->rcWork = rect_from_cgrect(displays[i].work_frame); + + info->dwFlags = (i == 0) ? MONITORINFOF_PRIMARY : 0; + + if (info->cbSize >= sizeof(MONITORINFOEXW)) + lstrcpyW(((MONITORINFOEXW*)info)->szDevice, adapter_name); + + TRACE(" -> rcMonitor %s rcWork %s dwFlags %08x\n", wine_dbgstr_rect(&info->rcMonitor), + wine_dbgstr_rect(&info->rcWork), info->dwFlags); + } + else + { + ERR("invalid monitor handle\n"); + SetLastError(ERROR_INVALID_HANDLE); + } + + macdrv_free_displays(displays); + return (i < num_displays); +} diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 25b43e0..03fa490 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -5,3 +5,4 @@ # USER driver @ cdecl EnumDisplayMonitors(long ptr ptr long) macdrv_EnumDisplayMonitors +@ cdecl GetMonitorInfo(long ptr) macdrv_GetMonitorInfo

1 0

Charles Davis : loader: Build with -fno-builtin.
by Alexandre Julliard Dec. 26, 2012

Dec. 26, 2012

Module: wine Branch: master Commit: a6fdf73233d3df4435680d921f68089630bc9c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6fdf73233d3df4435680d921… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Dec 24 09:38:06 2012 -0700 loader: Build with -fno-builtin. This prevents Clang from optimizing wld_memset() into a memset(3) call. --- loader/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index 41d69c7..ecc20ab 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -1,4 +1,5 @@ DEFS = -D__WINESRC__ $(EXTRADEFS) +MODCFLAGS = @BUILTINFLAG@ C_SRCS = \ main.c \

1 0