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

Daniel Jelinski : xolehlp: Implement ITransactionImport.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 9cc5cdc174f0f9a90a87228177b149b48e6e9d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc5cdc174f0f9a90a8722817… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat May 4 20:09:34 2013 +0200 xolehlp: Implement ITransactionImport. --- dlls/xolehlp/xolehlp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 595b578..70bae1c 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -153,6 +153,7 @@ typedef struct { LONG ref; IResourceManagerFactory2 IResourceManagerFactory2_iface; ITransactionImportWhereabouts ITransactionImportWhereabouts_iface; + ITransactionImport ITransactionImport_iface; } TransactionManager; static inline TransactionManager *impl_from_ITransactionDispenser(ITransactionDispenser *iface) @@ -182,6 +183,10 @@ static HRESULT WINAPI TransactionDispenser_QueryInterface(ITransactionDispenser { *ppv = &This->ITransactionImportWhereabouts_iface; } + else if (IsEqualIID(&IID_ITransactionImport, iid)) + { + *ppv = &This->ITransactionImport_iface; + } else { FIXME("(%s): not implemented\n", debugstr_guid(iid)); @@ -345,6 +350,44 @@ static const ITransactionImportWhereaboutsVtbl TransactionImportWhereabouts_Vtbl TransactionImportWhereabouts_GetWhereabouts }; +static inline TransactionManager *impl_from_ITransactionImport(ITransactionImport *iface) +{ + return CONTAINING_RECORD(iface, TransactionManager, ITransactionImport_iface); +} + +static HRESULT WINAPI TransactionImport_QueryInterface(ITransactionImport *iface, REFIID iid, + void **ppv) +{ + TransactionManager *This = impl_from_ITransactionImport(iface); + return TransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, iid, ppv); +} + +static ULONG WINAPI TransactionImport_AddRef(ITransactionImport *iface) +{ + TransactionManager *This = impl_from_ITransactionImport(iface); + return TransactionDispenser_AddRef(&This->ITransactionDispenser_iface); +} + +static ULONG WINAPI TransactionImport_Release(ITransactionImport *iface) +{ + TransactionManager *This = impl_from_ITransactionImport(iface); + return TransactionDispenser_Release(&This->ITransactionDispenser_iface); +} +static HRESULT WINAPI TransactionImport_Import(ITransactionImport *iface, + ULONG cbTransactionCookie, byte *rgbTransactionCookie, IID *piid, void **ppvTransaction) +{ + FIXME("(%p, %u, %p, %s, %p): stub\n", iface, cbTransactionCookie, rgbTransactionCookie, debugstr_guid(piid), ppvTransaction); + + if (!rgbTransactionCookie || !piid || !ppvTransaction) return E_INVALIDARG; + return E_NOTIMPL; +} +static const ITransactionImportVtbl TransactionImport_Vtbl = { + TransactionImport_QueryInterface, + TransactionImport_AddRef, + TransactionImport_Release, + TransactionImport_Import +}; + static HRESULT TransactionManager_Create(REFIID riid, void **ppv) { TransactionManager *This; @@ -356,6 +399,7 @@ static HRESULT TransactionManager_Create(REFIID riid, void **ppv) This->ITransactionDispenser_iface.lpVtbl = &TransactionDispenser_Vtbl; This->IResourceManagerFactory2_iface.lpVtbl = &ResourceManagerFactory2_Vtbl; This->ITransactionImportWhereabouts_iface.lpVtbl = &TransactionImportWhereabouts_Vtbl; + This->ITransactionImport_iface.lpVtbl = &TransactionImport_Vtbl; This->ref = 1; ret = ITransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, riid, ppv);

1 0

Andrew Eikum : dsound: Copy SetFormat format more directly if we' re not in PRIMARYWRITE mode.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: e60e09e2d185501568f60ce2ce1d73065d904c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e60e09e2d185501568f60ce2c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 28 14:05:47 2013 -0500 dsound: Copy SetFormat format more directly if we're not in PRIMARYWRITE mode. --- dlls/dsound/primary.c | 65 +++++++++++------------------------------ dlls/dsound/tests/dsound.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 47 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0bfd5667..a824477 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -440,35 +440,24 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP return DS_OK; } -static DWORD DSOUND_GetFormatSize(LPCWAVEFORMATEX wfex) +WAVEFORMATEX *DSOUND_CopyFormat(const WAVEFORMATEX *wfex) { - if (wfex->wFormatTag == WAVE_FORMAT_PCM) - return sizeof(WAVEFORMATEX); - else - return sizeof(WAVEFORMATEX) + wfex->cbSize; -} + WAVEFORMATEX *pwfx; + if(wfex->wFormatTag == WAVE_FORMAT_PCM){ + pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX)); + CopyMemory(pwfx, wfex, sizeof(PCMWAVEFORMAT)); + pwfx->cbSize = 0; + }else{ + pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX) + wfex->cbSize); + CopyMemory(pwfx, wfex, sizeof(WAVEFORMATEX) + wfex->cbSize); + } -LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) -{ - DWORD size = DSOUND_GetFormatSize(wfex); - LPWAVEFORMATEX pwfx = HeapAlloc(GetProcessHeap(),0,size); - if (pwfx == NULL) { - WARN("out of memory\n"); - } else if (wfex->wFormatTag != WAVE_FORMAT_PCM) { - CopyMemory(pwfx, wfex, size); - } else { - CopyMemory(pwfx, wfex, sizeof(PCMWAVEFORMAT)); - pwfx->cbSize=0; - if (pwfx->nBlockAlign != pwfx->nChannels * pwfx->wBitsPerSample/8) { - WARN("Fixing bad nBlockAlign (%u)\n", pwfx->nBlockAlign); - pwfx->nBlockAlign = pwfx->nChannels * pwfx->wBitsPerSample/8; - } - if (pwfx->nAvgBytesPerSec != pwfx->nSamplesPerSec * pwfx->nBlockAlign) { - WARN("Fixing bad nAvgBytesPerSec (%u)\n", pwfx->nAvgBytesPerSec); - pwfx->nAvgBytesPerSec = pwfx->nSamplesPerSec * pwfx->nBlockAlign; - } - } - return pwfx; + if(pwfx->wFormatTag == WAVE_FORMAT_PCM || + (pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&((const WAVEFORMATEXTENSIBLE*)pwfx)->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) + pwfx->nBlockAlign = (pwfx->nChannels * pwfx->wBitsPerSample) / 8; + + return pwfx; } HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passed_fmt) @@ -545,27 +534,9 @@ done: device->primary_pwfx = old_fmt; else HeapFree(GetProcessHeap(), 0, old_fmt); - } else if (passed_fmt->wFormatTag == WAVE_FORMAT_PCM || - passed_fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { - /* Fill in "real" values to primary_pwfx */ - WAVEFORMATEX *fmt = device->primary_pwfx; - - *fmt = *device->pwfx; - fmtex = (void*)device->pwfx; - - if (IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) && - passed_fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { - fmt->wFormatTag = WAVE_FORMAT_IEEE_FLOAT; - } else { - fmt->wFormatTag = WAVE_FORMAT_PCM; - fmt->wBitsPerSample = 16; - } - fmt->nBlockAlign = fmt->nChannels * fmt->wBitsPerSample / 8; - fmt->nAvgBytesPerSec = fmt->nBlockAlign * fmt->nSamplesPerSec; - fmt->cbSize = 0; } else { - device->primary_pwfx = HeapReAlloc(GetProcessHeap(), 0, device->primary_pwfx, sizeof(*fmtex)); - memcpy(device->primary_pwfx, device->pwfx, sizeof(*fmtex)); + HeapFree(GetProcessHeap(), 0, device->primary_pwfx); + device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); } out: diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 4291e7a..bca0d76 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1348,6 +1348,15 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) rc = IDirectSoundBuffer_SetFormat(primary, &wfx); ok(rc == S_OK, "SetFormat: %08x\n", rc); + rc = IDirectSoundBuffer_GetFormat(primary, &wfx, sizeof(wfx), NULL); + ok(rc == S_OK, "GetFormat: %08x\n", rc); + ok(wfx.wFormatTag == WAVE_FORMAT_PCM, "format: 0x%x\n", wfx.wFormatTag); + ok(wfx.nChannels == 2, "channels: %u\n", wfx.nChannels); + ok(wfx.nSamplesPerSec == 44100, "rate: %u\n", wfx.nSamplesPerSec); + ok(wfx.wBitsPerSample == 16, "bps: %u\n", wfx.wBitsPerSample); + ok(wfx.nBlockAlign == 4, "blockalign: %u\n", wfx.nBlockAlign); + ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "avgbytes: %u\n", wfx.nAvgBytesPerSec); + wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; wfx.wBitsPerSample = 16; @@ -1356,6 +1365,15 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) rc = IDirectSoundBuffer_SetFormat(primary, &wfx); ok(rc == S_OK, "SetFormat: %08x\n", rc); + rc = IDirectSoundBuffer_GetFormat(primary, &wfx, sizeof(wfx), NULL); + ok(rc == S_OK, "GetFormat: %08x\n", rc); + ok(wfx.wFormatTag == WAVE_FORMAT_PCM, "format: 0x%x\n", wfx.wFormatTag); + ok(wfx.nChannels == 2, "channels: %u\n", wfx.nChannels); + ok(wfx.nSamplesPerSec == 44100, "rate: %u\n", wfx.nSamplesPerSec); + ok(wfx.wBitsPerSample == 16, "bps: %u\n", wfx.wBitsPerSample); + ok(wfx.nBlockAlign == 4, "blockalign: %u\n", wfx.nBlockAlign); + ok(wfx.nAvgBytesPerSec == 44100 * 4 - 1, "avgbytes: %u\n", wfx.nAvgBytesPerSec); + wfx.nChannels = 2; wfx.nSamplesPerSec = 44100; wfx.wBitsPerSample = 16; @@ -1364,6 +1382,33 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) rc = IDirectSoundBuffer_SetFormat(primary, &wfx); ok(rc == S_OK, "SetFormat: %08x\n", rc); + rc = IDirectSoundBuffer_GetFormat(primary, &wfx, sizeof(wfx), NULL); + ok(rc == S_OK, "GetFormat: %08x\n", rc); + ok(wfx.wFormatTag == WAVE_FORMAT_PCM, "format: 0x%x\n", wfx.wFormatTag); + ok(wfx.nChannels == 2, "channels: %u\n", wfx.nChannels); + ok(wfx.nSamplesPerSec == 44100, "rate: %u\n", wfx.nSamplesPerSec); + ok(wfx.wBitsPerSample == 16, "bps: %u\n", wfx.wBitsPerSample); + ok(wfx.nBlockAlign == 4, "blockalign: %u\n", wfx.nBlockAlign); + ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "avgbytes: %u\n", wfx.nAvgBytesPerSec); + + wfx.wFormatTag = WAVE_FORMAT_ALAW; + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = IDirectSoundBuffer_SetFormat(primary, &wfx); + ok(rc == S_OK, "SetFormat: %08x\n", rc); + + rc = IDirectSoundBuffer_GetFormat(primary, &wfx, sizeof(wfx), NULL); + ok(rc == S_OK, "GetFormat: %08x\n", rc); + ok(wfx.wFormatTag == WAVE_FORMAT_ALAW, "format: 0x%x\n", wfx.wFormatTag); + ok(wfx.nChannels == 2, "channels: %u\n", wfx.nChannels); + ok(wfx.nSamplesPerSec == 44100, "rate: %u\n", wfx.nSamplesPerSec); + ok(wfx.wBitsPerSample == 16, "bps: %u\n", wfx.wBitsPerSample); + ok(wfx.nBlockAlign == 4, "blockalign: %u\n", wfx.nBlockAlign); + ok(wfx.nAvgBytesPerSec == 44100 * 4, "avgbytes: %u\n", wfx.nAvgBytesPerSec); + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; fmtex.Format.nChannels = 2; @@ -1377,6 +1422,19 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) rc = IDirectSoundBuffer_SetFormat(primary, (WAVEFORMATEX*)&fmtex); ok(rc == S_OK, "SetFormat: %08x\n", rc); + rc = IDirectSoundBuffer_GetFormat(primary, (WAVEFORMATEX*)&fmtex, sizeof(fmtex), NULL); + ok(rc == S_OK, "GetFormat: %08x\n", rc); + ok(fmtex.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "format: 0x%x\n", fmtex.Format.wFormatTag); + ok(fmtex.Format.nChannels == 2, "channels: %u\n", fmtex.Format.nChannels); + ok(fmtex.Format.nSamplesPerSec == 44100, "rate: %u\n", fmtex.Format.nSamplesPerSec); + ok(fmtex.Format.wBitsPerSample == 16, "bps: %u\n", fmtex.Format.wBitsPerSample); + ok(fmtex.Format.nBlockAlign == 4, "blockalign: %u\n", fmtex.Format.nBlockAlign); + ok(fmtex.Format.nAvgBytesPerSec == 44100 * 4, "avgbytes: %u\n", fmtex.Format.nAvgBytesPerSec); + ok(fmtex.Samples.wValidBitsPerSample == 0 || /* <= XP */ + fmtex.Samples.wValidBitsPerSample == 16, /* >= Vista */ + "validbits: %u\n", fmtex.Samples.wValidBitsPerSample); + ok(IsEqualGUID(&fmtex.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM), "subtype incorrect\n"); + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; fmtex.Format.nChannels = 2; @@ -1390,6 +1448,17 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) rc = IDirectSoundBuffer_SetFormat(primary, (WAVEFORMATEX*)&fmtex); ok(rc == S_OK, "SetFormat: %08x\n", rc); + rc = IDirectSoundBuffer_GetFormat(primary, (WAVEFORMATEX*)&fmtex, sizeof(fmtex), NULL); + ok(rc == S_OK, "GetFormat: %08x\n", rc); + ok(fmtex.Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "format: 0x%x\n", fmtex.Format.wFormatTag); + ok(fmtex.Format.nChannels == 2, "channels: %u\n", fmtex.Format.nChannels); + ok(fmtex.Format.nSamplesPerSec == 44100, "rate: %u\n", fmtex.Format.nSamplesPerSec); + ok(fmtex.Format.wBitsPerSample == 24, "bps: %u\n", fmtex.Format.wBitsPerSample); + ok(fmtex.Format.nBlockAlign == 6, "blockalign: %u\n", fmtex.Format.nBlockAlign); + ok(fmtex.Format.nAvgBytesPerSec == 44100 * 6, "avgbytes: %u\n", fmtex.Format.nAvgBytesPerSec); + ok(fmtex.Samples.wValidBitsPerSample == 20, "validbits: %u\n", fmtex.Samples.wValidBitsPerSample); + ok(IsEqualGUID(&fmtex.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM), "subtype incorrect\n"); + fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; fmtex.Format.nChannels = 2;

1 0

Ken Thomases : winemac: By default, make full-screen windows not float when not the active app.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: c3d2e4306095b99d8078f3ce6a8a8f3e45a37e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d2e4306095b99d8078f3ce6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 29 09:21:25 2013 -0500 winemac: By default, make full-screen windows not float when not the active app. Added a registry setting to control the behavior: WindowsFloatWhenInactive with possible values "none", "all, and "nonfullscreen" which is the default. --- dlls/winemac.drv/cocoa_window.m | 13 +++++--- dlls/winemac.drv/macdrv_cocoa.h | 7 ++++ dlls/winemac.drv/macdrv_main.c | 66 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d2b2547..a47715a 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -577,20 +577,23 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (NSInteger) minimumLevelForActive:(BOOL)active { + NSScreen* screen; + BOOL fullscreen; NSInteger level; - if (self.floating) + screen = screen_covered_by_rect([self frame], [NSScreen screens]); + fullscreen = (screen != nil); + + if (self.floating && (active || topmost_float_inactive == TOPMOST_FLOAT_INACTIVE_ALL || + (topmost_float_inactive == TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN && !fullscreen))) level = NSFloatingWindowLevel; else level = NSNormalWindowLevel; if (active) { - BOOL fullscreen, captured; - NSScreen* screen; + BOOL captured; - screen = screen_covered_by_rect([self frame], [NSScreen screens]); - fullscreen = (screen != nil); captured = (screen || [self screen]) && [[WineApplicationController sharedController] areDisplaysCaptured]; if (captured || fullscreen) diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 905738f..e7e2c4c 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -111,6 +111,12 @@ enum { DRAG_OP_EVERY = UINT32_MAX }; +enum { + TOPMOST_FLOAT_INACTIVE_NONE, + TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN, + TOPMOST_FLOAT_INACTIVE_ALL, +}; + typedef struct macdrv_opaque_window* macdrv_window; typedef struct macdrv_opaque_event_queue* macdrv_event_queue; @@ -129,6 +135,7 @@ struct macdrv_display { /* main */ extern int macdrv_err_on; +extern int topmost_float_inactive DECLSPEC_HIDDEN; extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 501b7d5..cf036c4 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -26,6 +26,7 @@ #include "macdrv.h" #include "winuser.h" +#include "winreg.h" #include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(macdrv); @@ -41,6 +42,8 @@ C_ASSERT(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; +int topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN; + /************************************************************************** * debugstr_cf @@ -91,6 +94,67 @@ static void set_app_icon(void) /*********************************************************************** + * get_config_key + * + * Get a config key from either the app-specific or the default config + */ +static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char *name, + char *buffer, DWORD size) +{ + if (appkey && !RegQueryValueExA(appkey, name, 0, NULL, (LPBYTE)buffer, &size)) return 0; + if (defkey && !RegQueryValueExA(defkey, name, 0, NULL, (LPBYTE)buffer, &size)) return 0; + return ERROR_FILE_NOT_FOUND; +} + + +/*********************************************************************** + * setup_options + * + * Set up the Mac driver options. + */ +static void setup_options(void) +{ + char buffer[MAX_PATH + 16]; + HKEY hkey, appkey = 0; + DWORD len; + + /* @@ Wine registry key: HKCU\Software\Wine\Mac Driver */ + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Mac Driver", &hkey)) hkey = 0; + + /* open the app-specific key */ + + len = GetModuleFileNameA(0, buffer, MAX_PATH); + if (len && len < MAX_PATH) + { + HKEY tmpkey; + char *p, *appname = buffer; + if ((p = strrchr(appname, '/'))) appname = p + 1; + if ((p = strrchr(appname, '\\'))) appname = p + 1; + strcat(appname, "\\Mac Driver"); + /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Mac Driver */ + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey)) + { + if (RegOpenKeyA(tmpkey, appname, &appkey)) appkey = 0; + RegCloseKey(tmpkey); + } + } + + if (!get_config_key(hkey, appkey, "WindowsFloatWhenInactive", buffer, sizeof(buffer))) + { + if (!strcmp(buffer, "none")) + topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONE; + else if (!strcmp(buffer, "all")) + topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_ALL; + else + topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN; + } + + if (appkey) RegCloseKey(appkey); + if (hkey) RegCloseKey(hkey); +} + + +/*********************************************************************** * process_attach */ static BOOL process_attach(void) @@ -102,6 +166,8 @@ static BOOL process_attach(void) if (status != noErr || !(attributes & sessionHasGraphicAccess)) return FALSE; + setup_options(); + if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; macdrv_err_on = ERR_ON(macdrv);

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_Directory.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 074e6c74542e5aeef26a68a0ac1b274e66ce4a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=074e6c74542e5aeef26a68a0a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 29 12:16:44 2013 +0200 wbemprox: Add a partial implementation of Win32_Directory. --- dlls/wbemprox/builtin.c | 256 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 250 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=074e6c74542e5aeef26a6…

1 0

Dmitry Timoshkov : kernel32: Fix a typo.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 495c1c0086b59ebcd84caace1d630f4ad2c5e11f URL: http://source.winehq.org/git/wine.git/?a=commit;h=495c1c0086b59ebcd84caace1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 29 10:39:54 2013 +0900 kernel32: Fix a typo. --- dlls/kernel32/tests/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 350c858..64e333e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1612,8 +1612,8 @@ static void test_GetProcessVersion(void) si.cb = sizeof(si); si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_HIDE; - ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); SetLastError(0xdeadbeef); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess error %u\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Henri Verbeet : wined3d: Add support for GLSL based fixed function vertex shaders.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 2014141a253a791fc9c79aae3c8ef3c35b73e658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2014141a253a791fc9c79aae3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 29 09:45:35 2013 +0200 wined3d: Add support for GLSL based fixed function vertex shaders. --- dlls/wined3d/directx.c | 10 +- dlls/wined3d/glsl_shader.c | 541 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 41 ++-- dlls/wined3d/utils.c | 96 +++++++ dlls/wined3d/wined3d_private.h | 83 ++++++ 5 files changed, 738 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2014141a253a791fc9c79…

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMATERIAL2.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 735e69f94e8fe8b7f357b1b4b5e12b0437f69ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=735e69f94e8fe8b7f357b1b4b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 29 09:45:39 2013 +0200 d3drm: Avoid LPDIRECT3DRMMATERIAL2. --- dlls/d3drm/d3drm.c | 15 ++++++--------- dlls/d3drm/frame.c | 14 ++++---------- dlls/d3drm/meshbuilder.c | 14 +++++++------- dlls/d3drm/tests/d3drm.c | 38 +++++++++++++++++++------------------- include/d3drm.h | 2 +- include/d3drmobj.h | 10 +++++----- 6 files changed, 42 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=735e69f94e8fe8b7f357b…

1 0

Alexandre Julliard : comdlg32: Scale the listboxes in the font dialog with the font size.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 60b5ae785a850ee94cdff6254ec6be5abfc28936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b5ae785a850ee94cdff6254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 16:28:48 2013 +0200 comdlg32: Scale the listboxes in the font dialog with the font size. --- dlls/comdlg32/fontdlg.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 25dc1e4..e5b87bf 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -782,7 +782,7 @@ static LRESULT CFn_WMMeasureItem(HWND hDlg, LPARAM lParam) /* use MAX of bitmap height and tm.tmHeight .*/ hdc=GetDC(hDlg); if(!hdc) return 0; - hfontprev = SelectObject( hdc, GetStockObject( DEFAULT_GUI_FONT ) ); + hfontprev = SelectObject( hdc, (HFONT)SendMessageW( hDlg, WM_GETFONT, 0, 0 )); GetTextMetricsW(hdc, &tm); if( tm.tmHeight > lpmi->itemHeight) lpmi->itemHeight = tm.tmHeight; SelectObject(hdc, hfontprev); @@ -801,7 +801,7 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) COLORREF cr, oldText=0, oldBk=0; RECT rect; int nFontType; - int idx; + int cx, cy, idx; LPDRAWITEMSTRUCT lpdi = (LPDRAWITEMSTRUCT)lParam; if (lpdi->itemID == (UINT)-1) /* got no items */ @@ -830,9 +830,10 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) { case cmb1: /* TRACE(commdlg,"WM_Drawitem cmb1\n"); */ + ImageList_GetIconSize( himlTT, &cx, &cy); SendMessageW(lpdi->hwndItem, CB_GETLBTEXT, lpdi->itemID, (LPARAM)buffer); - TextOutW(lpdi->hDC, lpdi->rcItem.left + TTBITMAP_XSIZE + 10, + TextOutW(lpdi->hDC, lpdi->rcItem.left + cx + 4, lpdi->rcItem.top, buffer, lstrlenW(buffer)); nFontType = SendMessageW(lpdi->hwndItem, CB_GETITEMDATA, lpdi->itemID,0L); idx = -1; @@ -848,7 +849,7 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam) idx = 1; /* picture: printer */ if( idx >= 0) ImageList_Draw( himlTT, idx, lpdi->hDC, lpdi->rcItem.left, - lpdi->rcItem.top, ILD_TRANSPARENT); + (lpdi->rcItem.top + lpdi->rcItem.bottom - cy) / 2, ILD_TRANSPARENT); break; case cmb2: case cmb3:

1 0

Francois Gouget : oleaut32/tests: Add a trailing '\n' to a couple of ok() calls.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: 440e936abe234fa5f6378d9ca76ef018b816f89a URL: http://source.winehq.org/git/wine.git/?a=commit;h=440e936abe234fa5f6378d9ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 29 07:45:54 2013 +0200 oleaut32/tests: Add a trailing '\n' to a couple of ok() calls. --- dlls/oleaut32/tests/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 32d8a04..0bc1854 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3410,14 +3410,14 @@ static void test_TypeInfo2_GetContainingTypeLib(void) Index = 888; hr = ITypeInfo2_GetContainingTypeLib(ti2, &tl, &Index); ok_ole_success(hr, ITypeInfo2_GetContainingTypeLib); - ok(tl != NULL, "ITypeInfo2_GetContainingTypeLib returned empty TypeLib"); + ok(tl != NULL, "ITypeInfo2_GetContainingTypeLib returned empty TypeLib\n"); ok(Index == 0, "ITypeInfo2_GetContainingTypeLib returned Index = %u, expected 0\n", Index); if(tl) ITypeLib_Release(tl); tl = NULL; hr = ITypeInfo2_GetContainingTypeLib(ti2, &tl, NULL); ok_ole_success(hr, ITypeInfo2_GetContainingTypeLib); - ok(tl != NULL, "ITypeInfo2_GetContainingTypeLib returned empty TypeLib"); + ok(tl != NULL, "ITypeInfo2_GetContainingTypeLib returned empty TypeLib\n"); if(tl) ITypeLib_Release(tl); Index = 888;

1 0

Andrew Eikum : oleaut32: Implement ICreateTypeInfo::SetFuncHelpContext.
by Alexandre Julliard May 29, 2013

May 29, 2013

Module: wine Branch: master Commit: aec4504c8ad60b1c3830debd11e0b3e4ceaf4bba URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec4504c8ad60b1c3830debd1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 28 17:00:36 2013 -0500 oleaut32: Implement ICreateTypeInfo::SetFuncHelpContext. --- dlls/oleaut32/typelib.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9b84c06..922e9ab 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8888,8 +8888,16 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncHelpContext(ICreateTypeInfo2 *if UINT index, DWORD helpContext) { ITypeInfoImpl *This = info_impl_from_ICreateTypeInfo2(iface); - FIXME("%p %u %d - stub\n", This, index, helpContext); - return E_NOTIMPL; + TLBFuncDesc *func_desc = &This->funcdescs[index]; + + TRACE("%p %u %d\n", This, index, helpContext); + + if(index >= This->TypeAttr.cFuncs) + return TYPE_E_ELEMENTNOTFOUND; + + func_desc->helpcontext = helpContext; + + return S_OK; } static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext(ICreateTypeInfo2 *iface,

1 0