January 2014 - Wine-commits

Bruno Jesus : ws2_32: Return the correct address family in WSAStringToAddressA.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 4c6e04050f7c996506edab79518f43ce9ae4ce96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6e04050f7c996506edab795… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 18 19:03:27 2014 -0200 ws2_32: Return the correct address family in WSAStringToAddressA. --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a855285..0ae0c4f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6861,7 +6861,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, *lpAddressLength = sizeof(SOCKADDR_IN); memset(lpAddress, 0, sizeof(SOCKADDR_IN)); - ((LPSOCKADDR_IN)lpAddress)->sin_family = AF_INET; + ((LPSOCKADDR_IN)lpAddress)->sin_family = WS_AF_INET; ptrPort = strchr(workBuffer, ':'); if(ptrPort)

1 0

Bruno Jesus : ws2_32/tests: Add missing closesocket calls (Coverity).
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 84d91bb93d97a79b63d7f81ebc828e9eeb66efd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d91bb93d97a79b63d7f81eb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jan 18 19:07:52 2014 -0200 ws2_32/tests: Add missing closesocket calls (Coverity). --- dlls/ws2_32/tests/sock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0abf732..8cee632 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1061,6 +1061,9 @@ static void test_WithWSAStartup(void) ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); } + closesocket(src); + closesocket(dst); + WSACleanup(); }

1 0

Nikolay Sivov : widl: Fix pointer size for SYS_WIN64 typelibs.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: c46debeeebfcaa7a158dd7cdd8a67b05d74f02c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46debeeebfcaa7a158dd7cdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 19 20:45:02 2014 +0400 widl: Fix pointer size for SYS_WIN64 typelibs. The fact that test data was wrong was hidden by broken widl typelib, and same test typelib was used on windows so we never get proper test results. Standard IUnknown/IDispatch that live in system stdole2.tlb are also tested now. --- dlls/oleaut32/tests/typelib.c | 26 +++++++++++++++++++++----- dlls/oleaut32/typelib.c | 4 ++-- tools/widl/write_msft.c | 28 +++++++++++++--------------- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index d3980f8..2ceebc5 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -651,7 +651,7 @@ static const char *create_test_typelib(int res_no) static void test_TypeInfo(void) { ITypeLib *pTypeLib; - ITypeInfo *pTypeInfo; + ITypeInfo *pTypeInfo, *ti; ITypeInfo2 *pTypeInfo2; HRESULT hr; static WCHAR wszBogus[] = { 'b','o','g','u','s',0 }; @@ -668,6 +668,7 @@ static void test_TypeInfo(void) TYPEKIND kind; const char *filenameA; WCHAR filename[MAX_PATH]; + TYPEATTR *attr; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -765,8 +766,6 @@ static void test_TypeInfo(void) ITypeInfo_Release(pTypeInfo); - - hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IDispatch, &pTypeInfo); ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); @@ -792,6 +791,23 @@ static void test_TypeInfo(void) VariantClear(&var); } + /* Check instance size for IDispatch, typelib is loaded using system SYS_WIN* kind so it always matches + system bitness. */ + hr = ITypeInfo_GetTypeAttr(pTypeInfo, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(attr->cbSizeInstance == sizeof(void*), "got size %d\n", attr->cbSizeInstance); + ok(attr->typekind == TKIND_INTERFACE, "got typekind %d\n", attr->typekind); + ITypeInfo_ReleaseTypeAttr(pTypeInfo, attr); + + /* same size check with some general interface */ + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IEnumVARIANT, &ti); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITypeInfo_GetTypeAttr(ti, &attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(attr->cbSizeInstance == sizeof(void*), "got size %d\n", attr->cbSizeInstance); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); + /* test invoking a method with a [restricted] keyword */ /* correct member id -- wrong flags -- cNamedArgs not bigger than cArgs */ @@ -3757,7 +3773,7 @@ static const interface_info info[] = { /* interfaces count: 2 */ { "IDualIface", - /*kind*/ TKIND_DISPATCH, /*flags*/ 0x1040, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_DISPATCH, /*flags*/ 0x1040, /*align*/ 4, /*size*/ sizeof(void*), /*#vtbl*/ 7, /*#func*/ 8, { { @@ -3898,7 +3914,7 @@ static const interface_info info[] = { }, { "ISimpleIface", - /*kind*/ TKIND_INTERFACE, /*flags*/ 0x1000, /*align*/ 4, /*size*/ 4, + /*kind*/ TKIND_INTERFACE, /*flags*/ 0x1000, /*align*/ 4, /*size*/ sizeof(void*), /*#vtbl*/ 8, /*#func*/ 1, { { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index e5a99e8..4213ae6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3545,7 +3545,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) cx.length = dwTLBLength; /* read header */ - MSFT_ReadLEDWords((void*)&tlbHeader, sizeof(tlbHeader), &cx, 0); + MSFT_ReadLEDWords(&tlbHeader, sizeof(tlbHeader), &cx, 0); TRACE_(typelib)("header:\n"); TRACE_(typelib)("\tmagic1=0x%08x ,magic2=0x%08x\n",tlbHeader.magic1,tlbHeader.magic2 ); if (tlbHeader.magic1 != MSFT_SIGNATURE) { @@ -9645,7 +9645,7 @@ static DWORD WMSFT_compile_typeinfo(ITypeInfoImpl *info, INT16 index, WMSFT_TLBF size = sizeof(MSFT_TypeInfoBase); if(data){ - MSFT_TypeInfoBase *base = (void*)data; + MSFT_TypeInfoBase *base = (MSFT_TypeInfoBase*)data; if(info->wTypeFlags & TYPEFLAG_FDUAL) base->typekind = TKIND_DISPATCH; else diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 6eb229a..cc039dc 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -174,7 +174,7 @@ static void ctl2_init_segdir( segdir = &typelib->typelib_segdir[MSFT_SEG_TYPEINFO]; - for (i = 0; i < 15; i++) { + for (i = 0; i < MSFT_SEG_MAX; i++) { segdir[i].offset = -1; segdir[i].length = 0; segdir[i].res08 = -1; @@ -827,7 +827,6 @@ static int encode_type( case VT_UI4: case VT_R4: case VT_ERROR: - case VT_BSTR: case VT_HRESULT: *encoded_type = default_type; *width = 4; @@ -863,8 +862,9 @@ static int encode_type( case VT_UNKNOWN: case VT_DISPATCH: + case VT_BSTR: *encoded_type = default_type; - *width = 4; + *width = pointer_size; *alignment = 4; break; @@ -875,7 +875,7 @@ static int encode_type( case VT_LPSTR: case VT_LPWSTR: *encoded_type = 0xfffe0000 | vt; - *width = 4; + *width = pointer_size; *alignment = 4; break; @@ -898,7 +898,7 @@ static int encode_type( if(next_vt == VT_DISPATCH || next_vt == VT_UNKNOWN) { chat("encode_type: skipping ptr\n"); *encoded_type = target_type; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = child_size; break; @@ -928,13 +928,12 @@ static int encode_type( *encoded_type = typeoffset; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; } - case VT_SAFEARRAY: { type_t *element_type = type_alias_get_aliasee(type_array_get_element(type)); @@ -966,13 +965,12 @@ static int encode_type( *encoded_type = typeoffset; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; } - case VT_USERDEFINED: { int typeinfo_offset; @@ -1119,7 +1117,7 @@ static int encode_var( chat("encode_var: skipping ptr\n"); *encoded_type = target_type; *decoded_size = child_size; - *width = 4; + *width = pointer_size; *alignment = 4; return 0; } @@ -1148,7 +1146,7 @@ static int encode_var( *encoded_type = typeoffset; - *width = 4; + *width = pointer_size; *alignment = 4; *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; return 0; @@ -1728,7 +1726,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) break; case TKIND_DISPATCH: var_kind = 3; /* VAR_DISPATCH */ - typeinfo->datawidth = 4; + typeinfo->datawidth = pointer_size; var_alignment = 4; break; default: @@ -1981,7 +1979,7 @@ static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinte msft_typeinfo = create_msft_typeinfo(typelib, TKIND_DISPATCH, dispinterface->name, dispinterface->attrs); - msft_typeinfo->typeinfo->size = 4; + msft_typeinfo->typeinfo->size = pointer_size; msft_typeinfo->typeinfo->typekind |= 0x2100; msft_typeinfo->typeinfo->flags |= 0x1000; /* TYPEFLAG_FDISPATCHABLE */ @@ -2046,7 +2044,7 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) interface->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_INTERFACE, interface->name, interface->attrs); - msft_typeinfo->typeinfo->size = 4; + msft_typeinfo->typeinfo->size = pointer_size; msft_typeinfo->typeinfo->typekind |= 0x2200; for (derived = inherit; derived; derived = type_iface_get_inherit(derived)) @@ -2210,7 +2208,7 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) first_source->flags |= 0x1; msft_typeinfo->typeinfo->cImplTypes = num_ifaces; - msft_typeinfo->typeinfo->size = 4; + msft_typeinfo->typeinfo->size = pointer_size; msft_typeinfo->typeinfo->typekind |= 0x2200; }

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::GetFolder.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: efced588616da1ac8153b3d7da40a3dd6dd14bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efced588616da1ac8153b3d7d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:06:28 2014 +0900 taskschd: Implement ITaskFolder::GetFolder. --- dlls/taskschd/folder.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 6d69002..6871138 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -194,10 +194,16 @@ static HRESULT WINAPI TaskFolder_get_Path(ITaskFolder *iface, BSTR *path) return S_OK; } -static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskFolder **folder) +static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskFolder **new_folder) { - FIXME("%p,%s,%p: stub\n", iface, debugstr_w(path), folder); - return E_NOTIMPL; + TaskFolder *folder = impl_from_ITaskFolder(iface); + + TRACE("%p,%s,%p\n", iface, debugstr_w(path), folder); + + if (!path) return E_INVALIDARG; + if (!new_folder) return E_POINTER; + + return TaskFolder_create(folder->path, path, new_folder); } static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITaskFolderCollection **folders)

1 0

Dmitry Timoshkov : taskschd: Implement ITaskFolder::CreateFolder.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: d6f6b6b798c51119f91a815b8720033ae3e99a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f6b6b798c51119f91a815b8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 20 16:07:46 2014 +0900 taskschd: Implement ITaskFolder::CreateFolder. --- dlls/taskschd/folder.c | 72 ++++++++++++++++++++++++++++++++------ dlls/taskschd/task.c | 2 +- dlls/taskschd/taskschd_private.h | 2 +- dlls/taskschd/tests/scheduler.c | 15 ++------ 4 files changed, 65 insertions(+), 26 deletions(-) diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 6871138..4eb7b8a 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -134,6 +134,30 @@ static HRESULT WINAPI TaskFolder_get_Name(ITaskFolder *iface, BSTR *name) return S_OK; } +static HRESULT reg_create_folder(const WCHAR *path, HKEY *hfolder) +{ + HKEY hroot; + DWORD ret, disposition; + + ret = RegCreateKeyA(HKEY_LOCAL_MACHINE, root, &hroot); + if (ret) return HRESULT_FROM_WIN32(ret); + + while (*path == '\\') path++; + ret = RegCreateKeyExW(hroot, path, 0, NULL, 0, KEY_ALL_ACCESS, NULL, hfolder, &disposition); + if (ret == ERROR_FILE_NOT_FOUND) + ret = ERROR_PATH_NOT_FOUND; + + if (ret == ERROR_SUCCESS && disposition == REG_OPENED_EXISTING_KEY) + { + RegCloseKey(*hfolder); + ret = ERROR_ALREADY_EXISTS; + } + + RegCloseKey(hroot); + + return HRESULT_FROM_WIN32(ret); +} + static HRESULT reg_open_folder(const WCHAR *path, HKEY *hfolder) { HKEY hroot; @@ -203,7 +227,7 @@ static HRESULT WINAPI TaskFolder_GetFolder(ITaskFolder *iface, BSTR path, ITaskF if (!path) return E_INVALIDARG; if (!new_folder) return E_POINTER; - return TaskFolder_create(folder->path, path, new_folder); + return TaskFolder_create(folder->path, path, new_folder, FALSE); } static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITaskFolderCollection **folders) @@ -212,10 +236,32 @@ static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITas return E_NOTIMPL; } -static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR name, VARIANT sddl, ITaskFolder **folder) +static inline BOOL is_variant_null(const VARIANT *var) { - FIXME("%p,%s,%s,%p: stub\n", iface, debugstr_w(name), debugstr_variant(&sddl), folder); - return E_NOTIMPL; + return V_VT(var) == VT_EMPTY || V_VT(var) == VT_NULL || + (V_VT(var) == VT_BSTR && (V_BSTR(var) == NULL || !*V_BSTR(var))); +} + +static HRESULT WINAPI TaskFolder_CreateFolder(ITaskFolder *iface, BSTR path, VARIANT sddl, ITaskFolder **new_folder) +{ + TaskFolder *folder = impl_from_ITaskFolder(iface); + ITaskFolder *tmp_folder = NULL; + HRESULT hr; + + TRACE("%p,%s,%s,%p\n", iface, debugstr_w(path), debugstr_variant(&sddl), folder); + + if (!path) return E_INVALIDARG; + + if (!new_folder) new_folder = &tmp_folder; + + if (!is_variant_null(&sddl)) + FIXME("security descriptor %s is ignored\n", debugstr_variant(&sddl)); + + hr = TaskFolder_create(folder->path, path, new_folder, TRUE); + if (tmp_folder) + ITaskFolder_Release(tmp_folder); + + return hr; } static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LONG flags) @@ -302,7 +348,7 @@ static const ITaskFolderVtbl TaskFolder_vtbl = TaskFolder_SetSecurityDescriptor }; -HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj) +HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) { static const WCHAR bslash[] = { '\\', 0 }; TaskFolder *folder; @@ -328,17 +374,21 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder ** if (parent) strcpyW(folder_path, parent); - len = strlenW(folder_path); - if (!len || folder_path[len - 1] != '\\') - strcatW(folder_path, bslash); - - if (path) + if (path && *path) { + len = strlenW(folder_path); + if (!len || folder_path[len - 1] != '\\') + strcatW(folder_path, bslash); + while (*path == '\\') path++; strcatW(folder_path, path); } - hr = reg_open_folder(folder_path, &hfolder); + len = strlenW(folder_path); + if (!len) + strcatW(folder_path, bslash); + + hr = create ? reg_create_folder(folder_path, &hfolder) : reg_open_folder(folder_path, &hfolder); if (hr) { HeapFree(GetProcessHeap(), 0, folder_path); diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 632cabb..a13a968 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -117,7 +117,7 @@ static HRESULT WINAPI TaskService_GetFolder(ITaskService *iface, BSTR path, ITas if (!folder) return E_POINTER; - return TaskFolder_create(path, NULL, folder); + return TaskFolder_create(path, NULL, folder, FALSE); } static HRESULT WINAPI TaskService_GetRunningTasks(ITaskService *iface, LONG flags, IRunningTaskCollection **tasks) diff --git a/dlls/taskschd/taskschd_private.h b/dlls/taskschd/taskschd_private.h index deebc41..4ef348f 100644 --- a/dlls/taskschd/taskschd_private.h +++ b/dlls/taskschd/taskschd_private.h @@ -17,6 +17,6 @@ */ HRESULT TaskService_create(void **obj) DECLSPEC_HIDDEN; -HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj) DECLSPEC_HIDDEN; +HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **obj, BOOL create) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT *v) DECLSPEC_HIDDEN; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index a976de2..61e4a04 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -185,7 +185,6 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_CreateFolder(folder, NULL, v_null, &subfolder); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); /* Just in case something was left from previous runs */ @@ -205,20 +204,14 @@ todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2, v_null, &subfolder); -todo_wine ok(hr == S_OK, "CreateFolder error %#x\n", hr); - if (hr != S_OK) - { - ITaskFolder_Release(folder); - ITaskService_Release(service); - return; - } ITaskFolder_Release(subfolder); hr = ITaskFolder_CreateFolder(folder, Wine, v_null, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_, v_null, &subfolder); +todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_CreateFolder(folder, Wine, v_null, &subfolder); @@ -239,11 +232,6 @@ todo_wine hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); ok(hr == S_OK, "GetFolder error %#x\n", hr); - if (hr != S_OK) - { - ITaskService_Release(service); - return; - } hr = ITaskFolder_get_Name(subfolder, &bstr); ok (hr == S_OK, "get_Name error %#x\n", hr); @@ -303,6 +291,7 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_GetFolder(subfolder, bslash, &subfolder2); +todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); hr = ITaskFolder_GetFolder(subfolder, NULL, &subfolder2);

1 0

Jacek Caban : atl90: Share atl_ax.c with atl100.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 1a130126053105d9022f7a83fc95587bdb415ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a130126053105d9022f7a83f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 20 14:46:56 2014 +0100 atl90: Share atl_ax.c with atl100. --- dlls/atl100/atl_ax.c | 17 ++++++++++++---- dlls/atl90/Makefile.in | 7 +++++-- dlls/atl90/atl90.c | 53 ------------------------------------------------ dlls/atl90/atl90.spec | 18 ++++++++-------- 4 files changed, 27 insertions(+), 68 deletions(-) diff --git a/dlls/atl100/atl_ax.c b/dlls/atl100/atl_ax.c index 50ebe3b..0f0f3c6 100644 --- a/dlls/atl100/atl_ax.c +++ b/dlls/atl100/atl_ax.c @@ -86,8 +86,17 @@ static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, L BOOL WINAPI AtlAxWinInit(void) { WNDCLASSEXW wcex; - const WCHAR AtlAxWin100[] = {'A','t','l','A','x','W','i','n','1','0','0',0}; - const WCHAR AtlAxWinLic100[] = {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0}; + +#if _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 +#else +#error Unsupported version +#endif + + const WCHAR AtlAxWinW[] = {'A','t','l','A','x','W','i','n',ATL_NAME_SUFFIX}; + const WCHAR AtlAxWinLicW[] = {'A','t','l','A','x','W','i','n','L','i','c',ATL_NAME_SUFFIX}; FIXME("version %04x semi-stub\n", _ATL_VER); @@ -106,11 +115,11 @@ BOOL WINAPI AtlAxWinInit(void) wcex.hIconSm = 0; wcex.lpfnWndProc = AtlAxWin_wndproc; - wcex.lpszClassName = AtlAxWin100; + wcex.lpszClassName = AtlAxWinW; if ( !RegisterClassExW( &wcex ) ) return FALSE; - wcex.lpszClassName = AtlAxWinLic100; + wcex.lpszClassName = AtlAxWinLicW; if ( !RegisterClassExW( &wcex ) ) return FALSE; diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index f52b7d5..677aaae 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,7 +1,10 @@ MODULE = atl90.dll -IMPORTS = atl100 oleaut32 user32 ole32 +IMPORTS = atl100 oleaut32 user32 ole32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_90 +PARENTSRC = ../atl100 -C_SRCS = atl90.c +C_SRCS = \ + atl90.c \ + atl_ax.c RC_SRCS = atl90.rc diff --git a/dlls/atl90/atl90.c b/dlls/atl90/atl90.c index 06e8066..9dd0b70 100644 --- a/dlls/atl90/atl90.c +++ b/dlls/atl90/atl90.c @@ -40,56 +40,3 @@ DWORD WINAPI AtlGetVersion(void *reserved) TRACE("version %04x (%p)\n", _ATL_VER, reserved); return _ATL_VER; } - -/********************************************************************** - * AtlAxWin class window procedure - */ -static LRESULT CALLBACK AtlAxWin_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - if ( msg == 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, msg, wparam, lparam ); -} - -BOOL WINAPI AtlAxWinInit(void) -{ - WNDCLASSEXW wcex; - const WCHAR AtlAxWin90[] = {'A','t','l','A','x','W','i','n','9','0',0}; - const WCHAR AtlAxWinLic90[] = {'A','t','l','A','x','W','i','n','L','i','c','9','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 = AtlAxWin90; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - wcex.lpszClassName = AtlAxWinLic90; - if ( !RegisterClassExW( &wcex ) ) - return FALSE; - - return TRUE; -} diff --git a/dlls/atl90/atl90.spec b/dlls/atl90/atl90.spec index 045969e..35facf8 100644 --- a/dlls/atl90/atl90.spec +++ b/dlls/atl90/atl90.spec @@ -18,20 +18,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

Piotr Caban : msvcp90: Fix basic_istream<wchar>::read implementation.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 75bcbece56e5158f19c1f9d0dfee50102417bc40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75bcbece56e5158f19c1f9d0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 15:08:13 2014 +0100 msvcp90: Fix basic_istream<wchar>::read implementation. --- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp90/ios.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 693c376..a853f6d 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7156,7 +7156,7 @@ static basic_istream_char* basic_istream_char__Read_s(basic_istream_char *this, DEFINE_THISCALL_WRAPPER(basic_istream_char_read, 12) basic_istream_char* __thiscall basic_istream_char_read(basic_istream_char *this, char *str, streamsize count) { - return basic_istream_char__Read_s(this, str, count, count); + return basic_istream_char__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHPADIH(a)Z */ @@ -8397,7 +8397,7 @@ static basic_istream_wchar* basic_istream_wchar__Read_s(basic_istream_wchar *thi DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read, 12) basic_istream_wchar* __thiscall basic_istream_wchar_read(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar__Read_s(this, str, count, count); + return basic_istream_wchar__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEHPA_WIH(a)Z */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a89352e..c4ef9a0 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8111,7 +8111,7 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_read, 12) #endif basic_istream_char* __thiscall basic_istream_char_read(basic_istream_char *this, char *str, streamsize count) { - return basic_istream_char__Read_s(this, str, count, count); + return basic_istream_char__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHPADIH(a)Z */ @@ -9418,7 +9418,7 @@ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_read, 12) #endif basic_istream_wchar* __thiscall basic_istream_wchar_read(basic_istream_wchar *this, wchar_t *str, streamsize count) { - return basic_istream_wchar__Read_s(this, str, count, count); + return basic_istream_wchar__Read_s(this, str, -1, count); } /* ?_Readsome_s@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEHPA_WIH(a)Z */

1 0

Piotr Caban : msvcp90: Read last character of bool string in num_get_do_get_bool.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 12cfebb683fa71d6a0cab967620533a7e25821a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12cfebb683fa71d6a0cab9676… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 15:08:27 2014 +0100 msvcp90: Read last character of bool string in num_get_do_get_bool. --- dlls/msvcp60/locale.c | 12 ++++++++---- dlls/msvcp90/locale.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index a2ce279..6b95521 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -4828,8 +4828,7 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, pfalse = basic_string_wchar_c_str(&false_bstr); ptrue = basic_string_wchar_c_str(&true_bstr); - for(istreambuf_iterator_wchar_val(&first); first.strbuf; - istreambuf_iterator_wchar_inc(&first)) { + for(istreambuf_iterator_wchar_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -4845,6 +4844,9 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_wchar_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; } @@ -5608,8 +5610,7 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi pfalse = basic_string_char_c_str(&false_bstr); ptrue = basic_string_char_c_str(&true_bstr); - for(istreambuf_iterator_char_val(&first); first.strbuf; - istreambuf_iterator_char_inc(&first)) { + for(istreambuf_iterator_char_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -5625,6 +5626,9 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_char_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 02ccb0e..2cdd002 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5850,8 +5850,7 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, pfalse = MSVCP_basic_string_wchar_c_str(&false_bstr); ptrue = MSVCP_basic_string_wchar_c_str(&true_bstr); - for(istreambuf_iterator_wchar_val(&first); first.strbuf; - istreambuf_iterator_wchar_inc(&first)) { + for(istreambuf_iterator_wchar_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -5867,6 +5866,9 @@ static istreambuf_iterator_wchar* num_get_do_get_bool(const num_get *this, if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_wchar_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; } @@ -6823,8 +6825,7 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi pfalse = MSVCP_basic_string_char_c_str(&false_bstr); ptrue = MSVCP_basic_string_char_c_str(&true_bstr); - for(istreambuf_iterator_char_val(&first); first.strbuf; - istreambuf_iterator_char_inc(&first)) { + for(istreambuf_iterator_char_val(&first); first.strbuf;) { if(pfalse && *pfalse && first.val!=*pfalse) pfalse = NULL; if(ptrue && *ptrue && first.val!=*ptrue) @@ -6840,6 +6841,9 @@ istreambuf_iterator_char *__thiscall num_get_char_do_get_bool(const num_get *thi if(ptrue) ptrue++; + if(pfalse || ptrue) + istreambuf_iterator_char_inc(&first); + if((!pfalse || !*pfalse) && (!ptrue || !*ptrue)) break; }

1 0

Piotr Caban : msvcp90: Fix ios_base_setf implementation.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 47f4e08a93eac8acbcf1ca307b30d5e531a8dbc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f4e08a93eac8acbcf1ca307… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 15:08:45 2014 +0100 msvcp90: Fix ios_base_setf implementation. --- dlls/msvcp60/ios.c | 7 ++++++- dlls/msvcp90/ios.c | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index a853f6d..b223d10 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -4494,7 +4494,12 @@ IOSB_fmtflags __thiscall ios_base_setf_mask(ios_base *this, IOSB_fmtflags flags, DEFINE_THISCALL_WRAPPER(ios_base_setf, 8) IOSB_fmtflags __thiscall ios_base_setf(ios_base *this, IOSB_fmtflags flags) { - return ios_base_setf_mask(this, flags, ~0); + IOSB_fmtflags ret = this->fmtfl; + + TRACE("(%p %x)\n", this, flags); + + this->fmtfl |= flags & FMTFLAG_mask; + return ret; } /* ?setstate(a)ios_base@std@@QAEXH_N(a)Z */ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c4ef9a0..98d1696 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5165,7 +5165,12 @@ IOSB_fmtflags __thiscall ios_base_setf_mask(ios_base *this, IOSB_fmtflags flags, DEFINE_THISCALL_WRAPPER(ios_base_setf, 8) IOSB_fmtflags __thiscall ios_base_setf(ios_base *this, IOSB_fmtflags flags) { - return ios_base_setf_mask(this, flags, ~0); + IOSB_fmtflags ret = this->fmtfl; + + TRACE("(%p %x)\n", this, flags); + + this->fmtfl |= flags & FMTFLAG_mask; + return ret; } /* ?setstate(a)ios_base@std@@QAEXH_N(a)Z */

1 0

Piotr Caban : msvcp60: Add std::_Fpz export.
by Alexandre Julliard 27 Jan '14

27 Jan '14

Module: wine Branch: master Commit: 76db3b0debb9489b54650bf36379c246ed702f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76db3b0debb9489b54650bf36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 20 18:18:50 2014 +0100 msvcp60: Add std::_Fpz export. --- dlls/msvcp60/main.c | 3 +++ dlls/msvcp60/msvcp60.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index e9c6975..3c5e36f 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -54,6 +54,9 @@ DEFINE_VTBL_WRAPPER(48); #endif +/* ?_Fpz(a)std@@3_JB */ +const __int64 std_Fpz = 0; + void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 648be15..dd553da 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2077,7 +2077,7 @@ @ stub -arch=win64 ?_Fput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DPEBD_K3(a)Z @ stub -arch=win32 ?_Fput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@GPBDII(a)Z @ stub -arch=win64 ?_Fput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@GPEBD_K3(a)Z -@ stub ?_Fpz(a)std@@3_JB +@ extern ?_Fpz(a)std@@3_JB std_Fpz @ thiscall -arch=win32 ?_Freeze@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEXXZ(ptr) basic_string_char__Freeze @ cdecl -arch=win64 ?_Freeze@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAXXZ(ptr) basic_string_char__Freeze @ thiscall -arch=win32 ?_Freeze@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@AAEXXZ(ptr) basic_string_wchar__Freeze

1 0