wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Nikolay Sivov : mf/session: Query and initialize sample allocators for capable output nodes.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 9008b2c9b77364d98cd6671ee6b2f9fc936bf90d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9008b2c9b77364d98cd6671e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 13:36:37 2020 +0300 mf/session: Query and initialize sample allocators for capable output nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index d586f1c6be9..af8500cb7d6 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -171,6 +171,7 @@ struct topo_node struct { unsigned int requests; + IMFVideoSampleAllocator *allocator; } sink; struct { @@ -742,6 +743,10 @@ static void release_topo_node(struct topo_node *node) heap_free(node->u.transform.input_map); heap_free(node->u.transform.output_map); break; + case MF_TOPOLOGY_OUTPUT_NODE: + if (node->u.sink.allocator) + IMFVideoSampleAllocator_Release(node->u.sink.allocator); + break; default: ; } @@ -1185,10 +1190,25 @@ static HRESULT session_set_transform_stream_info(struct topo_node *node) return hr; } +static HRESULT session_get_stream_sink_type(IMFStreamSink *sink, IMFMediaType **media_type) +{ + IMFMediaTypeHandler *handler; + HRESULT hr; + + if (SUCCEEDED(hr = IMFStreamSink_GetMediaTypeHandler(sink, &handler))) + { + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, media_type); + IMFMediaTypeHandler_Release(handler); + } + + return hr; +} + static HRESULT session_append_node(struct media_session *session, IMFTopologyNode *node) { struct topo_node *topo_node; IMFMediaSink *media_sink; + IMFMediaType *media_type; IMFStreamDescriptor *sd; HRESULT hr = S_OK; IUnknown *object; @@ -1217,7 +1237,18 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod if (FAILED(hr = IMFStreamSink_GetMediaSink(topo_node->object.sink_stream, &media_sink))) break; - hr = session_add_media_sink(session, node, media_sink); + if (SUCCEEDED(hr = session_add_media_sink(session, node, media_sink))) + { + if (SUCCEEDED(session_get_stream_sink_type(topo_node->object.sink_stream, &media_type))) + { + if (SUCCEEDED(MFGetService(topo_node->object.object, &MR_VIDEO_ACCELERATION_SERVICE, + &IID_IMFVideoSampleAllocator, (void **)&topo_node->u.sink.allocator))) + { + IMFVideoSampleAllocator_InitializeSampleAllocator(topo_node->u.sink.allocator, 2, media_type); + } + IMFMediaType_Release(media_type); + } + } IMFMediaSink_Release(media_sink); break;

1 0

Nikolay Sivov : evr/allocator: Fix reference counting for returned samples.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 0066be78ae7ef93c86de254d358b4ce3935d3de2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0066be78ae7ef93c86de254d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 13:36:36 2020 +0300 evr/allocator: Fix reference counting for returned samples. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 6 ++++-- dlls/evr/tests/evr.c | 7 +++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index e84d7450c7f..7764ec945d2 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -459,7 +459,6 @@ static void sample_allocator_release_samples(struct sample_allocator *allocator) LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &allocator->used_samples, struct queued_sample, entry) { list_remove(&iter->entry); - IMFSample_Release(iter->sample); heap_free(iter); } } @@ -676,8 +675,10 @@ static HRESULT WINAPI sample_allocator_AllocateSample(IMFVideoSampleAllocator *i list_add_tail(&allocator->used_samples, head); allocator->free_sample_count--; + /* Reference counter is not increased when sample is returned, so next release could trigger + tracking condition. This is balanced by incremented reference counter when sample is returned + back to the free list. */ *out = sample; - IMFSample_AddRef(*out); } } @@ -816,6 +817,7 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback { list_remove(&iter->entry); list_add_tail(&allocator->free_samples, &iter->entry); + IMFSample_AddRef(iter->sample); allocator->free_sample_count++; break; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index a1d7b7109d9..b8a16fc7cc9 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1326,13 +1326,13 @@ static void test_MFCreateVideoSampleAllocator(void) IDirect3DSurface9 *surface; IDirect3DDevice9 *device; IMFMediaBuffer *buffer; + LONG refcount, count; unsigned int token; IMFGetService *gs; IDirect3D9 *d3d; IUnknown *unk; HWND window; HRESULT hr; - LONG count; BYTE *data; hr = MFCreateVideoSampleAllocator(&IID_IUnknown, (void **)&unk); @@ -1397,7 +1397,7 @@ todo_wine sample = NULL; hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(get_refcount(sample) == 3, "Unexpected refcount %u.\n", get_refcount(sample)); + refcount = get_refcount(sample); hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample2); ok(hr == MF_E_SAMPLEALLOCATOR_EMPTY, "Unexpected hr %#x.\n", hr); @@ -1405,8 +1405,7 @@ todo_wine /* Reinitialize with active sample. */ hr = IMFVideoSampleAllocator_InitializeSampleAllocator(allocator, 4, video_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine - ok(get_refcount(sample) == 3, "Unexpected refcount %u.\n", get_refcount(sample)); + ok(refcount == get_refcount(sample), "Unexpected refcount %u.\n", get_refcount(sample)); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : evr/allocator: Fix released sample pointer check.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 2ef767dcee599d3ca74495d2b825e720ef9dcd96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef767dcee599d3ca74495d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 13:36:35 2020 +0300 evr/allocator: Fix released sample pointer check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index a44e3ef45c6..e84d7450c7f 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -796,15 +796,23 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback { struct sample_allocator *allocator = impl_from_IMFAsyncCallback(iface); struct queued_sample *iter; - IUnknown *sample = NULL; + IUnknown *object = NULL; + IMFSample *sample = NULL; + HRESULT hr; - EnterCriticalSection(&allocator->cs); + if (FAILED(IMFAsyncResult_GetObject(result, &object))) + return E_UNEXPECTED; - IMFAsyncResult_GetObject(result, (IUnknown **)&sample); + hr = IUnknown_QueryInterface(object, &IID_IMFSample, (void **)&sample); + IUnknown_Release(object); + if (FAILED(hr)) + return E_UNEXPECTED; + + EnterCriticalSection(&allocator->cs); LIST_FOR_EACH_ENTRY(iter, &allocator->used_samples, struct queued_sample, entry) { - if (sample == (IUnknown *)iter->sample) + if (sample == iter->sample) { list_remove(&iter->entry); list_add_tail(&allocator->free_samples, &iter->entry); @@ -813,7 +821,7 @@ static HRESULT WINAPI sample_allocator_tracking_callback_Invoke(IMFAsyncCallback } } - IUnknown_Release(sample); + IMFSample_Release(sample); if (allocator->callback) IMFVideoSampleAllocatorNotify_NotifyRelease(allocator->callback);

1 0

Alexandre Julliard : glu32: Build with msvcrt.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: f60ec4ea06e7ed0f4879523f79901fc64cb1ae35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f60ec4ea06e7ed0f4879523f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 11:20:28 2020 +0100 glu32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/Makefile.in | 2 ++ dlls/glu32/glu.c | 3 --- dlls/glu32/mipmap.c | 9 --------- dlls/glu32/project.c | 3 --- dlls/glu32/quad.c | 3 --- 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in index 71d019d4fc1..587191229f8 100644 --- a/dlls/glu32/Makefile.in +++ b/dlls/glu32/Makefile.in @@ -2,6 +2,8 @@ MODULE = glu32.dll IMPORTLIB = glu32 IMPORTS = opengl32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ geom.c \ glu.c \ diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 09d099f485d..9305b90d308 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> diff --git a/dlls/glu32/mipmap.c b/dlls/glu32/mipmap.c index 2eff5583bcf..6877e2f342c 100644 --- a/dlls/glu32/mipmap.c +++ b/dlls/glu32/mipmap.c @@ -28,9 +28,6 @@ * Silicon Graphics, Inc. */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <stdlib.h> @@ -4770,10 +4767,6 @@ static void fill_image(const PixelStorageModes *psm, assert(iter2 == &newimage[width*height* elements_per_group(format,0)]); } - assert( iter == &((const GLubyte *)userdata)[rowsize*height + - psm->unpack_skip_rows * rowsize + - psm->unpack_skip_pixels * group_size] ); - } /* else */ } /* fill_image() */ @@ -6049,8 +6042,6 @@ static void scaleInternalPackedPixel(int components, highy_int++; } } - - assert(outindex == (widthOut*heightOut - 1)); } /* scaleInternalPackedPixel() */ /* rowSizeInBytes is at least the width (in bytes) due to padding on diff --git a/dlls/glu32/project.c b/dlls/glu32/project.c index 3db0331e96b..dc104541b8f 100644 --- a/dlls/glu32/project.c +++ b/dlls/glu32/project.c @@ -28,9 +28,6 @@ * Silicon Graphics, Inc. */ -#include "config.h" -#include "wine/port.h" - #include <math.h> #include "windef.h" diff --git a/dlls/glu32/quad.c b/dlls/glu32/quad.c index f9914ed31c8..9ffaa6bd4de 100644 --- a/dlls/glu32/quad.c +++ b/dlls/glu32/quad.c @@ -28,9 +28,6 @@ * Silicon Graphics, Inc. */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <math.h>

1 0

Alexandre Julliard : glu32: No longer load the Unix libGLU.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: ec55b1c271ae4710677f70a2a28474c96a650a6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec55b1c271ae4710677f70a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 12 11:20:12 2020 +0100 glu32: No longer load the Unix libGLU. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 76 ------------------------------------ configure.ac | 8 ---- dlls/glu32/glu.c | 110 ++++++++++++++++------------------------------------ include/config.h.in | 3 -- 4 files changed, 33 insertions(+), 164 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec55b1c271ae4710677f…

1 0

Dmitry Timoshkov : crypt32: Add support for CMSG_ENCODED_MESSAGE for a being decoded signed message.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 4da1bca7c5e3cbb6aa3f194d32974829c6864354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da1bca7c5e3cbb6aa3f194d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 12 11:15:08 2020 +0300 crypt32: Add support for CMSG_ENCODED_MESSAGE for a being decoded signed message. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ba3690b2642..fac9561bbbd 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3151,6 +3151,12 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_ENCODED_MESSAGE: + if (msg->msg_data.pbData) + ret = CRYPT_CopyParam(pvData, pcbData, msg->msg_data.pbData, msg->msg_data.cbData); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_ENCODED_SIGNER: if (msg->u.signed_data.info) {

1 0

Dmitry Timoshkov : crypt32: Add support for CMSG_SIGNER_AUTH_ATTR_PARAM for a being decoded signed message.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 4c9c6ca417f81d64153903d97e31b580a0842332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9c6ca417f81d64153903d9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 12 11:15:05 2020 +0300 crypt32: Add support for CMSG_SIGNER_AUTH_ATTR_PARAM for a being decoded signed message. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 88c27a1c664..ba3690b2642 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -3194,6 +3194,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_SIGNER_AUTH_ATTR_PARAM: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex].AuthAttrs); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_SIGNER_UNAUTH_ATTR_PARAM: if (msg->u.signed_data.info) {

1 0

Dmitry Timoshkov : crypt32: Make helper for copying CMSG_CMS_SIGNER_INFO attributes more generic.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 1b87f222eddac50b0840eccae3c1b01a57b55cef URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b87f222eddac50b0840ecca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 12 11:15:01 2020 +0300 crypt32: Make helper for copying CMSG_CMS_SIGNER_INFO attributes more generic. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index b71c52bb0f6..88c27a1c664 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2995,15 +2995,14 @@ static BOOL CDecodeEnvelopedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, return ret; } -static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, - const CMSG_CMS_SIGNER_INFO *in) +static BOOL CRYPT_CopyAttr(void *pvData, DWORD *pcbData, const CRYPT_ATTRIBUTES *attr) { DWORD size; BOOL ret; - TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, attr); - size = CRYPT_SizeOfAttributes(&in->UnauthAttrs); + size = CRYPT_SizeOfAttributes(attr); if (!pvData) { *pcbData = size; @@ -3016,12 +3015,8 @@ static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, ret = FALSE; } else - { - CRYPT_ATTRIBUTES *out = pvData; + ret = CRYPT_ConstructAttributes(pvData, attr); - CRYPT_ConstructAttributes(out,&in->UnauthAttrs); - ret = TRUE; - } TRACE("returning %d\n", ret); return ret; } @@ -3205,8 +3200,8 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, if (dwIndex >= msg->u.signed_data.info->cSignerInfo) SetLastError(CRYPT_E_INVALID_INDEX); else - ret = CRYPT_CopyUnauthAttr(pvData, pcbData, - &msg->u.signed_data.info->rgSignerInfo[dwIndex]); + ret = CRYPT_CopyAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex].UnauthAttrs); } else SetLastError(CRYPT_E_INVALID_MSG_TYPE);

1 0

Nikolay Sivov : oledb32: Use wide-char string literals.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 18640435497b46f7a6ab637d4689ae5f0168f424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18640435497b46f7a6ab637d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 12 09:52:33 2020 +0300 oledb32: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 18 ++----- dlls/oledb32/datainit.c | 127 +++++++++++++++++------------------------------ dlls/oledb32/dslocator.c | 3 +- 3 files changed, 51 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=18640435497b46f7a6ab…

1 0

Michael Stefaniuc : wineps.drv: Use wide-char string literals.
by Alexandre Julliard 12 Nov '20

12 Nov '20

Module: wine Branch: master Commit: 865ee87bc330e9e5c051182b8562269ce9207586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=865ee87bc330e9e5c051182b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 12 00:37:58 2020 +0100 wineps.drv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/driver.c | 11 ++++------- dlls/wineps.drv/init.c | 4 ++-- dlls/wineps.drv/type1afm.c | 14 +++++--------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index c3d22cec1af..27e1c6e03c8 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -227,8 +227,6 @@ typedef struct static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - static const WCHAR resW[] = {'%','d',0}; - static const WCHAR resxyW[] = {'%','d','x','%','d',0}; PSDRV_DLGINFO *di; int i, Cursel; PAGESIZE *ps; @@ -280,7 +278,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, WCHAR buf[256]; res = di->pi->ppd->DefaultResolution; - len = swprintf(buf, ARRAY_SIZE(buf), resW, res); + len = swprintf(buf, ARRAY_SIZE(buf), L"%d", res); buf[len++] = ' '; LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, ARRAY_SIZE(buf) - len); SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_ADDSTRING, 0, (LPARAM)buf); @@ -310,9 +308,9 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, DWORD idx; if (res->resx == res->resy) - len = swprintf(buf, ARRAY_SIZE(buf), resW, res->resx); + len = swprintf(buf, ARRAY_SIZE(buf), L"%d", res->resx); else - len = swprintf(buf, ARRAY_SIZE(buf), resxyW, res->resx, res->resy); + len = swprintf(buf, ARRAY_SIZE(buf), L"%dx%d", res->resx, res->resy); buf[len++] = ' '; LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, ARRAY_SIZE(buf) - len); idx = SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_ADDSTRING, 0, (LPARAM)buf); @@ -552,7 +550,6 @@ INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput PSDRV_DLGINFO di; PSDRV_DEVMODE dlgdm; WCHAR SetupW[64]; - static const WCHAR PAPERW[] = {'P','A','P','E','R','\0'}; LoadStringW(PSDRV_hInstance, IDS_SETUP, SetupW, ARRAY_SIZE(SetupW)); hinstComctl32 = LoadLibraryA("comctl32.dll"); @@ -565,7 +562,7 @@ INT CDECL PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput di.dlgdm = &dlgdm; psp.dwSize = sizeof(psp); psp.hInstance = PSDRV_hInstance; - psp.u.pszTemplate = PAPERW; + psp.u.pszTemplate = L"PAPER"; psp.u2.pszIcon = NULL; psp.pfnDlgProc = PSDRV_PaperDlgProc; psp.lParam = (LPARAM)&di; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 5c96986bb9d..ad6d6a07373 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); static const PSDRV_DEVMODE DefaultDevmode = { { /* dmPublic */ -/* dmDeviceName */ {'W','i','n','e',' ','P','o','s','t','S','c','r','i','p','t',' ','D','r','i','v','e','r',0}, +/* dmDeviceName */ L"Wine PostScript Driver", /* dmSpecVersion */ 0x30a, /* dmDriverVersion */ 0x001, /* dmSize */ sizeof(DEVMODEW), @@ -66,7 +66,7 @@ static const PSDRV_DEVMODE DefaultDevmode = /* dmYResolution */ 300, /* dmTTOption */ DMTT_SUBDEV, /* dmCollate */ DMCOLLATE_FALSE, -/* dmFormName */ {'L','e','t','t','e','r',0}, +/* dmFormName */ L"Letter", /* dmLogPixels */ 0, /* dmBitsPerPel */ 0, /* dmPelsWidth */ 0, diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index 68cf6537b1c..c78753393c0 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -1093,13 +1093,12 @@ static BOOL BuildAFM(FILE *file) */ static BOOL ReadAFMFile(LPCWSTR filename) { - static const WCHAR rW[] = {'r',0}; FILE *f; BOOL retval; TRACE("%s\n", debugstr_w(filename)); - f = _wfopen(filename, rW); + f = _wfopen(filename, L"r"); if (f == NULL) { WARN("%s: %s\n", debugstr_w(filename), strerror(errno)); @@ -1120,8 +1119,6 @@ static BOOL ReadAFMFile(LPCWSTR filename) */ static BOOL ReadAFMDir(LPCSTR dirname) { - static const WCHAR starW[] = {'*',0}; - static const WCHAR afmW[] = {'.','a','f','m',0}; WCHAR *path = wine_get_dos_file_name( dirname ); struct _wfinddata_t data; intptr_t handle; @@ -1138,7 +1135,7 @@ static BOOL ReadAFMDir(LPCSTR dirname) HeapFree( GetProcessHeap(), 0, path ); p = filename + lstrlenW(filename); *p++ = '\\'; - lstrcpyW( p, starW ); + lstrcpyW( p, L"*" ); handle = _wfindfirst( filename, &data ); if (handle != -1) @@ -1146,7 +1143,7 @@ static BOOL ReadAFMDir(LPCSTR dirname) do { WCHAR *ext = wcschr( data.name, '.' ); - if (!ext || wcsicmp(ext, afmW)) continue; + if (!ext || wcsicmp(ext, L".afm")) continue; lstrcpyW( p, data.name ); if (!(ret = ReadAFMFile( filename ))) break; } while (!_wfindnext( handle, &data )); @@ -1170,7 +1167,6 @@ static BOOL ReadAFMDir(LPCSTR dirname) */ BOOL PSDRV_GetType1Metrics(void) { - static const WCHAR pathW[] = {'A','F','M','P','a','t','h',0}; HKEY hkey; DWORD len; LPWSTR valueW; @@ -1180,11 +1176,11 @@ BOOL PSDRV_GetType1Metrics(void) if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", &hkey) != ERROR_SUCCESS) return TRUE; - if (RegQueryValueExW( hkey, pathW, NULL, NULL, NULL, &len ) == ERROR_SUCCESS) + if (RegQueryValueExW( hkey, L"AFMPath", NULL, NULL, NULL, &len ) == ERROR_SUCCESS) { len += sizeof(WCHAR); valueW = HeapAlloc( PSDRV_Heap, 0, len ); - if (RegQueryValueExW( hkey, pathW, NULL, NULL, (LPBYTE)valueW, &len ) == ERROR_SUCCESS) + if (RegQueryValueExW( hkey, L"AFMPath", NULL, NULL, (BYTE *)valueW, &len ) == ERROR_SUCCESS) { len = WideCharToMultiByte( CP_UNIXCP, 0, valueW, -1, NULL, 0, NULL, NULL ); valueA = HeapAlloc( PSDRV_Heap, 0, len );

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020