wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Dmitry Timoshkov : localspl: Use the monitor handle returned by InitializePrintMonitor2.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: e620a3f35900f318e4e303631cef81b4c63d6b76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e620a3f35900f318e4e30363… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 9 14:57:41 2019 +0800 localspl: Use the monitor handle returned by InitializePrintMonitor2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index def3215..4627284 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -67,6 +67,7 @@ typedef struct { PMONITORUI monitorUI; MONITOR2 monitor; BOOL (WINAPI *old_XcvOpenPort)(LPCWSTR,ACCESS_MASK,PHANDLE); + HANDLE hmon; HMODULE hdll; DWORD refcount; } monitor_t; @@ -329,7 +330,7 @@ static void monitor_unload(monitor_t * pm) list_remove(&pm->entry); if (pm->monitor.pfnShutdown) - pm->monitor.pfnShutdown(0); + pm->monitor.pfnShutdown(pm->hmon); FreeLibrary(pm->hdll); heap_free(pm->name); @@ -489,7 +490,10 @@ static monitor_t * monitor_load(LPCWSTR name, LPWSTR dllname) TRACE("%p: MONITOR2 from %s,InitializePrintMonitor2(%s)\n", monitor2, debugstr_w(driver), debugstr_w(regroot)); if (monitor2) + { memcpy(&pm->monitor, monitor2, min(monitor2->cbSize, sizeof(pm->monitor))); + pm->hmon = hmon; + } } else if (pInitializePrintMonitor && regroot) { MONITOREX *pmonitorEx; @@ -596,7 +600,7 @@ static monitor_t * monitor_loadui(monitor_t * pm) /* query the userinterface-dllname from the Portmonitor */ /* building (",XcvMonitor %s",pm->name) not needed yet */ if (pm->monitor.pfnXcvOpenPort) - res = pm->monitor.pfnXcvOpenPort(0, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + res = pm->monitor.pfnXcvOpenPort(pm->hmon, emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); else if (pm->old_XcvOpenPort) res = pm->old_XcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); TRACE("got %u with %p\n", res, hXcv); @@ -1245,7 +1249,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) if (printer->pm) { if (printer->pm->monitor.pfnXcvOpenPort) - printer->pm->monitor.pfnXcvOpenPort(0, &printername[len], + printer->pm->monitor.pfnXcvOpenPort(printer->pm->hmon, &printername[len], pDefault ? pDefault->DesiredAccess : 0, &printer->hXcv); else if (printer->pm->old_XcvOpenPort)

1 0

Alistair Leslie-Hughes : include: Add DSFX_I3DL2REVERB defines.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 74c6751c671771fb6c10f7eb9e7dfe7af3c1dc38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c6751c671771fb6c10f7eb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 9 04:55:03 2019 +0000 include: Add DSFX_I3DL2REVERB defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index 44bfccf..74b4bcd 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -460,6 +460,46 @@ typedef struct _DSFXI3DL2Reverb FLOAT flHFReference; } DSFXI3DL2Reverb, *LPDSFXI3DL2Reverb; +#define DSFX_I3DL2REVERB_DECAYTIME_DEFAULT 1.49f +#define DSFX_I3DL2REVERB_DECAYTIME_MIN 0.1f +#define DSFX_I3DL2REVERB_DECAYTIME_MAX 20.0f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_DEFAULT 0.83f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_MIN 0.1f +#define DSFX_I3DL2REVERB_DECAYHFRATIO_MAX 2.0f +#define DSFX_I3DL2REVERB_DENSITY_DEFAULT 100.0f +#define DSFX_I3DL2REVERB_DENSITY_MIN 0.0f +#define DSFX_I3DL2REVERB_DENSITY_MAX 100.0f +#define DSFX_I3DL2REVERB_DIFFUSION_DEFAULT 100.0f +#define DSFX_I3DL2REVERB_DIFFUSION_MIN 0.0f +#define DSFX_I3DL2REVERB_DIFFUSION_MAX 100.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_DEFAULT 5000.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_MIN 20.0f +#define DSFX_I3DL2REVERB_HFREFERENCE_MAX 20000.0f +#define DSFX_I3DL2REVERB_QUALITY_DEFAULT 2 +#define DSFX_I3DL2REVERB_QUALITY_MIN 0 +#define DSFX_I3DL2REVERB_QUALITY_MAX 3 +#define DSFX_I3DL2REVERB_REFLECTIONS_DEFAULT (-2602) +#define DSFX_I3DL2REVERB_REFLECTIONS_MIN (-10000) +#define DSFX_I3DL2REVERB_REFLECTIONS_MAX 1000 +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_DEFAULT 0.007f +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MIN 0.0f +#define DSFX_I3DL2REVERB_REFLECTIONSDELAY_MAX 0.3f +#define DSFX_I3DL2REVERB_REVERB_MIN (-10000) +#define DSFX_I3DL2REVERB_REVERB_MAX 2000 +#define DSFX_I3DL2REVERB_REVERB_DEFAULT 200 +#define DSFX_I3DL2REVERB_REVERBDELAY_MIN 0.0f +#define DSFX_I3DL2REVERB_REVERBDELAY_MAX 0.1f +#define DSFX_I3DL2REVERB_REVERBDELAY_DEFAULT 0.011f +#define DSFX_I3DL2REVERB_ROOM_DEFAULT (-1000) +#define DSFX_I3DL2REVERB_ROOM_MIN 10000 +#define DSFX_I3DL2REVERB_ROOM_MAX 0 +#define DSFX_I3DL2REVERB_ROOMHF_MIN (-10000) +#define DSFX_I3DL2REVERB_ROOMHF_MAX 0 +#define DSFX_I3DL2REVERB_ROOMHF_DEFAULT (-100) +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MIN 0.0f +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_MAX 10.0f +#define DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_DEFAULT 0.0f + typedef const DSFXI3DL2Reverb *LPCDSFXI3DL2Reverb; #define DSCCAPS_EMULDRIVER DSCAPS_EMULDRIVER

1 0

Zebediah Figura : winegstreamer: Handle GST_EVENT_RECONFIGURE.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 3619ff751796b014f3f13fb2858989f9607c7f77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3619ff751796b014f3f13fb2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 8 13:55:06 2019 -0500 winegstreamer: Handle GST_EVENT_RECONFIGURE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 41afc22..61e75b0 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -408,6 +408,7 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) FIXME("%p (%u) stub\n", event, event->type); case GST_EVENT_TAG: case GST_EVENT_QOS: + case GST_EVENT_RECONFIGURE: return gst_pad_event_default(pad, parent, event); } return TRUE;

1 0

Zebediah Figura : winegstreamer: Get rid of the unused "discont" field from GstImpl.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: c98c263266cd1f3d285c1780b55d04fc3e37d2ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=c98c263266cd1f3d285c1780… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 8 13:55:05 2019 -0500 winegstreamer: Get rid of the unused "discont" field from GstImpl. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3761dbc..41afc22 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -60,7 +60,7 @@ typedef struct GSTImpl { LONGLONG filesize; - BOOL discont, initial, ignore_flush; + BOOL initial, ignore_flush; GstElement *container; GstPad *my_src, *their_sink; GstBus *bus; @@ -1123,7 +1123,7 @@ static HRESULT GST_Connect(GSTImpl *This, IPin *pConnectPin, ALLOCATOR_PROPERTIE This->start = This->nextofs = This->nextpullofs = This->stop = 0; /* Add initial pins */ - This->initial = This->discont = TRUE; + This->initial = TRUE; ResetEvent(This->no_more_pads_event); gst_element_set_state(This->container, GST_STATE_PLAYING); ret = gst_element_get_state(This->container, NULL, NULL, -1);

1 0

Zebediah Figura : winegstreamer: Get rid of the GSTInPin structure.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: d6e2deef19906499b827f8070042a2afee2f7a25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e2deef19906499b827f807… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 8 13:55:04 2019 -0500 winegstreamer: Get rid of the GSTInPin structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 164 +++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6e2deef19906499b827…

1 0

Zebediah Figura : winegstreamer: Get rid of the "isaud" and "isvid" fields of GstOutPin.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 92e4d336359096deecde07a8d5248c0c4df8380f URL: https://source.winehq.org/git/wine.git/?a=commit;h=92e4d336359096deecde07a8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 8 13:55:03 2019 -0500 winegstreamer: Get rid of the "isaud" and "isvid" fields of GstOutPin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ef11ed6..4b64dba 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -82,7 +82,6 @@ struct GSTOutPin { GstPad *flip_sink, *flip_src; GstPad *their_src; GstPad *my_sink; - BOOL isaud, isvid; AM_MEDIA_TYPE * pmt; HANDLE caps_event; GstSegment *segment; @@ -258,7 +257,6 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) { - GSTOutPin *pin = gst_pad_get_element_private(pad); AM_MEDIA_TYPE amt; GstStructure *arg; const char *typename; @@ -269,20 +267,12 @@ static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); if (!strcmp(typename, "audio/x-raw")) { - if (!pin->isaud) { - ERR("Setting audio caps on non-audio pad?\n"); - return FALSE; - } ret = amt_from_gst_caps_audio(caps, &amt); if (ret) FreeMediaType(&amt); TRACE("+%i\n", ret); return ret; } else if (!strcmp(typename, "video/x-raw")) { - if (!pin->isvid) { - ERR("Setting video caps on non-video pad?\n"); - return FALSE; - } ret = amt_from_gst_caps_video(caps, &amt); if (ret) FreeMediaType(&amt); @@ -308,16 +298,8 @@ static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); if (!strcmp(typename, "audio/x-raw")) { - if (!pin->isaud) { - ERR("Setting audio caps on non-audio pad?\n"); - return FALSE; - } ret = amt_from_gst_caps_audio(caps, &amt); } else if (!strcmp(typename, "video/x-raw")) { - if (!pin->isvid) { - ERR("Setting video caps on non-video pad?\n"); - return FALSE; - } ret = amt_from_gst_caps_video(caps, &amt); if (ret) This->props.cbBuffer = max(This->props.cbBuffer, ((VIDEOINFOHEADER*)amt.pbFormat)->bmiHeader.biSizeImage); @@ -793,7 +775,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) GstPad *mypad; GSTOutPin *pin; int ret; - BOOL isvid = FALSE, isaud = FALSE; gchar my_name[1024]; WCHAR nameW[128]; @@ -817,11 +798,8 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) gst_pad_set_event_function(mypad, event_sink_wrapper); gst_pad_set_query_function(mypad, query_sink_wrapper); - if (!strcmp(typename, "audio/x-raw")) { - isaud = TRUE; - } else if (!strcmp(typename, "video/x-raw")) { - isvid = TRUE; - } else { + if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) + { FIXME("Unknown type \'%s\'\n", typename); return; } @@ -835,12 +813,11 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, GSTImpl *This) pin = This->ppPins[This->cStreams - 1]; gst_pad_set_element_private(mypad, pin); pin->my_sink = mypad; - pin->isaud = isaud; - pin->isvid = isvid; gst_segment_init(pin->segment, GST_FORMAT_TIME); - if (isvid) { + if (!strcmp(typename, "video/x-raw")) + { GstElement *vconv; TRACE("setting up videoflip filter for pin %p, my_sink: %p, their_src: %p\n",

1 0

Zebediah Figura : winegstreamer: Get rid of the unused "gstpool" field from GSTOutPin.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: da69d353aa58120a1cf913ccbdd7ea7f99eebd0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=da69d353aa58120a1cf913cc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 8 13:55:02 2019 -0500 winegstreamer: Get rid of the unused "gstpool" field from GSTOutPin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index bf8f1de..ef11ed6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -82,7 +82,6 @@ struct GSTOutPin { GstPad *flip_sink, *flip_src; GstPad *their_src; GstPad *my_sink; - GstBufferPool *gstpool; BOOL isaud, isvid; AM_MEDIA_TYPE * pmt; HANDLE caps_event; @@ -1769,8 +1768,6 @@ static void free_source_pin(GSTOutPin *pin) CloseHandle(pin->caps_event); DeleteMediaType(pin->pmt); gst_segment_free(pin->segment); - if (pin->gstpool) - gst_object_unref(pin->gstpool); strmbase_source_cleanup(&pin->pin); heap_free(pin);

1 0

Marcus Meissner : iphlpapi: Fixed size to MultiByteToWideChar.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: e7007ee81471e59d265f59fbe0ddbb9017ecb5c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7007ee81471e59d265f59fb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 8 17:43:19 2019 +0200 iphlpapi: Fixed size to MultiByteToWideChar. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d4b1100..1b0bc93 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2331,7 +2331,7 @@ static void test_ParseNetworkString(void) for (i = 0; i < ARRAY_SIZE(ipv4_address_tests); i++) { MultiByteToWideChar(CP_ACP, 0, ipv4_address_tests[i].str, sizeof(ipv4_address_tests[i].str), - wstr, sizeof(wstr)); + wstr, ARRAY_SIZE(wstr)); memset(&info, 0x99, sizeof(info)); port = 0x9999; prefix_len = 0x99; @@ -2357,7 +2357,7 @@ static void test_ParseNetworkString(void) for (i = 0; i < ARRAY_SIZE(ipv4_service_tests); i++) { MultiByteToWideChar(CP_ACP, 0, ipv4_service_tests[i].str, sizeof(ipv4_service_tests[i].str), - wstr, sizeof(wstr)); + wstr, ARRAY_SIZE(wstr)); memset(&info, 0x99, sizeof(info)); port = 0x9999; prefix_len = 0x99;

1 0

Francois Gouget : winemac.drv: Avoid an unneeded lstrlenW() call.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: 98b1d68aac8d4195821ff69f6b8f49baadddd8f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98b1d68aac8d4195821ff69f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 8 06:24:49 2019 +0200 winemac.drv: Avoid an unneeded lstrlenW() call. Note that since tiptext is a buffer it cannot be NULL. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index a2c32b2..75bca5e 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -123,7 +123,7 @@ static BOOL modify_icon(struct tray_icon *icon, NOTIFYICONDATAW *nid) if (icon->image) update_image = TRUE; - if (lstrlenW(icon->tiptext)) + if (*icon->tiptext) update_tooltip = TRUE; } else

1 0

Francois Gouget : ddrawex: Tweak the createDD() name to make CodeSpell happy.
by Alexandre Julliard 09 Sep '19

09 Sep '19

Module: wine Branch: master Commit: b035f5c74c9f8ff2fee8c9f6bc41967d0afd99f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b035f5c74c9f8ff2fee8c9f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 8 06:23:50 2019 +0200 ddrawex: Tweak the createDD() name to make CodeSpell happy. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddrawex/tests/ddrawex.c | 4 ++-- dlls/ddrawex/tests/surface.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index 7134a04..60d84fe 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -27,7 +27,7 @@ static IDirectDrawFactory *factory; static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); -static IDirectDraw *createDD(void) +static IDirectDraw *createDDraw(void) { HRESULT hr; IDirectDraw *dd; @@ -46,7 +46,7 @@ static ULONG get_ref(IUnknown *o) static void RefCountTest(void) { - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDraw2 *dd2; IDirectDraw3 *dd3; IDirectDraw4 *dd4; diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c index c6c02a8..3081cfe 100644 --- a/dlls/ddrawex/tests/surface.c +++ b/dlls/ddrawex/tests/surface.c @@ -29,7 +29,7 @@ static IDirectDrawFactory *factory; static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); -static IDirectDraw *createDD(void) +static IDirectDraw *createDDraw(void) { HRESULT hr; IDirectDraw *dd; @@ -74,7 +74,7 @@ static void GetDCTest_main(DDSURFACEDESC *ddsd, DDSURFACEDESC2 *ddsd2, void (*te IDirectDrawSurface2 *surf3; IDirectDrawSurface4 *surf4; HRESULT hr; - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDraw2 *dd2; IDirectDraw3 *dd3; IDirectDraw4 *dd4; @@ -156,7 +156,7 @@ static void GetDCTest(void) static void CapsTest(void) { DDSURFACEDESC ddsd; - IDirectDraw *dd1 = createDD(); + IDirectDraw *dd1 = createDDraw(); IDirectDrawSurface *surf; HRESULT hr; @@ -247,7 +247,7 @@ static void test_surface_from_dc3(void) HRESULT hr; HDC dc; - dd1 = createDD(); + dd1 = createDDraw(); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw3, (void **)&dd3); ok(SUCCEEDED(hr), "IDirectDraw_QueryInterface failed, hr %#x.\n", hr); IDirectDraw_Release(dd1); @@ -314,7 +314,7 @@ static void test_surface_from_dc4(void) HRESULT hr; HDC dc; - dd1 = createDD(); + dd1 = createDDraw(); hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **)&dd4); if (hr == E_NOINTERFACE) { win_skip("DirectDraw4 is not supported\n");

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
63
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 September 2019