January 2014 - Wine-Commits

Hans Leidekker : advapi32: Use a generic Keychain item to store credentials on MacOS.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: fbb669d0d45ddab2cdfc4800e16d3c1e7f16438e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbb669d0d45ddab2cdfc4800e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 28 13:27:52 2014 +0100 advapi32: Use a generic Keychain item to store credentials on MacOS. --- dlls/advapi32/cred.c | 116 +++++++++++++------------------------------------- 1 file changed, 30 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbb669d0d45ddab2cdfc4…

1 0

Ken Thomases : wined3d: Improve CheckDeviceType() support for windowed mode.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: d2c56a60271abc4d231c1f61510a7d24129ee815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2c56a60271abc4d231c1f615… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 27 13:33:03 2014 -0600 wined3d: Improve CheckDeviceType() support for windowed mode. For windowed mode: * It doesn't matter if there are no adapter modes for the display format. * A backbuffer format is valid so long as there's support for color conversion to the display format. * A backbuffer format of D3DFMT_UNKNOWN is allowed and means that it should be the same as the display format. --- dlls/wined3d/directx.c | 132 ++++++++++++++++++++++++++++-------------------- 1 file changed, 78 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 29ff883..6617c3a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4000,7 +4000,6 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap enum wined3d_device_type device_type, enum wined3d_format_id display_format, enum wined3d_format_id backbuffer_format, BOOL windowed) { - UINT mode_count; HRESULT hr; TRACE("wined3d %p, adapter_idx %u, device_type %s, display_format %s, backbuffer_format %s, windowed %#x.\n", @@ -4014,10 +4013,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap * combination is available on the given adapter. In fullscreen mode microsoft specified * that the display format shouldn't provide alpha and that ignoring alpha the backbuffer * and display format should match exactly. - * In windowed mode format conversion can occur and this depends on the driver. When format - * conversion is done, this function should nevertheless fail and applications need to use - * CheckDeviceFormatConversion. - * At the moment we assume that fullscreen and windowed have the same capabilities. */ + * In windowed mode format conversion can occur and this depends on the driver. */ /* There are only 4 display formats. */ if (!(display_format == WINED3DFMT_B5G6R5_UNORM @@ -4029,62 +4025,90 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap return WINED3DERR_NOTAVAILABLE; } - /* If the requested display format is not available, don't continue. */ - mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, - display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); - if (!mode_count) + if (windowed) { - TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); - return WINED3DERR_NOTAVAILABLE; - } + /* WINED3DFMT_B10G10R10A2_UNORM is only allowed in fullscreen mode. */ + if (display_format == WINED3DFMT_B10G10R10A2_UNORM) + { + TRACE("Unsupported display/backbuffer format combination %s / %s for windowed mode.\n", + debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + return WINED3DERR_NOTAVAILABLE; + } - /* Windowed mode allows you to specify WINED3DFMT_UNKNOWN for the backbuffer format, - * it means 'reuse' the display format for the backbuffer. */ - if (!windowed && backbuffer_format == WINED3DFMT_UNKNOWN) - { - TRACE("backbuffer_format WINED3FMT_UNKNOWN only available in windowed mode.\n"); - return WINED3DERR_NOTAVAILABLE; - } + /* Windowed mode allows you to specify WINED3DFMT_UNKNOWN for the backbuffer format, + * it means 'reuse' the display format for the backbuffer. */ + if (backbuffer_format == WINED3DFMT_UNKNOWN) + backbuffer_format = display_format; - /* In FULLSCREEN mode WINED3DFMT_B5G6R5_UNORM can only be mixed with - * backbuffer format WINED3DFMT_B5G6R5_UNORM. */ - if (display_format == WINED3DFMT_B5G6R5_UNORM && backbuffer_format != WINED3DFMT_B5G6R5_UNORM) - { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); - return WINED3DERR_NOTAVAILABLE; + /* In windowed mode, if color conversion from the backbuffer format to the + * display format is supported, then the format combination is supported. */ + hr = wined3d_check_device_format_conversion(wined3d, adapter_idx, device_type, backbuffer_format, display_format); + if (FAILED(hr)) + { + TRACE("Unsupported display/backbuffer format combination %s / %s; no color conversion.\n", + debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + return WINED3DERR_NOTAVAILABLE; + } } - - /* In FULLSCREEN mode WINED3DFMT_B5G5R5X1_UNORM can only be mixed with - * backbuffer formats WINED3DFMT_B5G5R5X1_UNORM and - * WINED3DFMT_B5G5R5A1_UNORM. */ - if (display_format == WINED3DFMT_B5G5R5X1_UNORM - && !(backbuffer_format == WINED3DFMT_B5G5R5X1_UNORM || backbuffer_format == WINED3DFMT_B5G5R5A1_UNORM)) + else { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); - return WINED3DERR_NOTAVAILABLE; - } + UINT mode_count; - /* In FULLSCREEN mode WINED3DFMT_B8G8R8X8_UNORM can only be mixed with - * backbuffer formats WINED3DFMT_B8G8R8X8_UNORM and - * WINED3DFMT_B8G8R8A8_UNORM. */ - if (display_format == WINED3DFMT_B8G8R8X8_UNORM - && !(backbuffer_format == WINED3DFMT_B8G8R8X8_UNORM || backbuffer_format == WINED3DFMT_B8G8R8A8_UNORM)) - { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); - return WINED3DERR_NOTAVAILABLE; - } + /* If the requested display format is not available, don't continue. */ + mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, + display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); + if (!mode_count) + { + TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); + return WINED3DERR_NOTAVAILABLE; + } - /* WINED3DFMT_B10G10R10A2_UNORM is only allowed in fullscreen mode and it - * can only be mixed with backbuffer format WINED3DFMT_B10G10R10A2_UNORM. */ - if (display_format == WINED3DFMT_B10G10R10A2_UNORM - && (backbuffer_format != WINED3DFMT_B10G10R10A2_UNORM || windowed)) - { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); - return WINED3DERR_NOTAVAILABLE; + if (backbuffer_format == WINED3DFMT_UNKNOWN) + { + TRACE("backbuffer_format WINED3FMT_UNKNOWN only available in windowed mode.\n"); + return WINED3DERR_NOTAVAILABLE; + } + + /* In FULLSCREEN mode WINED3DFMT_B5G6R5_UNORM can only be mixed with + * backbuffer format WINED3DFMT_B5G6R5_UNORM. */ + if (display_format == WINED3DFMT_B5G6R5_UNORM && backbuffer_format != WINED3DFMT_B5G6R5_UNORM) + { + TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + return WINED3DERR_NOTAVAILABLE; + } + + /* In FULLSCREEN mode WINED3DFMT_B5G5R5X1_UNORM can only be mixed with + * backbuffer formats WINED3DFMT_B5G5R5X1_UNORM and + * WINED3DFMT_B5G5R5A1_UNORM. */ + if (display_format == WINED3DFMT_B5G5R5X1_UNORM + && !(backbuffer_format == WINED3DFMT_B5G5R5X1_UNORM || backbuffer_format == WINED3DFMT_B5G5R5A1_UNORM)) + { + TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + return WINED3DERR_NOTAVAILABLE; + } + + /* In FULLSCREEN mode WINED3DFMT_B8G8R8X8_UNORM can only be mixed with + * backbuffer formats WINED3DFMT_B8G8R8X8_UNORM and + * WINED3DFMT_B8G8R8A8_UNORM. */ + if (display_format == WINED3DFMT_B8G8R8X8_UNORM + && !(backbuffer_format == WINED3DFMT_B8G8R8X8_UNORM || backbuffer_format == WINED3DFMT_B8G8R8A8_UNORM)) + { + TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + return WINED3DERR_NOTAVAILABLE; + } + + /* WINED3DFMT_B10G10R10A2_UNORM can only be mixed with backbuffer format + * WINED3DFMT_B10G10R10A2_UNORM. */ + if (display_format == WINED3DFMT_B10G10R10A2_UNORM + && backbuffer_format != WINED3DFMT_B10G10R10A2_UNORM) + { + TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + return WINED3DERR_NOTAVAILABLE; + } } /* Use CheckDeviceFormat to see if the backbuffer_format is usable with the given display_format */

1 0

Frédéric Delanoy : dplayx/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 5332d0e5abe5fd0705df42b9245c06c2c9b35244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5332d0e5abe5fd0705df42b92… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:30 2014 +0100 dplayx/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/dplayx/tests/dplayx.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index fb76c37..7b6c0c0 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -87,8 +87,6 @@ static LPSTR get_temp_buffer(void) static LPCSTR Guid2str(const GUID *guid) { - LPSTR buffer = get_temp_buffer(); - if (!guid) return "(null)"; /* Service providers */ @@ -124,12 +122,7 @@ static LPCSTR Guid2str(const GUID *guid) if (IsEqualGUID(guid, &DPAID_ComPort)) return "DPAID_ComPort"; - sprintf( buffer, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - return buffer; - + return wine_dbgstr_guid(guid); }

1 0

Frédéric Delanoy : dmusic/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 5e6f0e93fa3e97aac4593a63bc81ee7eb9e0779f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6f0e93fa3e97aac4593a63b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:29 2014 +0100 dmusic/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/dmusic/tests/dmusic.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 4291d71..528d182 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -29,16 +29,6 @@ #include "dmusici.h" #include "dmksctrl.h" -static inline const char* debugstr_guid(const GUID *id) -{ - static char string[39]; - sprintf(string, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); - return string; -} - static inline const char* debugstr_longlong(ULONGLONG ll) { static char string[17]; @@ -67,7 +57,7 @@ static void test_dmusic(void) hr = IDirectMusic_GetMasterClock(dmusic, &guid_clock, &clock); ok(hr == S_OK, "IDirectMusic_GetMasterClock returned: %x\n", hr); ok(clock != NULL, "No clock returned\n"); - trace(" guidPort = %s\n", debugstr_guid(&guid_clock)); + trace(" guidPort = %s\n", wine_dbgstr_guid(&guid_clock)); if (clock) IReferenceClock_Release(clock); @@ -103,7 +93,7 @@ static void test_dmusic(void) ok(port_caps.dwSize == sizeof(port_caps), "DMUS_PORTCAPS dwSize member is wrong (%u)\n", port_caps.dwSize); trace("Port %u:\n", index); trace(" dwFlags = %x\n", port_caps.dwFlags); - trace(" guidPort = %s\n", debugstr_guid(&port_caps.guidPort)); + trace(" guidPort = %s\n", wine_dbgstr_guid(&port_caps.guidPort)); trace(" dwClass = %u\n", port_caps.dwClass); trace(" dwType = %u\n", port_caps.dwType); trace(" dwMemorySize = %u\n", port_caps.dwMemorySize); @@ -122,7 +112,7 @@ static void test_dmusic(void) ok(clock_info.dwSize == sizeof(clock_info), "DMUS_CLOCKINFO dwSize member is wrong (%u)\n", clock_info.dwSize); trace("Clock %u:\n", index); trace(" ctType = %u\n", clock_info.ctType); - trace(" guidClock = %s\n", debugstr_guid(&clock_info.guidClock)); + trace(" guidClock = %s\n", wine_dbgstr_guid(&clock_info.guidClock)); trace(" wszDescription = %s\n", wine_dbgstr_w(clock_info.wszDescription)); index++; } @@ -157,7 +147,7 @@ static void test_dmbuffer(void) hr = IDirectMusicBuffer_GetBufferFormat(dmbuffer, &format); ok(hr == S_OK, "IDirectMusicBuffer_GetBufferFormat returned %x\n", hr); - ok(IsEqualGUID(&format, &KSDATAFORMAT_SUBTYPE_MIDI), "Wrong format returned %s\n", debugstr_guid(&format)); + ok(IsEqualGUID(&format, &KSDATAFORMAT_SUBTYPE_MIDI), "Wrong format returned %s\n", wine_dbgstr_guid(&format)); hr = IDirectMusicBuffer_GetMaxBytes(dmbuffer, &size); ok(hr == S_OK, "IDirectMusicBuffer_GetMaxBytes returned %x\n", hr); ok(size == 1024, "Buffer size is %u instead of 1024\n", size);

1 0

Frédéric Delanoy : d3dx9_36/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: e4a0da373c387dab71641db3f40380d273f60394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0da373c387dab71641db3f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:26 2014 +0100 d3dx9_36/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/d3dx9_36/tests/xfile.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index d105aee..1a56f20 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -244,22 +244,12 @@ static void test_type_index_color(void) d3dxfile->lpVtbl->Release(d3dxfile); } -static inline void debugstr_guid(char* buf, const GUID *id) -{ - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); -} - static void process_data(ID3DXFileData *xfile_data, int level) { HRESULT ret; char name[100]; GUID clsid; GUID clsid_type; - char str_clsid[40]; - char str_clsid_type[40]; SIZE_T len = sizeof(name); int i; const BYTE *data; @@ -277,10 +267,9 @@ static void process_data(ID3DXFileData *xfile_data, int level) for (i = 0; i < level; i++) printf(" "); - debugstr_guid(str_clsid, &clsid); - debugstr_guid(str_clsid_type, &clsid_type); - printf("Found object '%s' - %s - %s - %lu\n", len ? name : "", str_clsid, str_clsid_type, size); + printf("Found object '%s' - %s - %s - %lu\n", + len ? name : "", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&clsid_type), size); if (size) {

1 0

Alexandre Julliard : user32: Fail creation of the desktop window earlier on when it already exists.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 6bf64f0ac278b826b526504d69f384dfce598bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf64f0ac278b826b526504d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 28 12:41:56 2014 +0100 user32: Fail creation of the desktop window earlier on when it already exists. --- dlls/user32/desktop.c | 2 ++ dlls/user32/win.c | 3 +++ programs/explorer/desktop.c | 19 ++++++------------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index bc91252..d22e732 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -117,6 +117,8 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP ATOM atom; WCHAR buffer[37]; + if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ + sprintfW( buffer, guid_formatW, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 275b93c..e29153a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2086,6 +2086,9 @@ HWND WINAPI GetDesktopWindow(void) SERVER_END_REQ; } + /* wait for the desktop process to be ready */ + SendMessageW( thread_info->top_window, WM_NULL, 0, 0 ); + if (!thread_info->top_window || !USER_Driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" ); diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index db6a355..474e93e 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -799,7 +799,7 @@ void manage_desktop( WCHAR *arg ) HDESK desktop = 0; GUID guid; MSG msg; - HWND hwnd, msg_hwnd; + HWND hwnd; HMODULE graphics_driver; unsigned int width, height; WCHAR *cmdline = NULL, *driver = NULL; @@ -856,12 +856,12 @@ void manage_desktop( WCHAR *arg ) hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, &guid ); - /* create the HWND_MESSAGE parent */ - msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - 0, 0, 100, 100, 0, 0, 0, NULL ); - - if (hwnd == GetDesktopWindow()) + if (hwnd) { + /* create the HWND_MESSAGE parent */ + CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + 0, 0, 100, 100, 0, 0, 0, NULL ); + using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); @@ -891,13 +891,6 @@ void manage_desktop( WCHAR *arg ) } } } - else - { - DestroyWindow( hwnd ); /* someone beat us to it */ - hwnd = 0; - } - - if (GetAncestor( msg_hwnd, GA_PARENT )) DestroyWindow( msg_hwnd ); /* someone beat us to it */ /* if we have a command line, execute it */ if (cmdline)

1 0

Jacek Caban : atl80: Share atl_ax.c with atl100.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 3f9b3718e92bf2c48b83d958f5d1e1525ff6a45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9b3718e92bf2c48b83d958f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 28 12:48:24 2014 +0100 atl80: Share atl_ax.c with atl100. --- dlls/atl100/atl_ax.c | 4 +++- dlls/atl80/Makefile.in | 8 +++++--- dlls/atl80/atl80.c | 53 ------------------------------------------------ dlls/atl80/atl80.spec | 18 ++++++++-------- 4 files changed, 17 insertions(+), 66 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index 0f0f3c6..be0b836 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -87,7 +87,9 @@ BOOL WINAPI AtlAxWinInit(void) { WNDCLASSEXW wcex; -#if _ATL_VER == _ATL_VER_90 +#if _ATL_VER == _ATL_VER_80 +#define ATL_NAME_SUFFIX '8','0',0 +#elif _ATL_VER == _ATL_VER_90 #define ATL_NAME_SUFFIX '9','0',0 #elif _ATL_VER == _ATL_VER_100 #define ATL_NAME_SUFFIX '1','0','0',0 diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 43cc2d3..65f8055 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,9 +1,11 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = atl100 oleaut32 user32 ole32 +IMPORTS = atl100 oleaut32 user32 ole32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_80 +PARENTSRC = ../atl100 - -C_SRCS = atl80.c +C_SRCS = \ + atl80.c \ + atl_ax.c RC_SRCS = atl80.rc diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index 487ee49..d39819a 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -98,56 +98,3 @@ DWORD WINAPI AtlGetVersion(void *pReserved) TRACE("version %04x (%p)\n", _ATL_VER, pReserved); return _ATL_VER; } - -/********************************************************************** - * AtlAxWin class window procedure - */ -static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) -{ - if ( wMsg == WM_CREATE ) - { - DWORD len = GetWindowTextLengthW( hWnd ) + 1; - WCHAR *ptr = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); - if (!ptr) - return 1; - GetWindowTextW( hWnd, ptr, len ); - AtlAxCreateControlEx( ptr, hWnd, NULL, NULL, NULL, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, ptr ); - return 0; - } - return DefWindowProcW( hWnd, wMsg, wParam, lParam ); -} - -BOOL WINAPI AtlAxWinInit(void) -{ - WNDCLASSEXW wcex; - const WCHAR AtlAxWin80[] = {'A','t','l','A','x','W','i','n','8','0',0}; - const WCHAR AtlAxWinLic80[] = {'A','t','l','A','x','W','i','n','L','i','c','8','0',0}; - - FIXME("version %04x semi-stub\n", _ATL_VER); - - if ( FAILED( OleInitialize(NULL) ) ) - return FALSE; - - wcex.cbSize = sizeof(wcex); - wcex.style = CS_GLOBALCLASS | CS_DBLCLKS; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = GetModuleHandleW( NULL ); - wcex.hIcon = NULL; - wcex.hCursor = NULL; - wcex.hbrBackground = NULL; - wcex.lpszMenuName = NULL; - wcex.hIconSm = 0; - - wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin80; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - wcex.lpszClassName = AtlAxWinLic80; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - return TRUE; -} diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 3d53d06..a595681 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -20,20 +20,20 @@ 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) -35 stdcall AtlAxDialogBoxW(long wstr long ptr long) atl100.AtlAxDialogBoxW -36 stdcall AtlAxDialogBoxA(long str long ptr long) atl100.AtlAxDialogBoxA -37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW -38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA -39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl -40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx -41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +35 stdcall AtlAxDialogBoxW(long wstr long ptr long) +36 stdcall AtlAxDialogBoxA(long str long ptr long) +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) +38 stdcall AtlAxCreateDialogA(long str long ptr long) +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) +41 stdcall AtlAxAttachControl(ptr ptr ptr) 42 stdcall AtlAxWinInit() 43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData 44 stdcall AtlWinModuleExtractCreateWndData(ptr) atl100.AtlWinModuleExtractCreateWndData 45 stub AtlWinModuleRegisterWndClassInfoW 46 stub AtlWinModuleRegisterWndClassInfoA -47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl -48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost +47 stdcall AtlAxGetControl(long ptr) +48 stdcall AtlAxGetHost(long ptr) 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save

1 0

Vincent Povirk : setupapi: Stub SetupDiDestroyDriverInfoList.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: bdadd760a3b0685d828a3cfa09ed8a82df72e48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdadd760a3b0685d828a3cfa0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 27 13:12:41 2014 -0600 setupapi: Stub SetupDiDestroyDriverInfoList. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 16cd339..4349055 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -307,7 +307,7 @@ @ stub SetupDiDeleteDeviceRegKey @ stdcall SetupDiDestroyClassImageList(ptr) @ stdcall SetupDiDestroyDeviceInfoList(long) -@ stub SetupDiDestroyDriverInfoList +@ stdcall SetupDiDestroyDriverInfoList(ptr ptr long) @ stdcall SetupDiDrawMiniIcon(ptr int128 long long) @ stdcall SetupDiEnumDeviceInfo(long long ptr) @ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 76dc410..fad9d23 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -525,6 +525,18 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA } /*********************************************************************** + * SetupDiDestroyDriverInfoList (SETUPAPI.@) + */ + +BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType) +{ + FIXME("%p %p %d\n", DeviceInfoSet, DeviceInfoData, DriverType); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetupDiDeleteDeviceInfo (SETUPAPI.@) */

1 0

Hans Leidekker : winhttp/tests: Fix a test that fails on Windows.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 0e9f46d0749d7309ca42d7f5691a3ea64cc8c230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9f46d0749d7309ca42d7f56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 28 13:25:23 2014 +0100 winhttp/tests: Fix a test that fails on Windows. --- dlls/winhttp/tests/winhttp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 255eb09..74ec60d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -292,7 +292,7 @@ static void test_SendRequest (void) static const WCHAR test_file[] = {'/','p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR test_verb[] = {'P','O','S','T',0}; static CHAR post_data[] = "mode=Test"; - static const char test_post[] = "mode => Test\\0\n"; + static const char test_post[] = "mode => Test\0\n"; header_len = -1L; total_len = optional_len = sizeof(post_data); @@ -349,8 +349,8 @@ static void test_SendRequest (void) ret = WinHttpReadData(request, buffer, sizeof(buffer) - 1, &bytes_rw); ok(ret == TRUE, "WinHttpReadData failed: %u.\n", GetLastError()); - ok(bytes_rw == strlen(test_post), "Read %u bytes instead of %d.\n", bytes_rw, lstrlenA(test_post)); - ok(strncmp(buffer, test_post, bytes_rw) == 0, "Data read did not match, got '%s'.\n", buffer); + ok(bytes_rw == sizeof(test_post) - 1, "Read %u bytes\n", bytes_rw); + ok(!memcmp(buffer, test_post, sizeof(test_post) - 1), "Data read did not match.\n"); ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret);

1 0

Hans Leidekker : advapi32/tests: Add a test to show that OpenSCManager clears last error on success.
by Alexandre Julliard Jan. 28, 2014

Jan. 28, 2014

Module: wine Branch: master Commit: 6cd1076f61e9264bf19cb551f7a776b63da7bb44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd1076f61e9264bf19cb551f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 28 13:24:14 2014 +0100 advapi32/tests: Add a test to show that OpenSCManager clears last error on success. --- dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index fac6bd9..74cb9a8 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -101,7 +101,6 @@ static void test_open_scm(void) CloseServiceHandle(scm_handle); /* Just in case */ /* Proper call with an empty hostname */ - SetLastError(0xdeadbeef); scm_handle = OpenSCManagerA("", SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CONNECT); ok(scm_handle != NULL, "Expected success, got error %u\n", GetLastError()); CloseServiceHandle(scm_handle); @@ -109,6 +108,7 @@ static void test_open_scm(void) /* Again a correct one */ SetLastError(0xdeadbeef); scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", GetLastError()); ok(scm_handle != NULL, "Expected success, got error %u\n", GetLastError()); CloseServiceHandle(scm_handle); }

1 0