August 2010 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : user32: Add a test for GetClassInfo, make it pass under Wine.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 5aa45d9cf4cb1f089eb42428f7d3adf64d2307fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aa45d9cf4cb1f089eb42428f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Aug 3 17:51:38 2010 +0900 user32: Add a test for GetClassInfo, make it pass under Wine. --- dlls/user32/class.c | 12 +++++++++ dlls/user32/tests/class.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 6d1ab7f..91409e2 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -1070,6 +1070,12 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) TRACE("%p %s %p\n", hInstance, debugstr_a(name), wc); + if (!wc) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + if (!hInstance) hInstance = user32_module; if (!IS_INTRESOURCE(name)) @@ -1115,6 +1121,12 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc TRACE("%p %s %p\n", hInstance, debugstr_w(name), wc); + if (!wc) + { + SetLastError( ERROR_NOACCESS ); + return FALSE; + } + if (!hInstance) hInstance = user32_module; if (!(classPtr = CLASS_FindClass( name, hInstance ))) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 800d763..95f8aeb 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -900,10 +900,71 @@ static void test_extra_values(void) } } +static void test_GetClassInfo(void) +{ + static const WCHAR staticW[] = {'s','t','a','t','i','c',0}; + WNDCLASSA wc; + WNDCLASSEXA wcx; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = GetClassInfoA(0, "static", &wc); + ok(ret, "GetClassInfoA() error %d\n", GetLastError()); + +if (0) { /* crashes under XP */ + SetLastError(0xdeadbeef); + ret = GetClassInfoA(0, "static", NULL); + ok(ret, "GetClassInfoA() error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetClassInfoW(0, staticW, NULL); + ok(ret, "GetClassInfoW() error %d\n", GetLastError()); +} + + wcx.cbSize = sizeof(wcx); + SetLastError(0xdeadbeef); + ret = GetClassInfoExA(0, "static", &wcx); + ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetClassInfoExA(0, "static", NULL); + ok(!ret, "GetClassInfoExA() should fail\n"); + ok(GetLastError() == ERROR_NOACCESS || + broken(GetLastError() == 0xdeadbeef), /* win9x */ + "expected ERROR_NOACCESS, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetClassInfoExW(0, staticW, NULL); + ok(!ret, "GetClassInfoExW() should fail\n"); + ok(GetLastError() == ERROR_NOACCESS || + broken(GetLastError() == 0xdeadbeef) /* NT4 */ || + broken(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED), /* win9x */ + "expected ERROR_NOACCESS, got %d\n", GetLastError()); + + wcx.cbSize = 0; + SetLastError(0xdeadbeef); + ret = GetClassInfoExA(0, "static", &wcx); + ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); + ok(wcx.cbSize == 0, "expected 0, got %u\n", wcx.cbSize); + + wcx.cbSize = sizeof(wcx) - 1; + SetLastError(0xdeadbeef); + ret = GetClassInfoExA(0, "static", &wcx); + ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); + ok(wcx.cbSize == sizeof(wcx) - 1, "expected sizeof(wcx)-1, got %u\n", wcx.cbSize); + + wcx.cbSize = sizeof(wcx) + 1; + SetLastError(0xdeadbeef); + ret = GetClassInfoExA(0, "static", &wcx); + ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); + ok(wcx.cbSize == sizeof(wcx) + 1, "expected sizeof(wcx)+1, got %u\n", wcx.cbSize); +} + START_TEST(class) { HANDLE hInstance = GetModuleHandleA( NULL ); + test_GetClassInfo(); test_extra_values(); if (!GetModuleHandleW(0))

1 0

Jeff Cook : winealsa.drv: Init mixer on cards with a single Mic control, like snd_usb_audio mics.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 6120d7cc14522983fbc38026ab4fcb6e4a68cdf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6120d7cc14522983fbc38026a… Author: Jeff Cook <jeff(a)deserettechnology.com> Date: Mon Aug 2 17:48:52 2010 -0600 winealsa.drv: Init mixer on cards with a single Mic control, like snd_usb_audio mics. --- dlls/winealsa.drv/mixer.c | 53 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index cfdf95f..9a2cf85 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -250,6 +250,8 @@ static void fillcontrols(mixer *mmixer) long min, max; TRACE("Filling control %d\n", id); + if (!mline->elem) + break; if (id == 1 && !mline->elem) continue; @@ -332,16 +334,20 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ snd_mixer_elem_t *elem; line *mline = mmixer->lines; - /* Master control */ - MultiByteToWideChar(CP_UNIXCP, 0, snd_mixer_selem_get_name(mastelem), -1, mline->name, sizeof(mline->name)/sizeof(WCHAR)); - mline->component = getcomponenttype(snd_mixer_selem_get_name(mastelem)); - mline->dst = 0; - mline->capt = 0; - mline->elem = mastelem; - mline->chans = chans(mmixer, mastelem, 0); - - snd_mixer_elem_set_callback(mastelem, &elem_callback); - snd_mixer_elem_set_callback_private(mastelem, mmixer); + if (mastelem) { + /* Master control */ + MultiByteToWideChar(CP_UNIXCP, 0, snd_mixer_selem_get_name(mastelem), -1, mline->name, sizeof(mline->name)/sizeof(WCHAR)); + mline->component = getcomponenttype(snd_mixer_selem_get_name(mastelem)); + mline->dst = 0; + mline->capt = 0; + mline->elem = mastelem; + mline->chans = chans(mmixer, mastelem, 0); + + snd_mixer_elem_set_callback(mastelem, &elem_callback); + snd_mixer_elem_set_callback_private(mastelem, mmixer); + } else { + MultiByteToWideChar(CP_UNIXCP, 0, "Empty Master Element", -1, mline->name, sizeof(mline->name)/sizeof(WCHAR)); + } /* Capture control * Note: since mmixer->dests = 1, it means only playback control is visible @@ -395,6 +401,21 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_ } } +static void filllines_no_master(mixer *mmixer, snd_mixer_elem_t *captelem, int capt) +{ + line *mline = mmixer->lines; + + MultiByteToWideChar(CP_UNIXCP, 0, snd_mixer_selem_get_name(captelem), -1, mline->name, sizeof(mline->name)/sizeof(WCHAR)); + mline->component = getcomponenttype(snd_mixer_selem_get_name(captelem)); + mline->dst = 0; + mline->capt = 1; + mline->elem = captelem; + mline->chans = chans(mmixer, captelem, 1); + + snd_mixer_elem_set_callback(captelem, &elem_callback); + snd_mixer_elem_set_callback_private(captelem, mmixer); +} + /* Windows api wants to have a 'master' device to which all slaves are attached * There are 2 ones in this code: * - 'Master', fall back to 'Headphone' if unavailable, and if that's not available 'PCM' @@ -414,7 +435,7 @@ static void ALSA_MixerInit(void) char cardind[6], cardname[10]; snd_ctl_t *ctl; - snd_mixer_elem_t *elem, *mastelem = NULL, *headelem = NULL, *captelem = NULL, *pcmelem = NULL; + snd_mixer_elem_t *elem, *mastelem = NULL, *headelem = NULL, *captelem = NULL, *pcmelem = NULL, *micelem = NULL; memset(info, 0, snd_ctl_card_info_sizeof()); memset(&mixdev[mixnum], 0, sizeof(*mixdev)); @@ -470,6 +491,9 @@ static void ALSA_MixerInit(void) mastelem = elem; else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Capture") && !captelem) captelem = elem; + else if (!strcasecmp(snd_mixer_selem_get_name(elem), "Mic") && !micelem && !mastelem) + /* this is what snd-usb-audio mics look like; just a Mic control and that's it.*/ + micelem = elem; else if (!blacklisted(elem)) { DWORD comp = getcomponenttype(snd_mixer_selem_get_name(elem)); @@ -519,7 +543,7 @@ static void ALSA_MixerInit(void) mastelem = pcmelem; capcontrols -= !!snd_mixer_selem_has_capture_switch(mastelem); } - else if (!mastelem) + else if (!mastelem && !captelem && !micelem) { /* If there is nothing sensible that can act as 'Master' control, something is wrong */ FIXME("No master control found on %s, disabling mixer\n", snd_ctl_card_info_get_name(info)); @@ -549,7 +573,10 @@ static void ALSA_MixerInit(void) if (!mixdev[mixnum].lines || !mixdev[mixnum].controls) goto close; - filllines(&mixdev[mixnum], mastelem, captelem, capcontrols); + if (mastelem) + filllines(&mixdev[mixnum], mastelem, captelem, capcontrols); + else + filllines_no_master(&mixdev[mixnum], micelem, 1); fillcontrols(&mixdev[mixnum]); TRACE("%s: Amount of controls: %i/%i, name: %s\n", cardname, mixdev[mixnum].dests, mixdev[mixnum].chans, debugstr_w(mixdev[mixnum].mixername));

1 0

Henri Verbeet : wined3d: Allow filtering and blending with WINED3DFMT_ATI2N .
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 6cb38b9c93a695b5cc464f26e76ffab6ddc6b6cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cb38b9c93a695b5cc464f26e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 3 10:13:34 2010 +0200 wined3d: Allow filtering and blending with WINED3DFMT_ATI2N. --- dlls/wined3d/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f2bb60e..479f329 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -845,11 +845,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = /* Vendor-specific formats */ {WINED3DFMT_ATI2N, GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, - 0, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ATI_TEXTURE_COMPRESSION_3DC, NULL}, {WINED3DFMT_ATI2N, GL_COMPRESSED_RED_GREEN_RGTC2, GL_COMPRESSED_RED_GREEN_RGTC2, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, - 0, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, };

1 0

David Hedberg : explorerframe: Implement Initialize.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 3db4aaa2b7be246a063745ec66282b3761fd57f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db4aaa2b7be246a063745ec6… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Aug 3 03:43:06 2010 +0200 explorerframe: Implement Initialize. --- dlls/explorerframe/Makefile.in | 2 +- dlls/explorerframe/nstc.c | 93 ++++++++++++++++++++++++++++++++++++++- dlls/explorerframe/tests/nstc.c | 46 +++++++++++++++++++- 3 files changed, 137 insertions(+), 4 deletions(-) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in index 3d17fcd..68cca8d 100644 --- a/dlls/explorerframe/Makefile.in +++ b/dlls/explorerframe/Makefile.in @@ -4,7 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = explorerframe.dll -IMPORTS = uuid +IMPORTS = uuid user32 C_SRCS = \ explorerframe_main.c \ diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 5c25d8c..c3a1563 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -37,8 +37,51 @@ WINE_DEFAULT_DEBUG_CHANNEL(nstc); typedef struct { const INameSpaceTreeControl2Vtbl *lpVtbl; LONG ref; + + HWND hwnd_main; + + NSTCSTYLE style; } NSTC2Impl; +/************************************************************************* + * NamespaceTree window functions + */ +static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) +{ + NSTC2Impl *This = crs->lpCreateParams; + + TRACE("%p (%p)\n", This, crs); + SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LPARAM)This); + This->hwnd_main = hWnd; + + INameSpaceTreeControl_AddRef((INameSpaceTreeControl*)This); + + return TRUE; +} + +static LRESULT destroy_namespacetree(NSTC2Impl *This) +{ + TRACE("%p\n", This); + + /* This reference was added in create_namespacetree */ + INameSpaceTreeControl_Release((INameSpaceTreeControl*)This); + return TRUE; +} + +static LRESULT CALLBACK NSTC2_WndProc(HWND hWnd, UINT uMessage, + WPARAM wParam, LPARAM lParam) +{ + NSTC2Impl *This = (NSTC2Impl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + + switch(uMessage) + { + case WM_NCCREATE: return create_namespacetree(hWnd, (CREATESTRUCTW*)lParam); + case WM_DESTROY: return destroy_namespacetree(This); + default: return DefWindowProcW(hWnd, uMessage, wParam, lParam); + } + return 0; +} + /************************************************************************** * INameSpaceTreeControl2 Implementation */ @@ -100,8 +143,54 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, NSTCSTYLE nstcsFlags) { NSTC2Impl *This = (NSTC2Impl*)iface; - FIXME("stub, %p (%p, %p, %x)\n", This, hwndParent, prc, nstcsFlags); - return E_NOTIMPL; + WNDCLASSW wc; + DWORD window_style, window_ex_style; + RECT rc; + static const WCHAR NSTC2_CLASS_NAME[] = + {'N','a','m','e','s','p','a','c','e','T','r','e','e', + 'C','o','n','t','r','o','l',0}; + + TRACE("%p (%p, %p, %x)\n", This, hwndParent, prc, nstcsFlags); + + This->style = nstcsFlags; + + if(!GetClassInfoW(explorerframe_hinstance, NSTC2_CLASS_NAME, &wc)) + { + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = NSTC2_WndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = explorerframe_hinstance; + wc.hIcon = 0; + wc.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wc.lpszMenuName = NULL; + wc.lpszClassName = NSTC2_CLASS_NAME; + + if (!RegisterClassW(&wc)) return E_FAIL; + } + + /* NSTCS_TABSTOP and NSTCS_BORDER affects the host window */ + window_style = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | + (nstcsFlags & NSTCS_BORDER ? WS_BORDER : 0); + window_ex_style = nstcsFlags & NSTCS_TABSTOP ? WS_EX_CONTROLPARENT : 0; + + if(prc) + CopyRect(&rc, prc); + else + rc.left = rc.right = rc.top = rc.bottom = 0; + + This->hwnd_main = CreateWindowExW(window_ex_style, NSTC2_CLASS_NAME, NULL, window_style, + rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, + hwndParent, 0, explorerframe_hinstance, This); + + if(!This->hwnd_main) + { + ERR("Failed to create the window.\n"); + return HRESULT_FROM_WIN32(GetLastError()); + } + + return S_OK; } static HRESULT WINAPI NSTC2_fnTreeAdvise(INameSpaceTreeControl2* iface, diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index bd0caf1..122cb8d 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -34,7 +34,10 @@ static HWND hwnd; static BOOL test_initialization(void) { INameSpaceTreeControl *pnstc; + IUnknown *punk; + LONG lres; HRESULT hr; + RECT rc; hr = CoCreateInstance(&CLSID_NamespaceTreeControl, NULL, CLSCTX_INPROC_SERVER, &IID_INameSpaceTreeControl, (void**)&pnstc); @@ -44,7 +47,48 @@ static BOOL test_initialization(void) return FALSE; } - INameSpaceTreeControl_Release(pnstc); + hr = INameSpaceTreeControl_Initialize(pnstc, NULL, NULL, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_TLW_WITH_WSCHILD), "Got (0x%08x)\n", hr); + + hr = INameSpaceTreeControl_Initialize(pnstc, (HWND)0xDEADBEEF, NULL, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Got (0x%08x)\n", hr); + + ZeroMemory(&rc, sizeof(RECT)); + hr = INameSpaceTreeControl_Initialize(pnstc, NULL, &rc, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_TLW_WITH_WSCHILD), "Got (0x%08x)\n", hr); + + hr = INameSpaceTreeControl_Initialize(pnstc, (HWND)0xDEADBEEF, &rc, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE), "Got (0x%08x)\n", hr); + + hr = INameSpaceTreeControl_Initialize(pnstc, hwnd, NULL, 0); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + + /* Some "random" interfaces */ + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObject, (void**)&punk); + ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceActiveObject, (void**)&punk); + ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObjectWindowless, (void**)&punk); + ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceUIWindow, (void**)&punk); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceFrame, (void**)&punk); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceSite, (void**)&punk); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceSiteEx, (void**)&punk); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceSiteWindowless, (void**)&punk); + ok(hr == E_NOINTERFACE, "Got (0x%08x)\n", hr); + + /* On windows, the reference count won't go to zero until the + * window is destroyed. */ + lres = INameSpaceTreeControl_Release(pnstc); + ok(lres, "lres was %d\n", lres); return TRUE; }

1 0

Mike Kaplinskiy : include/mswsock: Add WS_ prefix if necessary.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: e7b9bf3f8b55394392253cd732a4689fa452445a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b9bf3f8b55394392253cd73… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Mon Aug 2 23:50:51 2010 -0400 include/mswsock: Add WS_ prefix if necessary. --- include/mswsock.h | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 5423438..322ab20 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -22,6 +22,12 @@ extern "C" { #endif /* defined(__cplusplus) */ +#ifdef USE_WS_PREFIX +#define WS(x) WS_##x +#else +#define WS(x) x +#endif + #ifndef USE_WS_PREFIX #define SO_CONNDATA 0x7000 #define SO_CONNOPT 0x7001 @@ -166,16 +172,16 @@ typedef struct _WSACMSGHDR { } WSACMSGHDR, *PWSACMSGHDR, *LPWSACMSGHDR; typedef BOOL (WINAPI * LPFN_ACCEPTEX)(SOCKET, SOCKET, PVOID, DWORD, DWORD, DWORD, LPDWORD, LPOVERLAPPED); -typedef BOOL (WINAPI * LPFN_CONNECTEX)(SOCKET, const struct sockaddr *, int, PVOID, DWORD, LPDWORD, LPOVERLAPPED); +typedef BOOL (WINAPI * LPFN_CONNECTEX)(SOCKET, const struct WS(sockaddr) *, int, PVOID, DWORD, LPDWORD, LPOVERLAPPED); typedef BOOL (WINAPI * LPFN_DISCONNECTEX)(SOCKET, LPOVERLAPPED, DWORD, DWORD); -typedef VOID (WINAPI * LPFN_GETACCEPTEXSOCKADDRS)(PVOID, DWORD, DWORD, DWORD, struct sockaddr **, LPINT, struct sockaddr **, LPINT); +typedef VOID (WINAPI * LPFN_GETACCEPTEXSOCKADDRS)(PVOID, DWORD, DWORD, DWORD, struct WS(sockaddr) **, LPINT, struct WS(sockaddr) **, LPINT); typedef BOOL (WINAPI * LPFN_TRANSMITFILE)(SOCKET, HANDLE, DWORD, DWORD, LPOVERLAPPED, LPTRANSMIT_FILE_BUFFERS, DWORD); typedef BOOL (WINAPI * LPFN_TRANSMITPACKETS)(SOCKET, LPTRANSMIT_PACKETS_ELEMENT, DWORD, DWORD, LPOVERLAPPED, DWORD); typedef INT (WINAPI * LPFN_WSARECVMSG)(SOCKET, LPWSAMSG, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); typedef INT (WINAPI * LPFN_WSASENDMSG)(SOCKET, LPWSAMSG, DWORD, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); BOOL WINAPI AcceptEx(SOCKET, SOCKET, PVOID, DWORD, DWORD, DWORD, LPDWORD, LPOVERLAPPED); -VOID WINAPI GetAcceptExSockaddrs(PVOID, DWORD, DWORD, DWORD, struct sockaddr **, LPINT, struct sockaddr **, LPINT); +VOID WINAPI GetAcceptExSockaddrs(PVOID, DWORD, DWORD, DWORD, struct WS(sockaddr) **, LPINT, struct WS(sockaddr) **, LPINT); BOOL WINAPI TransmitFile(SOCKET, HANDLE, DWORD, DWORD, LPOVERLAPPED, LPTRANSMIT_FILE_BUFFERS, DWORD); INT WINAPI WSARecvEx(SOCKET, char *, INT, INT *); @@ -183,4 +189,6 @@ INT WINAPI WSARecvEx(SOCKET, char *, INT, INT *); } #endif +#undef WS + #endif /* _MSWSOCK_ */

1 0

Henri Verbeet : wined3d: Use the correct divider for 15-bit depth formats in IWineD3DSurfaceImpl_BltZ ().
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 6e68dd52c4c2ece1d475f6b42f9ea27c1f76f99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e68dd52c4c2ece1d475f6b42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 3 10:13:31 2010 +0200 wined3d: Use the correct divider for 15-bit depth formats in IWineD3DSurfaceImpl_BltZ(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 561e9c9..c061778 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3778,7 +3778,7 @@ static HRESULT IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, const RECT *D depth = (float) DDBltFx->u5.dwFillDepth / (float) 0x0000ffff; break; case WINED3DFMT_S1_UINT_D15_UNORM: - depth = (float) DDBltFx->u5.dwFillDepth / (float) 0x0000fffe; + depth = (float) DDBltFx->u5.dwFillDepth / (float) 0x00007fff; break; case WINED3DFMT_D24_UNORM_S8_UINT: case WINED3DFMT_X8D24_UNORM:

1 0

Henri Verbeet : d3dx9_36/tests: Avoid the non-portable NAN macro.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 24f522c520877218af2987720b7832b8b4f00867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24f522c520877218af2987720… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 3 10:13:30 2010 +0200 d3dx9_36/tests: Avoid the non-portable NAN macro. --- dlls/d3dx9_36/tests/mesh.c | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index bffcb2b..87003d1 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -68,16 +68,14 @@ static void free_mesh(struct mesh *mesh) static BOOL new_mesh(struct mesh *mesh, DWORD number_of_vertices, DWORD number_of_faces) { - int i; - - mesh->vertices = HeapAlloc(GetProcessHeap(), 0, number_of_vertices * sizeof(*mesh->vertices)); + mesh->vertices = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, number_of_vertices * sizeof(*mesh->vertices)); if (!mesh->vertices) { return FALSE; } mesh->number_of_vertices = number_of_vertices; - mesh->faces = HeapAlloc(GetProcessHeap(), 0, number_of_faces * sizeof(*mesh->faces)); + mesh->faces = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, number_of_faces * sizeof(*mesh->faces)); if (!mesh->faces) { HeapFree(GetProcessHeap(), 0, mesh->vertices); @@ -85,17 +83,6 @@ static BOOL new_mesh(struct mesh *mesh, DWORD number_of_vertices, DWORD number_o } mesh->number_of_faces = number_of_faces; - /* fill with nonsense data to make sure no comparison succeed by chance */ - for (i = 0; i < number_of_vertices; i++) - { - mesh->vertices[i].position.x = NAN; mesh->vertices[i].position.y = NAN; mesh->vertices[i].position.z = NAN; - mesh->vertices[i].normal.x = NAN; mesh->vertices[i].normal.y = NAN; mesh->vertices[i].normal.z = NAN; - } - for (i = 0; i < number_of_faces; i++) - { - mesh->faces[i][0] = -1; mesh->faces[i][1] = -1; mesh->faces[i][2] = -1; - } - return TRUE; }

1 0

Henri Verbeet : wined3d: Pass the color as floating point values to device_clear_render_targets().
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: b2e1e1fd7110f0679efa5907f85a59a3f3798f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e1e1fd7110f0679efa5907f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 3 10:13:32 2010 +0200 wined3d: Pass the color as floating point values to device_clear_render_targets(). --- dlls/wined3d/device.c | 13 +++++++------ dlls/wined3d/surface.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2f73c0b..3fcdd99 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -655,7 +655,7 @@ static void prepare_ds_clear(IWineD3DSurfaceImpl *ds, struct wined3d_context *co } HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, IWineD3DSurfaceImpl **rts, - UINT rect_count, const WINED3DRECT *rects, DWORD flags, WINED3DCOLOR color, float depth, DWORD stencil) + UINT rect_count, const WINED3DRECT *rects, DWORD flags, const float color[4], float depth, DWORD stencil) { const RECT *clear_rect = (rect_count > 0 && rects) ? (const RECT *)rects : NULL; IWineD3DSurfaceImpl *depth_stencil = device->depth_stencil; @@ -741,7 +741,7 @@ HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, I IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE1)); IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE2)); IWineD3DDeviceImpl_MarkStateDirty(device, STATE_RENDER(WINED3DRS_COLORWRITEENABLE3)); - glClearColor(D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)); + glClearColor(color[0], color[1], color[2], color[3]); checkGLcall("glClearColor"); clear_mask = clear_mask | GL_COLOR_BUFFER_BIT; } @@ -4576,12 +4576,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, } static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Count, - const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) + const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR color, float Z, DWORD Stencil) { + const float c[] = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) Count (%d), pRects (%p), Flags (%x), Color (0x%08x), Z (%f), Stencil (%d)\n", This, - Count, pRects, Flags, Color, Z, Stencil); + TRACE("(%p) Count (%d), pRects (%p), Flags (%x), color (0x%08x), Z (%f), Stencil (%d)\n", This, + Count, pRects, Flags, color, Z, Stencil); if (Flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) && !This->depth_stencil) { @@ -4591,7 +4592,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Clear(IWineD3DDevice *iface, DWORD Coun } return device_clear_render_targets(This, This->adapter->gl_info.limits.buffers, - This->render_targets, Count, pRects, Flags, Color, Z, Stencil); + This->render_targets, Count, pRects, Flags, c, Z, Stencil); } /***** diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c061778..849d892 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4890,10 +4890,12 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_ } static HRESULT ffp_blit_color_fill(IWineD3DDeviceImpl *device, - IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect, DWORD fill_color) + IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect, DWORD color) { + const float c[] = {D3DCOLOR_R(color), D3DCOLOR_G(color), D3DCOLOR_B(color), D3DCOLOR_A(color)}; + return device_clear_render_targets(device, 1 /* rt_count */, &dst_surface, 1 /* rect_count */, - (const WINED3DRECT *)dst_rect, WINED3DCLEAR_TARGET, fill_color, 0.0f /* depth */, 0 /* stencil */); + (const WINED3DRECT *)dst_rect, WINED3DCLEAR_TARGET, c, 0.0f /* depth */, 0 /* stencil */); } const struct blit_shader ffp_blit = { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4205dd5..08104eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1688,7 +1688,7 @@ struct IWineD3DDeviceImpl HRESULT device_clear_render_targets(IWineD3DDeviceImpl *device, UINT rt_count, IWineD3DSurfaceImpl **rts, UINT rect_count, const WINED3DRECT *rects, - DWORD flags, WINED3DCOLOR color, float depth, DWORD stencil) DECLSPEC_HIDDEN; + DWORD flags, const float color[4], float depth, DWORD stencil) DECLSPEC_HIDDEN; BOOL device_context_add(IWineD3DDeviceImpl *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_get_draw_rect(IWineD3DDeviceImpl *device, RECT *rect) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Always set the get_drawable_size() surface function.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 88ff3f406d0df659c65dac85f045746bf56373c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88ff3f406d0df659c65dac85f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 3 10:13:33 2010 +0200 wined3d: Always set the get_drawable_size() surface function. --- dlls/wined3d/surface.c | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 849d892..47282b0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4028,11 +4028,19 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { } } - if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { - switch(wined3d_settings.offscreen_rendering_mode) { - case ORM_FBO: This->get_drawable_size = get_drawable_size_fbo; break; - case ORM_BACKBUFFER: This->get_drawable_size = get_drawable_size_backbuffer; break; - } + switch (wined3d_settings.offscreen_rendering_mode) + { + case ORM_FBO: + This->get_drawable_size = get_drawable_size_fbo; + break; + + case ORM_BACKBUFFER: + This->get_drawable_size = get_drawable_size_backbuffer; + break; + + default: + ERR("Unhandled offscreen rendering mode %#x.\n", wined3d_settings.offscreen_rendering_mode); + return WINED3DERR_INVALIDCALL; } This->Flags |= SFLAG_INSYSMEM; @@ -4669,10 +4677,22 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetContainer(IWineD3DSurface *iface, I if(swapchain) { This->get_drawable_size = get_drawable_size_swapchain; IWineD3DSwapChain_Release(swapchain); - } else if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) { - switch(wined3d_settings.offscreen_rendering_mode) { - case ORM_FBO: This->get_drawable_size = get_drawable_size_fbo; break; - case ORM_BACKBUFFER: This->get_drawable_size = get_drawable_size_backbuffer; break; + } + else + { + switch (wined3d_settings.offscreen_rendering_mode) + { + case ORM_FBO: + This->get_drawable_size = get_drawable_size_fbo; + break; + + case ORM_BACKBUFFER: + This->get_drawable_size = get_drawable_size_backbuffer; + break; + + default: + ERR("Unhandled offscreen rendering mode %#x.\n", wined3d_settings.offscreen_rendering_mode); + return WINED3DERR_INVALIDCALL; } }

1 0

Anders Jonsson : winmm: Fix typo in English, Slovak resources.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 2ebe732453a6477dd8e5fcc209b297c7e2cf5b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebe732453a6477dd8e5fcc20… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 3 08:25:48 2010 +0200 winmm: Fix typo in English, Slovak resources. --- dlls/winmm/winmm_En.rc | 2 +- dlls/winmm/winmm_Sk.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winmm_En.rc b/dlls/winmm/winmm_En.rc index cc20333..f529dff 100644 --- a/dlls/winmm/winmm_En.rc +++ b/dlls/winmm/winmm_En.rc @@ -121,7 +121,7 @@ MCIERR_FILE_READ, "Cannot read the specified file. Make sure the file is still MCIERR_FILE_WRITE, "Cannot write to the specified file. Make sure you have enough disk space or are still connected to the network." MCIERR_SEQ_DIV_INCOMPATIBLE, "The time formats of the ""song pointer"" and SMPTE are mutually exclusive. You can't use them together." MCIERR_SEQ_NOMIDIPRESENT, "The system has no installed MIDI devices. Use the Drivers option from the Control Panel to install a MIDI driver." -MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; the try again." +MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; then try again." MCIERR_SEQ_PORT_MAPNODEVICE, "The current MIDI Mapper setup refers to a MIDI device that is not installed on the system. Use the MIDI Mapper option from the Control Panel to edit the setup." MCIERR_SEQ_PORT_MISCERROR, "An error occurred with the specified port." MCIERR_SEQ_PORT_NONEXISTENT, "The specified MIDI device is not installed on the system. Use the Drivers option from the Control Panel to install a MIDI device." diff --git a/dlls/winmm/winmm_Sk.rc b/dlls/winmm/winmm_Sk.rc index 3706f44..1d7bc77 100644 --- a/dlls/winmm/winmm_Sk.rc +++ b/dlls/winmm/winmm_Sk.rc @@ -121,7 +121,7 @@ MCIERR_FILE_READ, "Cannot read the specified file. Make sure the file is still MCIERR_FILE_WRITE, "Cannot write to the specified file. Make sure you have enough disk space or are still connected to the network." MCIERR_SEQ_DIV_INCOMPATIBLE, "The time formats of the ""song pointer"" and SMPTE are mutually exclusive. You can't use them together." MCIERR_SEQ_NOMIDIPRESENT, "The system has no installed MIDI devices. Use the Drivers option from the Control Panel to install a MIDI driver." -MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; the try again." +MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; then try again." MCIERR_SEQ_PORT_MAPNODEVICE, "The current MIDI Mapper setup refers to a MIDI device that is not installed on the system. Use the MIDI Mapper option from the Control Panel to edit the setup." MCIERR_SEQ_PORT_MISCERROR, "An error occurred with the specified port." MCIERR_SEQ_PORT_NONEXISTENT, "The specified MIDI device is not installed on the system. Use the Drivers option from the Control Panel to install a MIDI device."

1 0