March 2018 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Pass independent source and destination coordinates to wined3d_texture_upload_data ().
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 8647966e9f73a39a35e842db683025cc0802da11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8647966e9f73a39a35e842db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 20 15:29:56 2018 +0330 wined3d: Pass independent source and destination coordinates to wined3d_texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 16 +++---- dlls/wined3d/texture.c | 97 ++++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 10 +++-- 3 files changed, 48 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8647966e9f73a39a35e8…

1 0

Henri Verbeet : wined3d: Pass a format to wined3d_texture_upload_data().
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 37c516c95799d5d16e90866b4ebc0bc88748aec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37c516c95799d5d16e90866b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 20 15:29:55 2018 +0330 wined3d: Pass a format to wined3d_texture_upload_data(). The goal here is to eventually get rid of wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/texture.c | 26 ++++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0db2daa..5581791 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2126,8 +2126,8 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * &row_pitch, &slice_pitch); wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, &op->dst_box, - wined3d_const_bo_address(&addr), row_pitch, slice_pitch); + wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, dst_texture->resource.format, + &op->dst_box, wined3d_const_bo_address(&addr), row_pitch, slice_pitch); wined3d_texture_validate_location(dst_texture, op->dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(dst_texture, op->dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -2220,7 +2220,7 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_bind_and_dirtify(texture, context, FALSE); - wined3d_texture_upload_data(texture, op->sub_resource_idx, context, + wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, box, &addr, op->data.row_pitch, op->data.slice_pitch); wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 83c7a41..75f4cee 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1745,15 +1745,15 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { texture->texture_ops->texture_upload_data(texture, sub_resource_idx, - context, box, data, row_pitch, slice_pitch); + context, format, box, data, row_pitch, slice_pitch); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { struct wined3d_box src_box; @@ -1780,7 +1780,7 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int } wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, - texture->resource.format, &src_box, row_pitch, dst_x, dst_y, FALSE, data); + format, &src_box, row_pitch, dst_x, dst_y, FALSE, data); } /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ @@ -2411,10 +2411,9 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc * correct texture. */ /* Context activation is done by the caller. */ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) { - const struct wined3d_format *format = texture->resource.format; unsigned int level = sub_resource_idx % texture->level_count; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int x, y, z, update_w, update_h, update_d; @@ -2423,9 +2422,10 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int const void *mem = data->addr; void *converted_mem = NULL; - TRACE("texture %p, sub_resource_idx %u, context %p, box %s, data {%#x:%p}, row_pitch %#x, slice_pitch %#x.\n", - texture, sub_resource_idx, context, debug_box(box), - data->buffer_object, data->addr, row_pitch, slice_pitch); + TRACE("texture %p, sub_resource_idx %u, context %p, format %s, " + "box %s, data {%#x:%p}, row_pitch %#x, slice_pitch %#x.\n", + texture, sub_resource_idx, context, debug_d3dformat(format->id), + debug_box(box), data->buffer_object, data->addr, row_pitch, slice_pitch); width = wined3d_texture_get_level_width(texture, level); height = wined3d_texture_get_level_height(texture, level); @@ -2544,7 +2544,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); - texture3d_upload_data(texture, sub_resource_idx, context, + texture3d_upload_data(texture, sub_resource_idx, context, texture->resource.format, NULL, wined3d_const_bo_address(&data), row_pitch, slice_pitch); heap_free(data.addr); @@ -2571,7 +2571,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, NULL, &data, row_pitch, slice_pitch); + texture3d_upload_data(texture, sub_resource_idx, context, + texture->resource.format, NULL, &data, row_pitch, slice_pitch); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { @@ -2579,7 +2580,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - texture3d_upload_data(texture, sub_resource_idx, context, NULL, &data, row_pitch, slice_pitch); + texture3d_upload_data(texture, sub_resource_idx, context, + texture->resource.format, NULL, &data, row_pitch, slice_pitch); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c655c4..8de352b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3084,7 +3084,7 @@ struct gl_texture struct wined3d_texture_ops { void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); @@ -3284,7 +3284,7 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, HWND window, RECT *rect) DECLSPEC_HIDDEN; void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_box *box, + const struct wined3d_context *context, const struct wined3d_format *format, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : avifil32: Register proxy interfaces.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 168ca6ee7bcd1a64693bb86a79269ea911af0c94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=168ca6ee7bcd1a64693bb86a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 17 10:19:15 2018 +0000 avifil32: Register proxy interfaces. Based on a patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/Makefile.in | 4 ++- dlls/avifil32/avifil32.idl | 78 ++++++++++++++++++++++++++++++++++++++++- dlls/avifil32/avifile_private.h | 1 + dlls/avifil32/factory.c | 8 ++++- 4 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index 81d2ff8..4030514 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -1,6 +1,6 @@ MODULE = avifil32.dll IMPORTLIB = avifil32 -IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 +IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 C_SRCS = \ acmstream.c \ @@ -17,3 +17,5 @@ C_SRCS = \ IDL_SRCS = avifil32.idl RC_SRCS = avifil32.rc + +dlldata_EXTRADEFS = -DENTRY_PREFIX=avifil32_ diff --git a/dlls/avifil32/avifil32.idl b/dlls/avifil32/avifil32.idl index 420cbb9..1e3f191 100644 --- a/dlls/avifil32/avifil32.idl +++ b/dlls/avifil32/avifil32.idl @@ -18,8 +18,84 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma makedep proxy #pragma makedep register +import "wtypes.idl"; +import "unknwn.idl"; + +typedef struct _AVISTREAMINFOW +{ + DWORD fccType; + DWORD fccHandler; + DWORD dwFlags; + DWORD dwCaps; + WORD wPriority; + WORD wLanguage; + DWORD dwScale; + DWORD dwRate; + DWORD dwStart; + DWORD dwLength; + DWORD dwInitialFrames; + DWORD dwSuggestedBufferSize; + DWORD dwQuality; + DWORD dwSampleSize; + RECT rcFrame; + DWORD dwEditCount; + DWORD dwFormatChangeCount; + WCHAR szName[64]; +} AVISTREAMINFOW; + +[ + object, + uuid(00020021-0000-0000-c000-000000000046) +] +interface IAVIStream : IUnknown +{ + HRESULT Create(LPARAM lParam1, LPARAM lParam2); + HRESULT Info(AVISTREAMINFOW *psi, LONG lSize); + LONG FindSample(LONG lPos, LONG lFlags); + HRESULT ReadFormat(LONG lPos, [out,size_is(*lpcbFormat)] char *lpFormat, [in,out] LONG *lpcbFormat); + HRESULT SetFormat(LONG lPos, [in,size_is(cbFormat)] char *lpFormat, LONG cbFormat); + HRESULT Read(LONG lStart, LONG lSamples, [out,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, LONG *plBytes, LONG *plSamples); + HRESULT Write(LONG lStart, LONG lSamples, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer, DWORD dwFlags, LONG *plSampWritten, LONG *plBytesWritten); + HRESULT Delete(LONG lStart, LONG lSamples); + HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); + HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); + HRESULT SetInfo(AVISTREAMINFOW *plInfo, LONG cbInfo); +}; + +typedef struct _AVIFILEINFOW +{ + DWORD dwMaxBytesPerSec; + DWORD dwFlags; + DWORD dwCaps; + DWORD dwStreams; + DWORD dwSuggestedBufferSize; + DWORD dwWidth; + DWORD dwHeight; + DWORD dwScale; + DWORD dwRate; + DWORD dwLength; + DWORD dwEditCount; + WCHAR szFileType[64]; +} AVIFILEINFOW; + +[ + object, + uuid(00020020-0000-0000-c000-000000000046) +] +interface IAVIFile : IUnknown +{ + HRESULT Info(AVIFILEINFOW *pfi, LONG lSize); + HRESULT GetStream(IAVIStream **ppStream, DWORD fccType, LONG lParam); + HRESULT CreateStream(IAVIStream **ppStream, AVISTREAMINFOW *psi); + HRESULT WriteData(DWORD fcc, [in,size_is(cbBuffer)] char *lpBuffer, LONG cbBuffer); + HRESULT ReadData(DWORD fcc, [out,size_is(*lpcbBuffer)] char *lpBuffer, [in,out] LONG *lpcbBuffer); + HRESULT EndRecord(void); + HRESULT DeleteStream(DWORD fccType, LONG lParam); +}; + [ helpstring("Microsoft AVI Files"), threading(both), @@ -46,7 +122,7 @@ coclass WAVFile { interface IAVIFile; } threading(both), uuid(0002000d-0000-0000-c000-000000000046) ] -coclass AVIProxy { } +coclass PSFactoryBuffer { interface IFactoryBuffer; } [ helpstring("ACM Compressed Audio Stream"), diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h index 16893d9..4bf11f4 100644 --- a/dlls/avifil32/avifile_private.h +++ b/dlls/avifil32/avifile_private.h @@ -66,5 +66,6 @@ extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN; extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; extern LPCWSTR AVIFILE_BasenameW(LPCWSTR szFileName) DECLSPEC_HIDDEN; +extern HRESULT WINAPI avifil32_DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) DECLSPEC_HIDDEN; #endif diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 98231e8..3775aa5 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -182,12 +182,18 @@ LPCWSTR AVIFILE_BasenameW(LPCWSTR szPath) */ HRESULT WINAPI DllGetClassObject(REFCLSID pclsid, REFIID piid, LPVOID *ppv) { + HRESULT hr; + TRACE("(%s,%s,%p)\n", debugstr_guid(pclsid), debugstr_guid(piid), ppv); if (pclsid == NULL || piid == NULL || ppv == NULL) return E_FAIL; - return AVIFILE_CreateClassFactory(pclsid,piid,ppv); + hr = AVIFILE_CreateClassFactory(pclsid,piid,ppv); + if (SUCCEEDED(hr)) + return hr; + + return avifil32_DllGetClassObject(pclsid,piid,ppv); } /*****************************************************************************

1 0

Nikolay Sivov : comdlg32: Use ARRAY_SIZE macro.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 7514475c1cd23f72889e5620a88b09252eca8d3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7514475c1cd23f72889e5620… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 20 10:37:49 2018 +0300 comdlg32: Use ARRAY_SIZE macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/cdlg.h | 2 ++ dlls/comdlg32/colordlg.c | 2 +- dlls/comdlg32/filedlg31.c | 11 +++++------ dlls/comdlg32/filedlgbrowser.c | 4 ++-- dlls/comdlg32/fontdlg.c | 20 ++++++++++---------- dlls/comdlg32/itemdlg.c | 6 +++--- dlls/comdlg32/printdlg.c | 26 +++++++++++++------------- 7 files changed, 36 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7514475c1cd23f72889e…

1 0

Nikolay Sivov : comdlg32: Detach file dialog data after child windows were destroyed.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: b8d1e929e7d9d847b898c05e95112be12292adf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8d1e929e7d9d847b898c05e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 20 10:37:48 2018 +0300 comdlg32: Detach file dialog data after child windows were destroyed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index fa9ecfb..81eaeca 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1331,9 +1331,13 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_SETIMAGELIST, 0, 0); ImageList_Destroy(himl); } - RemovePropW(hwnd, filedlg_info_propnameW); return FALSE; } + + case WM_NCDESTROY: + RemovePropW(hwnd, filedlg_info_propnameW); + return 0; + case WM_NOTIFY: { LPNMHDR lpnmh = (LPNMHDR)lParam;

1 0

Owen Rudge : wsdapi: Store discovered namespaces and write xmlns attributes for them.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 402fce157901e0c51bf109a2c4b98632b3f74e58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=402fce157901e0c51bf109a2… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 19 21:46:38 2018 +0000 wsdapi: Store discovered namespaces and write xmlns attributes for them. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 67 +++++++++++++++++++++++++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 8 ++++-- dlls/wsdapi/wsdapi_internal.h | 4 +++ dlls/wsdapi/xml.c | 2 +- 4 files changed, 74 insertions(+), 7 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index abea33c..40edd15 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -71,6 +71,13 @@ static const WCHAR relatesToString[] = { 'R','e','l','a','t','e','s','T','o', 0 static const WCHAR appSequenceString[] = { 'A','p','p','S','e','q','u','e','n','c','e', 0 }; static const WCHAR emptyString[] = { 0 }; +struct discovered_namespace +{ + struct list entry; + LPCWSTR prefix; + LPCWSTR uri; +}; + static char *wide_to_utf8(LPCWSTR wide_string, int *length) { char *new_string = NULL; @@ -252,6 +259,31 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac /* TODO: Implement RelatesTo, ReplyTo, From, FaultTo */ } +static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE *discovered_ns) +{ + struct discovered_namespace *ns; + + LIST_FOR_EACH_ENTRY(ns, namespaces, struct discovered_namespace, entry) + { + if (lstrcmpW(ns->uri, discovered_ns->Uri) == 0) + return TRUE; /* Already added */ + } + + ns = WSDAllocateLinkedMemory(namespaces, sizeof(struct discovered_namespace)); + + if (ns == NULL) + return FALSE; + + ns->prefix = duplicate_string(ns, discovered_ns->PreferredPrefix); + ns->uri = duplicate_string(ns, discovered_ns->Uri); + + if ((ns->prefix == NULL) || (ns->uri == NULL)) + return FALSE; + + list_add_tail(namespaces, &ns->entry); + return TRUE; +} + static WSDXML_ELEMENT *create_soap_header_xml_elements(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header) { WSDXML_ELEMENT *header_element = NULL, *app_sequence_element = NULL; @@ -309,9 +341,10 @@ cleanup: static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header, WSDXML_ELEMENT *body_element, WS_HEAP **heap, char **output_xml, ULONG *xml_length, struct list *discovered_namespaces) { - WS_XML_STRING *actual_envelope_prefix = NULL, *envelope_uri_xmlstr = NULL; + WS_XML_STRING *actual_envelope_prefix = NULL, *envelope_uri_xmlstr = NULL, *tmp_prefix = NULL, *tmp_uri = NULL; WSDXML_NAMESPACE *addressing_ns = NULL, *discovery_ns = NULL, *envelope_ns = NULL; WSDXML_ELEMENT *header_element = NULL; + struct discovered_namespace *ns; WS_XML_BUFFER *buffer = NULL; WS_XML_WRITER *writer = NULL; WS_XML_STRING envelope; @@ -320,10 +353,13 @@ static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER /* Create the necessary XML prefixes */ if (FAILED(IWSDXMLContext_AddNamespace(xml_context, addressingNsUri, addressingPrefix, &addressing_ns))) goto cleanup; + if (!add_discovered_namespace(discovered_namespaces, addressing_ns)) goto cleanup; if (FAILED(IWSDXMLContext_AddNamespace(xml_context, discoveryNsUri, discoveryPrefix, &discovery_ns))) goto cleanup; + if (!add_discovered_namespace(discovered_namespaces, discovery_ns)) goto cleanup; if (FAILED(IWSDXMLContext_AddNamespace(xml_context, envelopeNsUri, envelopePrefix, &envelope_ns))) goto cleanup; + if (!add_discovered_namespace(discovered_namespaces, envelope_ns)) goto cleanup; envelope.bytes = envelopeString; envelope.length = sizeof(envelopeString) - 1; @@ -356,6 +392,23 @@ static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER ret = WsWriteStartElement(writer, actual_envelope_prefix, &envelope, envelope_uri_xmlstr, NULL); if (FAILED(ret)) goto cleanup; + LIST_FOR_EACH_ENTRY(ns, discovered_namespaces, struct discovered_namespace, entry) + { + tmp_prefix = populate_xml_string(ns->prefix); + tmp_uri = populate_xml_string(ns->uri); + + if ((tmp_prefix == NULL) || (tmp_uri == NULL)) goto cleanup; + + ret = WsWriteXmlnsAttribute(writer, tmp_prefix, tmp_uri, FALSE, NULL); + if (FAILED(ret)) goto cleanup; + + free_xml_string(tmp_prefix); + free_xml_string(tmp_uri); + } + + tmp_prefix = NULL; + tmp_uri = NULL; + /* Write the header */ if (!write_xml_element(header_element, writer)) goto cleanup; @@ -401,7 +454,7 @@ static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_ char *full_xml; HRESULT ret; - ret = create_soap_envelope(impl->xmlContext, header, NULL, &heap, &xml, &xml_length, NULL); + ret = create_soap_envelope(impl->xmlContext, header, NULL, &heap, &xml, &xml_length, discovered_namespaces); if (ret != S_OK) return ret; /* Prefix the XML header */ @@ -439,6 +492,7 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON const WSD_URI_LIST *xaddrs_list, const WSDXML_ELEMENT *hdr_any, const WSDXML_ELEMENT *ref_param_any, const WSDXML_ELEMENT *endpoint_ref_any, const WSDXML_ELEMENT *any) { + struct list *discoveredNamespaces = NULL; WSD_SOAP_HEADER soapHeader; WSD_APP_SEQUENCE sequence; WCHAR message_id[64]; @@ -450,13 +504,20 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON if (!create_guid(message_id)) goto cleanup; + discoveredNamespaces = WSDAllocateLinkedMemory(NULL, sizeof(struct list)); + if (!discoveredNamespaces) goto cleanup; + + list_init(discoveredNamespaces); + populate_soap_header(&soapHeader, discoveryTo, actionHello, message_id, &sequence, hdr_any); /* TODO: Populate message body */ /* Write and send the message */ - ret = write_and_send_message(impl, &soapHeader, NULL, NULL, NULL, APP_MAX_DELAY); + ret = write_and_send_message(impl, &soapHeader, NULL, discoveredNamespaces, NULL, APP_MAX_DELAY); cleanup: + WSDFreeLinkedMemory(discoveredNamespaces); + return ret; } diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index d81dcdc..563c33c 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -506,6 +506,7 @@ static void Publish_tests(void) messageStorage *msgStorage; WSADATA wsaData; BOOL messageOK; + BOOL hello_message_seen = FALSE; int ret, i; HRESULT rc; ULONG ref; @@ -595,8 +596,8 @@ static void Publish_tests(void) msg = msgStorage->messages[i]; messageOK = FALSE; - messageOK = (strstr(msg, "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Hello</wsa:Action>") != NULL); - messageOK = messageOK && (strstr(msg, endpointReferenceString) != NULL); + hello_message_seen = (strstr(msg, "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Hello</wsa:Action>") != NULL); + messageOK = hello_message_seen && (strstr(msg, endpointReferenceString) != NULL); messageOK = messageOK && (strstr(msg, "<wsd:AppSequence InstanceId=\"1\" MessageNumber=\"1\"></wsd:AppSequence>") != NULL); messageOK = messageOK && (strstr(msg, "<wsd:MetadataVersion>1</wsd:MetadataVersion>") != NULL); @@ -610,7 +611,8 @@ static void Publish_tests(void) heap_free(msgStorage); - todo_wine ok(messageOK == TRUE, "Hello message not received\n"); + ok(hello_message_seen == TRUE, "Hello message not received\n"); + todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n"); after_publish_test: diff --git a/dlls/wsdapi/wsdapi_internal.h b/dlls/wsdapi/wsdapi_internal.h index 417eed9..47dde6b 100644 --- a/dlls/wsdapi/wsdapi_internal.h +++ b/dlls/wsdapi/wsdapi_internal.h @@ -62,4 +62,8 @@ HRESULT send_hello_message(IWSDiscoveryPublisherImpl *impl, LPCWSTR id, ULONGLON const WSD_URI_LIST *xaddrs_list, const WSDXML_ELEMENT *hdr_any, const WSDXML_ELEMENT *ref_param_any, const WSDXML_ELEMENT *endpoint_ref_any, const WSDXML_ELEMENT *any); +/* xml.c */ + +LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value); + #endif diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 4d6319c..fc02d8b 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); -static LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value) +LPWSTR duplicate_string(void *parentMemoryBlock, LPCWSTR value) { int valueLen; LPWSTR dup;

1 0

Nikolay Sivov : user32: Add redirected class registration callback.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 9b9f97e3f668c9d291b4f9fa2944ddb11509970f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b9f97e3f668c9d291b4f9fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 20 10:44:01 2018 +0300 user32: Add redirected class registration callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/commctrl.c | 42 ++++++++++++++++++++++++++++++------ dlls/user32/class.c | 52 ++++++++++++++++++++++++++++++++++++--------- dlls/user32/user_private.h | 3 ++- dlls/user32/win.c | 2 +- 5 files changed, 81 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 4e1aead..34d9e76 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -194,5 +194,6 @@ @ stdcall PropertySheet(ptr) PropertySheetA @ stdcall PropertySheetA(ptr) @ stdcall PropertySheetW(ptr) +@ stdcall RegisterClassNameW(wstr) @ stdcall UninitializeFlatSB(long) @ stdcall _TrackMouseEvent(ptr) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 9356624..1117ec4 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -69,6 +69,7 @@ #include "shlwapi.h" #include "comctl32.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(commctrl); @@ -113,6 +114,40 @@ static void unregister_versioned_classes(void) #undef VERSION } +BOOL WINAPI RegisterClassNameW(const WCHAR *class) +{ + static const struct + { + const WCHAR nameW[16]; + void (*fn_register)(void); + } + classes[] = + { + { {'B','u','t','t','o','n',0}, BUTTON_Register }, + { {'C','o','m','b','o','B','o','x',0}, COMBO_Register }, + { {'C','o','m','b','o','L','B','o','x',0}, COMBOLBOX_Register }, + { {'E','d','i','t',0}, EDIT_Register }, + { {'L','i','s','t','B','o','x',0}, LISTBOX_Register }, + { {'S','t','a','t','i','c',0}, STATIC_Register }, + }; + + int min = 0, max = ARRAY_SIZE(classes) - 1; + + while (min <= max) + { + int res, pos = (min + max) / 2; + if (!(res = strcmpiW(class, classes[pos].nameW))) + { + classes[pos].fn_register(); + return TRUE; + } + if (res < 0) max = pos - 1; + else min = pos + 1; + } + + return FALSE; +} + /*********************************************************************** * DllMain [Internal] * @@ -172,13 +207,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) TREEVIEW_Register (); UPDOWN_Register (); - BUTTON_Register (); - COMBO_Register (); - COMBOLBOX_Register (); - EDIT_Register (); - LISTBOX_Register (); - STATIC_Register (); - /* subclass user32 controls */ THEMING_Initialize (); break; diff --git a/dlls/user32/class.c b/dlls/user32/class.c index e733cc2..a8b5a8f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -332,7 +332,8 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) ULONG module_len; ULONG module_offset; } *wndclass; - const WCHAR *module; + const WCHAR *module, *ret; + HMODULE hmod; if (basename_offset) *basename_offset = 0; @@ -352,10 +353,42 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); - if (!GetModuleHandleW( module )) - LoadLibraryW( module ); + if (!(hmod = GetModuleHandleW( module ))) + hmod = LoadLibraryW( module ); - return (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); + ret = (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); + + if (register_class && hmod) + { + BOOL found = FALSE; + struct list *ptr; + + USER_Lock(); + + LIST_FOR_EACH( ptr, &class_list ) + { + CLASS *class = LIST_ENTRY( ptr, CLASS, entry ); + if (strcmpiW( class->name, ret )) continue; + if (!class->local || class->hInstance == hmod) + { + found = TRUE; + break; + } + } + + USER_Unlock(); + + if (!found) + { + BOOL (WINAPI *pRegisterClassNameW)(const WCHAR *class); + + pRegisterClassNameW = (void *)GetProcAddress(hmod, "RegisterClassNameW"); + if (pRegisterClassNameW) + pRegisterClassNameW(name); + } + } + + return ret; } /*********************************************************************** @@ -373,7 +406,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name, NULL ); + name = CLASS_GetVersionedName( name, NULL, TRUE ); for (;;) { @@ -409,7 +442,6 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) return NULL; } - /*********************************************************************** * CLASS_RegisterClass * @@ -646,7 +678,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name, &basename_offset ); + classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -700,7 +732,7 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset ); + classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -753,7 +785,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className, NULL ); + className = CLASS_GetVersionedName( className, NULL, FALSE ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f1cc0a8..7e4f699 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -269,7 +269,8 @@ extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM w extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; -extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset) DECLSPEC_HIDDEN; +extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, + BOOL register_class) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8c89768..3c497f8 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1344,7 +1344,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL); + className = CLASS_GetVersionedName(className, NULL, TRUE); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName),

1 0

Nikolay Sivov : comdlg32: Remove most of Combo macros.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: fe572072c3bf55814e7bb6edcff5a3701b600d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe572072c3bf55814e7bb6ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 20 10:37:51 2018 +0300 comdlg32: Remove most of Combo macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 85 ++++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 54 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index e721c08..a882f80 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -131,40 +131,9 @@ typedef struct tagLookInInfo */ /* Combo box macros */ -#define CBAddString(hwnd,str) \ - SendMessageW(hwnd, CB_ADDSTRING, 0, (LPARAM)(str)); - -#define CBInsertString(hwnd,str,pos) \ - SendMessageW(hwnd, CB_INSERTSTRING, (WPARAM)(pos), (LPARAM)(str)); - -#define CBDeleteString(hwnd,pos) \ - SendMessageW(hwnd, CB_DELETESTRING, (WPARAM)(pos), 0); - -#define CBSetItemDataPtr(hwnd,iItemId,dataPtr) \ - SendMessageW(hwnd, CB_SETITEMDATA, (WPARAM)(iItemId), (LPARAM)(dataPtr)); - #define CBGetItemDataPtr(hwnd,iItemId) \ SendMessageW(hwnd, CB_GETITEMDATA, (WPARAM)(iItemId), 0) -#define CBGetLBText(hwnd,iItemId,str) \ - SendMessageW(hwnd, CB_GETLBTEXT, (WPARAM)(iItemId), (LPARAM)(str)); - -#define CBGetCurSel(hwnd) \ - SendMessageW(hwnd, CB_GETCURSEL, 0, 0); - -#define CBSetCurSel(hwnd,pos) \ - SendMessageW(hwnd, CB_SETCURSEL, (WPARAM)(pos), 0); - -#define CBGetCount(hwnd) \ - SendMessageW(hwnd, CB_GETCOUNT, 0, 0); -#define CBShowDropDown(hwnd,show) \ - SendMessageW(hwnd, CB_SHOWDROPDOWN, (WPARAM)(show), 0); -#define CBSetItemHeight(hwnd,index,height) \ - SendMessageW(hwnd, CB_SETITEMHEIGHT, (WPARAM)(index), (LPARAM)(height)); - -#define CBSetExtendedUI(hwnd,flag) \ - SendMessageW(hwnd, CB_SETEXTENDEDUI, (WPARAM)(flag), 0) - static const char LookInInfosStr[] = "LookInInfos"; /* LOOKIN combo box property */ static SIZE MemDialogSize = { 0, 0}; /* keep size of the (resizable) dialog */ @@ -2575,7 +2544,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) /* set the filter cb to the extension when possible */ if(-1 < (iPos = FILEDLG95_FILETYPE_SearchExt(fodInfos->DlgInfos.hwndFileTypeCB, lpszTemp))) - CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, iPos); + SendMessageW(fodInfos->DlgInfos.hwndFileTypeCB, CB_SETCURSEL, iPos, 0); } /* fall through */ case ONOPEN_BROWSE: /* browse to the highest folder we could bind to */ @@ -3004,8 +2973,9 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) lstrcpyW(lpstrExt,lpstrPos); /* Add the item at the end of the combo */ - CBAddString(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->customfilter); - CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters, lpstrExt); + SendMessageW(fodInfos->DlgInfos.hwndFileTypeCB, CB_ADDSTRING, 0, (LPARAM)fodInfos->customfilter); + SendMessageW(fodInfos->DlgInfos.hwndFileTypeCB, CB_SETITEMDATA, nFilters, (LPARAM)lpstrExt); + nFilters++; } if(fodInfos->filter) @@ -3026,7 +2996,7 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) lpstrDisplay = lpstrPos; lpstrPos += lstrlenW(lpstrPos) + 1; - CBAddString(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay); + SendMessageW(fodInfos->DlgInfos.hwndFileTypeCB, CB_ADDSTRING, 0, (LPARAM)lpstrDisplay); nFilters++; @@ -3036,7 +3006,7 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) lpstrPos += lstrlenW(lpstrPos) + 1; /* Add the item at the end of the combo */ - CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters-1, lpstrExt); + SendMessageW(fodInfos->DlgInfos.hwndFileTypeCB, CB_SETITEMDATA, nFilters - 1, (LPARAM)lpstrExt); /* malformed filters are added anyway... */ if (!*lpstrExt) break; @@ -3066,7 +3036,7 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd) nFilterIndexCB--; /* Set the current index selection. */ - CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, nFilterIndexCB); + SendMessageW(fodInfos->DlgInfos.hwndFileTypeCB, CB_SETCURSEL, nFilterIndexCB, 0); /* Get the corresponding text string from the combo box. */ lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, @@ -3105,7 +3075,7 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) LPWSTR lpstrFilter; /* Get the current item of the filetype combo box */ - int iItem = CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB); + int iItem = SendMessageW(fodInfos->DlgInfos.hwndFileTypeCB, CB_GETCURSEL, 0, 0); /* set the current filter index */ fodInfos->ofnInfos->nFilterIndex = iItem + @@ -3141,7 +3111,9 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) */ static int FILEDLG95_FILETYPE_SearchExt(HWND hwnd,LPCWSTR lpstrExt) { - int i, iCount = CBGetCount(hwnd); + int i, iCount; + + iCount = SendMessageW(hwnd, CB_GETCOUNT, 0, 0); TRACE("%s\n", debugstr_w(lpstrExt)); @@ -3165,7 +3137,9 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd) { FileOpenDlgInfos *fodInfos = get_filedlg_infoptr(hwnd); int iPos; - int iCount = CBGetCount(fodInfos->DlgInfos.hwndFileTypeCB); + int iCount; + + iCount = SendMessageW(fodInfos->DlgInfos.hwndFileTypeCB, CB_GETCOUNT, 0, 0); TRACE("\n"); @@ -3175,7 +3149,7 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd) for(iPos = iCount-1;iPos>=0;iPos--) { heap_free((void *)CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,iPos)); - CBDeleteString(fodInfos->DlgInfos.hwndFileTypeCB,iPos); + SendMessageW(fodInfos->DlgInfos.hwndFileTypeCB, CB_DELETESTRING, iPos, 0); } } /* Current filter */ @@ -3229,11 +3203,11 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) ReleaseDC( hwndCombo, hdc ); /* set item height for both text field and listbox */ - CBSetItemHeight( hwndCombo, -1, max( tm.tmHeight, GetSystemMetrics(SM_CYSMICON) )); - CBSetItemHeight( hwndCombo, 0, max( tm.tmHeight, GetSystemMetrics(SM_CYSMICON) )); + SendMessageW(hwndCombo, CB_SETITEMHEIGHT, -1, max(tm.tmHeight, GetSystemMetrics(SM_CYSMICON))); + SendMessageW(hwndCombo, CB_SETITEMHEIGHT, 0, max(tm.tmHeight, GetSystemMetrics(SM_CYSMICON))); /* Turn on the extended UI for the combo box like Windows does */ - CBSetExtendedUI(hwndCombo, TRUE); + SendMessageW(hwndCombo, CB_SETEXTENDEDUI, TRUE, 0); /* Initialise data of Desktop folder */ SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidlTmp); @@ -3399,7 +3373,7 @@ static BOOL FILEDLG95_LOOKIN_OnCommand(HWND hwnd, WORD wNotifyCode) LPSFOLDER tmpFolder; int iItem; - iItem = CBGetCurSel(fodInfos->DlgInfos.hwndLookInCB); + iItem = SendMessageW(fodInfos->DlgInfos.hwndLookInCB, CB_GETCURSEL, 0, 0); if( iItem == CB_ERR) return FALSE; @@ -3477,15 +3451,15 @@ static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId) /* Add the item at the end of the list */ if(iInsertId < 0) { - iItemID = CBAddString(hwnd,sfi.szDisplayName); + iItemID = SendMessageW(hwnd, CB_ADDSTRING, 0, (LPARAM)sfi.szDisplayName); } /* Insert the item at the iInsertId position*/ else { - iItemID = CBInsertString(hwnd,sfi.szDisplayName,iInsertId); + iItemID = SendMessageW(hwnd, CB_INSERTSTRING, iInsertId, (LPARAM)sfi.szDisplayName); } - CBSetItemDataPtr(hwnd,iItemID,tmpFolder); + SendMessageW(hwnd, CB_SETITEMDATA, iItemID, (LPARAM)tmpFolder); return iItemID; } @@ -3561,7 +3535,7 @@ int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl) } } - CBSetCurSel(hwnd,iItemPos); + SendMessageW(hwnd, CB_SETCURSEL, iItemPos, 0); liInfos->uSelectedItem = iItemPos; return 0; @@ -3588,7 +3562,7 @@ static int FILEDLG95_LOOKIN_RemoveMostExpandedItem(HWND hwnd) SFOLDER *tmpFolder = (LPSFOLDER) CBGetItemDataPtr(hwnd,iItemPos); COMDLG32_SHFree(tmpFolder->pidlItem); heap_free(tmpFolder); - CBDeleteString(hwnd,iItemPos); + SendMessageW(hwnd, CB_DELETESTRING, iItemPos, 0); liInfos->iMaxIndentation--; return iItemPos; @@ -3606,7 +3580,9 @@ static int FILEDLG95_LOOKIN_RemoveMostExpandedItem(HWND hwnd) static int FILEDLG95_LOOKIN_SearchItem(HWND hwnd,WPARAM searchArg,int iSearchMethod) { int i = 0; - int iCount = CBGetCount(hwnd); + int iCount; + + iCount = SendMessageW(hwnd, CB_GETCOUNT, 0, 0); TRACE("0x%08lx 0x%x\n",searchArg, iSearchMethod); @@ -3635,8 +3611,9 @@ static void FILEDLG95_LOOKIN_Clean(HWND hwnd) { FileOpenDlgInfos *fodInfos = get_filedlg_infoptr(hwnd); LookInInfos *liInfos = GetPropA(fodInfos->DlgInfos.hwndLookInCB,LookInInfosStr); - int iPos; - int iCount = CBGetCount(fodInfos->DlgInfos.hwndLookInCB); + int iPos, iCount; + + iCount = SendMessageW(fodInfos->DlgInfos.hwndLookInCB, CB_GETCOUNT, 0, 0); TRACE("\n"); @@ -3648,7 +3625,7 @@ static void FILEDLG95_LOOKIN_Clean(HWND hwnd) SFOLDER *tmpFolder = (LPSFOLDER) CBGetItemDataPtr(fodInfos->DlgInfos.hwndLookInCB,iPos); COMDLG32_SHFree(tmpFolder->pidlItem); heap_free(tmpFolder); - CBDeleteString(fodInfos->DlgInfos.hwndLookInCB,iPos); + SendMessageW(fodInfos->DlgInfos.hwndLookInCB, CB_DELETESTRING, iPos, 0); } }

1 0

Owen Rudge : wsdapi: Implement generation of XML from WSDXML structures.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: a2c733c057881b3529bc4a701d735cfb43944dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c733c057881b3529bc4a70… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 19 21:46:23 2018 +0000 wsdapi: Implement generation of XML from WSDXML structures. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 2 +- dlls/wsdapi/soap.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 177 insertions(+), 8 deletions(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index e3f3348..f5eb0fd 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -1,6 +1,6 @@ MODULE = wsdapi.dll IMPORTLIB = wsdapi -IMPORTS = bcrypt iphlpapi rpcrt4 user32 ws2_32 +IMPORTS = bcrypt iphlpapi rpcrt4 user32 webservices ws2_32 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index c33c73b..bec4b1d 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -26,6 +26,7 @@ #include "wsdapi_internal.h" #include "wine/debug.h" #include "wine/heap.h" +#include "webservices.h" WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); @@ -44,6 +45,77 @@ static const WCHAR actionHello[] = { 'd','i','s','c','o','v','e','r','y','/', 'H','e','l','l','o', 0 }; +static const WCHAR addressingNsUri[] = { + 'h','t','t','p',':','/','/', + 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', + 'w','s','/','2','0','0','4','/','0','8','/','a','d','d','r','e','s','s','i','n','g', 0 }; + +static const WCHAR discoveryNsUri[] = { + 'h','t','t','p',':','/','/', + 's','c','h','e','m','a','s','.','x','m','l','s','o','a','p','.','o','r','g','/', + 'w','s','/','2','0','0','5','/','0','4','/','d','i','s','c','o','v','e','r','y', 0 }; + +static const WCHAR envelopeNsUri[] = { + 'h','t','t','p',':','/','/', + 'w','w','w','.','w','3','.','o','r','g','/', + '2','0','0','3','/','0','5','/','s','o','a','p','-','e','n','v','e','l','o','p','e', 0 }; + +static const WCHAR addressingPrefix[] = { 'w','s','a', 0 }; +static const WCHAR discoveryPrefix[] = { 'w','s','d', 0 }; +static const WCHAR envelopePrefix[] = { 's','o','a','p', 0 }; + +static char *wide_to_utf8(LPCWSTR wide_string, int *length) +{ + char *new_string = NULL; + + if (wide_string == NULL) + return NULL; + + *length = WideCharToMultiByte(CP_UTF8, 0, wide_string, -1, NULL, 0, NULL, NULL); + + if (*length < 0) + return NULL; + + new_string = heap_alloc(*length); + WideCharToMultiByte(CP_UTF8, 0, wide_string, -1, new_string, *length, NULL, NULL); + + return new_string; +} + +static WS_XML_STRING *populate_xml_string(LPCWSTR str) +{ + WS_XML_STRING *xml = heap_alloc_zero(sizeof(WS_XML_STRING)); + int utf8Length; + + if (xml == NULL) + return NULL; + + xml->bytes = (BYTE *)wide_to_utf8(str, &utf8Length); + + if (xml->bytes == NULL) + { + heap_free(xml); + return NULL; + } + + xml->dictionary = NULL; + xml->id = 0; + xml->length = (xml->bytes == NULL) ? 0 : (utf8Length - 1); + + return xml; +} + +static inline void free_xml_string(WS_XML_STRING *value) +{ + if (value == NULL) + return; + + if (value->bytes != NULL) + heap_free(value->bytes); + + heap_free(value); +} + static BOOL create_guid(LPWSTR buffer) { const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; @@ -79,30 +151,126 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac /* TODO: Implement RelatesTo, ReplyTo, From, FaultTo */ } +static WSDXML_ELEMENT *create_soap_header_xml_elements(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header) +{ + /* TODO: Implement header generation */ + return NULL; +} + +static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER *header, WSDXML_ELEMENT *body_element, + WS_HEAP **heap, char **output_xml, ULONG *xml_length, struct list *discovered_namespaces) +{ + WS_XML_STRING *actual_envelope_prefix = NULL, *envelope_uri_xmlstr = NULL; + WSDXML_NAMESPACE *addressing_ns = NULL, *discovery_ns = NULL, *envelope_ns = NULL; + WSDXML_ELEMENT *header_element = NULL; + WS_XML_BUFFER *buffer = NULL; + WS_XML_WRITER *writer = NULL; + WS_XML_STRING envelope; + HRESULT ret = E_OUTOFMEMORY; + static BYTE envelopeString[] = "Envelope"; + + /* Create the necessary XML prefixes */ + if (FAILED(IWSDXMLContext_AddNamespace(xml_context, addressingNsUri, addressingPrefix, &addressing_ns))) goto cleanup; + + if (FAILED(IWSDXMLContext_AddNamespace(xml_context, discoveryNsUri, discoveryPrefix, &discovery_ns))) goto cleanup; + + if (FAILED(IWSDXMLContext_AddNamespace(xml_context, envelopeNsUri, envelopePrefix, &envelope_ns))) goto cleanup; + + envelope.bytes = envelopeString; + envelope.length = sizeof(envelopeString) - 1; + envelope.dictionary = NULL; + envelope.id = 0; + + actual_envelope_prefix = populate_xml_string(envelope_ns->PreferredPrefix); + envelope_uri_xmlstr = populate_xml_string(envelope_ns->Uri); + + if ((actual_envelope_prefix == NULL) || (envelope_uri_xmlstr == NULL)) goto cleanup; + + /* Now try to create the appropriate WebServices buffers, etc */ + ret = WsCreateHeap(16384, 4096, NULL, 0, heap, NULL); + if (FAILED(ret)) goto cleanup; + + ret = WsCreateXmlBuffer(*heap, NULL, 0, &buffer, NULL); + if (FAILED(ret)) goto cleanup; + + ret = WsCreateWriter(NULL, 0, &writer, NULL); + if (FAILED(ret)) goto cleanup; + + ret = WsSetOutputToBuffer(writer, buffer, NULL, 0, NULL); + if (FAILED(ret)) goto cleanup; + + /* Create the header XML elements */ + header_element = create_soap_header_xml_elements(xml_context, header); + if (header_element == NULL) goto cleanup; + + /* <s:Envelope> */ + ret = WsWriteStartElement(writer, actual_envelope_prefix, &envelope, envelope_uri_xmlstr, NULL); + if (FAILED(ret)) goto cleanup; + + /* TODO: Write the header */ + + ret = WsWriteEndElement(writer, NULL); + if (FAILED(ret)) goto cleanup; + + /* </s:Envelope> */ + + /* Generate the bytes of the document */ + ret = WsWriteXmlBufferToBytes(writer, buffer, NULL, NULL, 0, *heap, (void**)output_xml, xml_length, NULL); + if (FAILED(ret)) goto cleanup; + +cleanup: + WSDFreeLinkedMemory(addressing_ns); + WSDFreeLinkedMemory(discovery_ns); + WSDFreeLinkedMemory(envelope_ns); + + WSDXMLCleanupElement(header_element); + + free_xml_string(actual_envelope_prefix); + free_xml_string(envelope_uri_xmlstr); + + if (writer != NULL) + WsFreeWriter(writer); + + /* Don't free the heap unless the operation has failed */ + if ((FAILED(ret)) && (*heap != NULL)) + { + WsFreeHeap(*heap); + *heap = NULL; + } + + return ret; +} + static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_HEADER *header, WSDXML_ELEMENT *body_element, struct list *discovered_namespaces, IWSDUdpAddress *remote_address, int max_initial_delay) { static const char xml_header[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>"; - ULONG xml_header_len = sizeof(xml_header) - 1; - HRESULT ret = E_FAIL; + ULONG xml_length = 0, xml_header_len = sizeof(xml_header) - 1; + WS_HEAP *heap = NULL; + char *xml = NULL; char *full_xml; + HRESULT ret; - /* TODO: Create SOAP envelope */ + ret = create_soap_envelope(impl->xmlContext, header, NULL, &heap, &xml, &xml_length, NULL); + if (ret != S_OK) return ret; /* Prefix the XML header */ - full_xml = heap_alloc(xml_header_len + 1); + full_xml = heap_alloc(xml_length + xml_header_len + 1); if (full_xml == NULL) + { + WsFreeHeap(heap); return E_OUTOFMEMORY; + } memcpy(full_xml, xml_header, xml_header_len); - full_xml[xml_header_len] = 0; + memcpy(full_xml + xml_header_len, xml, xml_length); + full_xml[xml_length + xml_header_len] = 0; if (remote_address == NULL) { /* Send the message via UDP multicast */ - if (send_udp_multicast(impl, full_xml, sizeof(xml_header), max_initial_delay)) - ret = S_OK; + ret = send_udp_multicast(impl, full_xml, xml_length + xml_header_len + 1, max_initial_delay) ? S_OK : E_FAIL; } else { @@ -111,6 +279,7 @@ static HRESULT write_and_send_message(IWSDiscoveryPublisherImpl *impl, WSD_SOAP_ } heap_free(full_xml); + WsFreeHeap(heap); return ret; }

1 0

Nikolay Sivov : comdlg32: Add a helper to test if file dialog hook is enabled.
by Alexandre Julliard March 20, 2018

March 20, 2018

Module: wine Branch: master Commit: 2118ce0fa9785ce301370738b12b8f38a23ca86b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2118ce0fa9785ce301370738… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 20 10:37:50 2018 +0300 comdlg32: Add a helper to test if file dialog hook is enabled. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 81eaeca..e721c08 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -84,8 +84,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); OFN_NODEREFERENCELINKS | OFN_NOREADONLYRETURN |\ OFN_NOTESTFILECREATE /*| OFN_USEMONIKERS*/) -#define IsHooked(fodInfos) \ - ((fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook) /*********************************************************************** * Data structure and global variables */ @@ -184,6 +182,11 @@ FileOpenDlgInfos *get_filedlg_infoptr(HWND hwnd) return GetPropW(hwnd, filedlg_info_propnameW); } +static BOOL is_dialog_hooked(const FileOpenDlgInfos *info) +{ + return (info->ofnInfos->Flags & OFN_ENABLEHOOK) && info->ofnInfos->lpfnHook; +} + /*********************************************************************** * Prototypes */ @@ -307,7 +310,7 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) } /* old style hook messages */ - if (IsHooked(fodInfos)) + if (is_dialog_hooked(fodInfos)) { fodInfos->HookMsg.fileokstring = RegisterWindowMessageW(FILEOKSTRINGW); fodInfos->HookMsg.lbselchstring = RegisterWindowMessageW(LBSELCHSTRINGW); @@ -824,15 +827,15 @@ static HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) } if (fodInfos->unicode) hChildDlg = CreateDialogIndirectParamW(hinst, template, hwnd, - IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, + is_dialog_hooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, (LPARAM)fodInfos->ofnInfos); else hChildDlg = CreateDialogIndirectParamA(hinst, template, hwnd, - IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, + is_dialog_hooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, (LPARAM)fodInfos->ofnInfos); return hChildDlg; } - else if( IsHooked(fodInfos)) + else if (is_dialog_hooked(fodInfos)) { RECT rectHwnd; struct { @@ -2014,7 +2017,7 @@ static LRESULT FILEDLG95_OnWMGetIShellBrowser(HWND hwnd) static BOOL FILEDLG95_SendFileOK( HWND hwnd, FileOpenDlgInfos *fodInfos ) { /* ask the hook if we can close */ - if(IsHooked(fodInfos)) + if (is_dialog_hooked(fodInfos)) { LRESULT retval = 0;

1 0