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

Aric Stewart : gdi32/tests: Do not try to test OS/ 2 win metrics on non-windows fonts.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 3108f3cf3d99aac1983cc5256afa87752899275e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3108f3cf3d99aac1983cc5256… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 29 06:53:51 2013 -0500 gdi32/tests: Do not try to test OS/2 win metrics on non-windows fonts. --- dlls/gdi32/tests/font.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fdb6451..b57a630 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3077,19 +3077,13 @@ static void test_text_metrics(const LOGFONT *lf, const NEWTEXTMETRIC *ntm) ret = GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size); ok(ret == size, "GetFontData should return %u not %u\n", size, ret); - ascent = GET_BE_WORD(tt_os2.usWinAscent); - descent = GET_BE_WORD(tt_os2.usWinDescent); - cell_height = ascent + descent; - ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", - font_name, ntm->ntmCellHeight, cell_height, ascent, descent); - SetLastError(0xdeadbeef); ret = GetTextMetricsA(hdc, &tmA); ok(ret, "GetTextMetricsA error %u\n", GetLastError()); if(!get_first_last_from_cmap(hdc, &cmap_first, &cmap_last, &cmap_type)) { - skip("Unable to retrieve first and last glyphs from cmap\n"); + skip("%s is not a Windows font, OS/2 metrics may be invalid.\n",font_name); } else { @@ -3099,6 +3093,12 @@ static void test_text_metrics(const LOGFONT *lf, const NEWTEXTMETRIC *ntm) USHORT version; TEXTMETRICW tmW; + ascent = GET_BE_WORD(tt_os2.usWinAscent); + descent = GET_BE_WORD(tt_os2.usWinDescent); + cell_height = ascent + descent; + ok(ntm->ntmCellHeight == cell_height, "%s: ntmCellHeight %u != %u, os2.usWinAscent/os2.usWinDescent %u/%u\n", + font_name, ntm->ntmCellHeight, cell_height, ascent, descent); + version = GET_BE_WORD(tt_os2.version); os2_first_char = GET_BE_WORD(tt_os2.usFirstCharIndex);

1 0

Sergey Guralnik : user32/tests: Fix a typo.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: e3219fa426f141098558dcb069cf7c96b2584bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3219fa426f141098558dcb06… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed May 29 10:56:17 2013 +0300 user32/tests: Fix a typo. --- dlls/user32/tests/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 37d210e..20d8d9f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7353,12 +7353,12 @@ static void test_update_region(void) rgn1 = CreateRectRgn(0, 0, 0, 0); ok(GetUpdateRgn(parent, rgn1, FALSE) == NULLREGION, - "has invalid area after ValidRgn(NULL)\n"); + "has invalid area after ValidateRgn(NULL)\n"); GetUpdateRgn(hwnd, rgn1, FALSE); rgn2 = CreateRectRgnIndirect(&rc); ok(EqualRgn(rgn1, rgn2), "assigned and retrieved update regions are different\n"); ok(GetUpdateRgn(child, rgn2, FALSE) == NULLREGION, - "has invalid area after ValidRgn(NULL)\n"); + "has invalid area after ValidateRgn(NULL)\n"); SetWindowPos(hwnd, 0, wnd_orig.x, wnd_orig.y, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE);

1 0

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

29 May '13

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

Ken Thomases : winemac: Add Hide, Hide Others, and Show All items to the application menu.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: d8269a0586b75ca1be3ad28125f7af9c283bd275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8269a0586b75ca1be3ad2812… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 29 10:30:41 2013 -0500 winemac: Add Hide, Hide Others, and Show All items to the application menu. --- dlls/winemac.drv/cocoa_app.m | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index bdf4d92..4a54f66 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -205,8 +205,23 @@ int macdrv_err_on; mainMenu = [[[NSMenu alloc] init] autorelease]; + // Application menu submenu = [[[NSMenu alloc] initWithTitle:@"Wine"] autorelease]; bundleName = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleNameKey]; + + if ([bundleName length]) + title = [NSString stringWithFormat:@"Hide %@", bundleName]; + else + title = @"Hide"; + item = [submenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@""]; + + item = [submenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"]; + [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; + + item = [submenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""]; + + [submenu addItem:[NSMenuItem separatorItem]]; + if ([bundleName length]) title = [NSString stringWithFormat:@"Quit %@", bundleName]; else @@ -218,6 +233,7 @@ int macdrv_err_on; [item setSubmenu:submenu]; [mainMenu addItem:item]; + // Window menu submenu = [[[NSMenu alloc] initWithTitle:@"Window"] autorelease]; [submenu addItemWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@""]; [submenu addItemWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""];

1 0

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

29 May '13

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

Daniel Jelinski : include: Add txdtc.idl and txcoord.idl.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 7cb98146c6aafc94cad53eeecaa9c3ce3af8b443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb98146c6aafc94cad53eeec… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 1 20:28:10 2013 +0200 include: Add txdtc.idl and txcoord.idl. --- .gitignore | 2 + include/Makefile.in | 2 + include/txcoord.idl | 181 ++++++++++++++++++ include/txdtc.idl | 515 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 700 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7cb98146c6aafc94cad53…

1 0

Daniel Jelinski : xolehlp: Implement ITransactionImportWhereabouts.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: cabae2b02dcbc3e3bc856ff87ef9c6871693e17e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabae2b02dcbc3e3bc856ff87… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 1 21:38:22 2013 +0200 xolehlp: Implement ITransactionImportWhereabouts. --- dlls/xolehlp/xolehlp.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 2ebc395..b6aaa0f 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" #include "transact.h" +#include "initguid.h" #include "txdtc.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -31,6 +32,7 @@ typedef struct { ITransactionDispenser ITransactionDispenser_iface; LONG ref; IResourceManagerFactory2 IResourceManagerFactory2_iface; + ITransactionImportWhereabouts ITransactionImportWhereabouts_iface; } TransactionManager; static inline TransactionManager *impl_from_ITransactionDispenser(ITransactionDispenser *iface) @@ -56,6 +58,10 @@ static HRESULT WINAPI TransactionDispenser_QueryInterface(ITransactionDispenser { *ppv = &This->IResourceManagerFactory2_iface; } + else if (IsEqualIID(&IID_ITransactionImportWhereabouts, iid)) + { + *ppv = &This->ITransactionImportWhereabouts_iface; + } else { FIXME("(%s): not implemented\n", debugstr_guid(iid)); @@ -170,6 +176,51 @@ static const IResourceManagerFactory2Vtbl ResourceManagerFactory2_Vtbl = { ResourceManagerFactory2_CreateEx }; +static inline TransactionManager *impl_from_ITransactionImportWhereabouts(ITransactionImportWhereabouts *iface) +{ + return CONTAINING_RECORD(iface, TransactionManager, ITransactionImportWhereabouts_iface); +} + +static HRESULT WINAPI TransactionImportWhereabouts_QueryInterface(ITransactionImportWhereabouts *iface, REFIID iid, + void **ppv) +{ + TransactionManager *This = impl_from_ITransactionImportWhereabouts(iface); + return TransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, iid, ppv); +} + +static ULONG WINAPI TransactionImportWhereabouts_AddRef(ITransactionImportWhereabouts *iface) +{ + TransactionManager *This = impl_from_ITransactionImportWhereabouts(iface); + return TransactionDispenser_AddRef(&This->ITransactionDispenser_iface); +} + +static ULONG WINAPI TransactionImportWhereabouts_Release(ITransactionImportWhereabouts *iface) +{ + TransactionManager *This = impl_from_ITransactionImportWhereabouts(iface); + return TransactionDispenser_Release(&This->ITransactionDispenser_iface); +} +static HRESULT WINAPI TransactionImportWhereabouts_GetWhereaboutsSize(ITransactionImportWhereabouts *iface, + ULONG *pcbWhereabouts) +{ + FIXME("(%p, %p): stub\n", iface, pcbWhereabouts); + + return E_NOTIMPL; +} +static HRESULT WINAPI TransactionImportWhereabouts_GetWhereabouts(ITransactionImportWhereabouts *iface, + ULONG cbWhereabouts, BYTE *rgbWhereabouts,ULONG *pcbUsed) +{ + FIXME("(%p, %u, %p, %p): stub\n", iface, cbWhereabouts, rgbWhereabouts, pcbUsed); + + return E_NOTIMPL; +} +static const ITransactionImportWhereaboutsVtbl TransactionImportWhereabouts_Vtbl = { + TransactionImportWhereabouts_QueryInterface, + TransactionImportWhereabouts_AddRef, + TransactionImportWhereabouts_Release, + TransactionImportWhereabouts_GetWhereaboutsSize, + TransactionImportWhereabouts_GetWhereabouts +}; + static HRESULT TransactionManager_Create(REFIID riid, void **ppv) { TransactionManager *This; @@ -180,6 +231,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->ref = 1; ret = ITransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, riid, ppv);

1 0

Daniel Jelinski : xolehlp: Implement IResourceManagerFactory2.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: d673ae69027ae4f36abf6c26dfe1886fc6b989cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d673ae69027ae4f36abf6c26d… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 1 21:22:10 2013 +0200 xolehlp: Implement IResourceManagerFactory2. --- dlls/xolehlp/xolehlp.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 2d686cc..2ebc395 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" #include "transact.h" +#include "txdtc.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -29,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(xolehlp); typedef struct { ITransactionDispenser ITransactionDispenser_iface; LONG ref; + IResourceManagerFactory2 IResourceManagerFactory2_iface; } TransactionManager; static inline TransactionManager *impl_from_ITransactionDispenser(ITransactionDispenser *iface) @@ -49,6 +51,11 @@ static HRESULT WINAPI TransactionDispenser_QueryInterface(ITransactionDispenser { *ppv = &This->ITransactionDispenser_iface; } + else if (IsEqualIID(&IID_IResourceManagerFactory, iid) || + IsEqualIID(&IID_IResourceManagerFactory2, iid)) + { + *ppv = &This->IResourceManagerFactory2_iface; + } else { FIXME("(%s): not implemented\n", debugstr_guid(iid)); @@ -116,6 +123,53 @@ static const ITransactionDispenserVtbl TransactionDispenser_Vtbl = { TransactionDispenser_BeginTransaction }; +static inline TransactionManager *impl_from_IResourceManagerFactory2(IResourceManagerFactory2 *iface) +{ + return CONTAINING_RECORD(iface, TransactionManager, IResourceManagerFactory2_iface); +} + +static HRESULT WINAPI ResourceManagerFactory2_QueryInterface(IResourceManagerFactory2 *iface, REFIID iid, + void **ppv) +{ + TransactionManager *This = impl_from_IResourceManagerFactory2(iface); + return TransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, iid, ppv); +} + +static ULONG WINAPI ResourceManagerFactory2_AddRef(IResourceManagerFactory2 *iface) +{ + TransactionManager *This = impl_from_IResourceManagerFactory2(iface); + return TransactionDispenser_AddRef(&This->ITransactionDispenser_iface); +} + +static ULONG WINAPI ResourceManagerFactory2_Release(IResourceManagerFactory2 *iface) +{ + TransactionManager *This = impl_from_IResourceManagerFactory2(iface); + return TransactionDispenser_Release(&This->ITransactionDispenser_iface); +} +static HRESULT WINAPI ResourceManagerFactory2_Create(IResourceManagerFactory2 *iface, + GUID *pguidRM, CHAR *pszRMName, IResourceManagerSink *pIResMgrSink, IResourceManager **ppResMgr) +{ + FIXME("(%p, %s, %s, %p, %p): stub\n", iface, debugstr_guid(pguidRM), + debugstr_a(pszRMName), pIResMgrSink, ppResMgr); + + return E_NOTIMPL; +} +static HRESULT WINAPI ResourceManagerFactory2_CreateEx(IResourceManagerFactory2 *iface, + GUID *pguidRM, CHAR *pszRMName, IResourceManagerSink *pIResMgrSink, REFIID riidRequested, void **ppResMgr) +{ + FIXME("(%p, %s, %s, %p, %s, %p): stub\n", iface, debugstr_guid(pguidRM), + debugstr_a(pszRMName), pIResMgrSink, debugstr_guid(riidRequested), ppResMgr); + + return E_NOTIMPL; +} +static const IResourceManagerFactory2Vtbl ResourceManagerFactory2_Vtbl = { + ResourceManagerFactory2_QueryInterface, + ResourceManagerFactory2_AddRef, + ResourceManagerFactory2_Release, + ResourceManagerFactory2_Create, + ResourceManagerFactory2_CreateEx +}; + static HRESULT TransactionManager_Create(REFIID riid, void **ppv) { TransactionManager *This; @@ -125,6 +179,7 @@ static HRESULT TransactionManager_Create(REFIID riid, void **ppv) if (!This) return E_OUTOFMEMORY; This->ITransactionDispenser_iface.lpVtbl = &TransactionDispenser_Vtbl; + This->IResourceManagerFactory2_iface.lpVtbl = &ResourceManagerFactory2_Vtbl; This->ref = 1; ret = ITransactionDispenser_QueryInterface(&This->ITransactionDispenser_iface, riid, ppv);

1 0

Daniel Jelinski : xolehlp: Implement IResourceManager.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 1fca23e637037a8d0a661c484645f0bf17ba9735 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fca23e637037a8d0a661c484… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Wed May 1 22:11:06 2013 +0200 xolehlp: Implement IResourceManager. --- dlls/xolehlp/xolehlp.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 125 insertions(+), 5 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index b6aaa0f..17d7281 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -28,6 +28,126 @@ WINE_DEFAULT_DEBUG_CHANNEL(xolehlp); +/* Resource manager start */ + +typedef struct { + IResourceManager IResourceManager_iface; + LONG ref; +} ResourceManager; + +static inline ResourceManager *impl_from_IResourceManager(IResourceManager *iface) +{ + return CONTAINING_RECORD(iface, ResourceManager, IResourceManager_iface); +} + +static HRESULT WINAPI ResourceManager_QueryInterface(IResourceManager *iface, REFIID iid, + void **ppv) +{ + ResourceManager *This = impl_from_IResourceManager(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IResourceManager, iid)) + { + *ppv = &This->IResourceManager_iface; + } + else + { + FIXME("(%s): not implemented\n", debugstr_guid(iid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ResourceManager_AddRef(IResourceManager *iface) +{ + ResourceManager *This = impl_from_IResourceManager(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ResourceManager_Release(IResourceManager *iface) +{ + ResourceManager *This = impl_from_IResourceManager(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} +static HRESULT WINAPI ResourceManager_Enlist(IResourceManager *iface, + ITransaction *pTransaction,ITransactionResourceAsync *pRes,XACTUOW *pUOW, + LONG *pisoLevel,ITransactionEnlistmentAsync **ppEnlist) +{ + FIXME("(%p, %p, %p, %p, %p, %p): stub\n", iface, pTransaction,pRes,pUOW, + pisoLevel,ppEnlist); + return E_NOTIMPL; +} +static HRESULT WINAPI ResourceManager_Reenlist(IResourceManager *iface, + byte *pPrepInfo,ULONG cbPrepInfo,DWORD lTimeout,XACTSTAT *pXactStat) +{ + FIXME("(%p, %p, %u, %u, %p): stub\n", iface, pPrepInfo, cbPrepInfo, lTimeout, pXactStat); + return E_NOTIMPL; +} +static HRESULT WINAPI ResourceManager_ReenlistmentComplete(IResourceManager *iface) +{ + FIXME("(%p): stub\n", iface); + return S_OK; +} +static HRESULT WINAPI ResourceManager_GetDistributedTransactionManager(IResourceManager *iface, + REFIID iid,void **ppvObject) +{ + FIXME("(%p, %s, %p): stub\n", iface, debugstr_guid(iid), ppvObject); + return E_NOTIMPL; +} + +static const IResourceManagerVtbl ResourceManager_Vtbl = { + ResourceManager_QueryInterface, + ResourceManager_AddRef, + ResourceManager_Release, + ResourceManager_Enlist, + ResourceManager_Reenlist, + ResourceManager_ReenlistmentComplete, + ResourceManager_GetDistributedTransactionManager +}; + +static HRESULT ResourceManager_Create(REFIID riid, void **ppv) +{ + ResourceManager *This; + HRESULT ret; + + if (!ppv) return E_INVALIDARG; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(ResourceManager)); + if (!This) return E_OUTOFMEMORY; + + This->IResourceManager_iface.lpVtbl = &ResourceManager_Vtbl; + This->ref = 1; + + ret = IResourceManager_QueryInterface(&This->IResourceManager_iface, riid, ppv); + IResourceManager_Release(&This->IResourceManager_iface); + + return ret; +} + +/* Resource manager end */ + + +/* DTC Proxy Core Object start */ + typedef struct { ITransactionDispenser ITransactionDispenser_iface; LONG ref; @@ -155,18 +275,17 @@ static ULONG WINAPI ResourceManagerFactory2_Release(IResourceManagerFactory2 *if static HRESULT WINAPI ResourceManagerFactory2_Create(IResourceManagerFactory2 *iface, GUID *pguidRM, CHAR *pszRMName, IResourceManagerSink *pIResMgrSink, IResourceManager **ppResMgr) { - FIXME("(%p, %s, %s, %p, %p): stub\n", iface, debugstr_guid(pguidRM), + FIXME("(%p, %s, %s, %p, %p): semi-stub\n", iface, debugstr_guid(pguidRM), debugstr_a(pszRMName), pIResMgrSink, ppResMgr); - - return E_NOTIMPL; + return ResourceManager_Create(&IID_IResourceManager, (void**)ppResMgr); } static HRESULT WINAPI ResourceManagerFactory2_CreateEx(IResourceManagerFactory2 *iface, GUID *pguidRM, CHAR *pszRMName, IResourceManagerSink *pIResMgrSink, REFIID riidRequested, void **ppResMgr) { - FIXME("(%p, %s, %s, %p, %s, %p): stub\n", iface, debugstr_guid(pguidRM), + FIXME("(%p, %s, %s, %p, %s, %p): semi-stub\n", iface, debugstr_guid(pguidRM), debugstr_a(pszRMName), pIResMgrSink, debugstr_guid(riidRequested), ppResMgr); - return E_NOTIMPL; + return ResourceManager_Create(riidRequested, ppResMgr); } static const IResourceManagerFactory2Vtbl ResourceManagerFactory2_Vtbl = { ResourceManagerFactory2_QueryInterface, @@ -239,6 +358,7 @@ static HRESULT TransactionManager_Create(REFIID riid, void **ppv) return ret; } +/* DTC Proxy Core Object end */ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) {

1 0

Daniel Jelinski : xolehlp: Stub ITransactionImportWhereabouts.
by Alexandre Julliard 29 May '13

29 May '13

Module: wine Branch: master Commit: 79d7e3955012cc57b75229f37c701d92e5cabbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d7e3955012cc57b75229f37… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat May 4 19:43:02 2013 +0200 xolehlp: Stub ITransactionImportWhereabouts. --- dlls/xolehlp/xolehlp.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 17d7281..595b578 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -321,16 +321,21 @@ static ULONG WINAPI TransactionImportWhereabouts_Release(ITransactionImportWhere static HRESULT WINAPI TransactionImportWhereabouts_GetWhereaboutsSize(ITransactionImportWhereabouts *iface, ULONG *pcbWhereabouts) { - FIXME("(%p, %p): stub\n", iface, pcbWhereabouts); + FIXME("(%p, %p): stub returning fake value\n", iface, pcbWhereabouts); - return E_NOTIMPL; + if (!pcbWhereabouts) return E_INVALIDARG; + *pcbWhereabouts = 1; + return S_OK; } static HRESULT WINAPI TransactionImportWhereabouts_GetWhereabouts(ITransactionImportWhereabouts *iface, ULONG cbWhereabouts, BYTE *rgbWhereabouts,ULONG *pcbUsed) { - FIXME("(%p, %u, %p, %p): stub\n", iface, cbWhereabouts, rgbWhereabouts, pcbUsed); + FIXME("(%p, %u, %p, %p): stub returning fake value\n", iface, cbWhereabouts, rgbWhereabouts, pcbUsed); - return E_NOTIMPL; + if (!rgbWhereabouts || !pcbUsed) return E_INVALIDARG; + *rgbWhereabouts = 0; + *pcbUsed = 1; + return S_OK; } static const ITransactionImportWhereaboutsVtbl TransactionImportWhereabouts_Vtbl = { TransactionImportWhereabouts_QueryInterface,

1 0