wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Józef Kucia : dxgi: Do not store IDXGIFactory in IDXGIDevice.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 5cd719b8671eb5a3e5104216fac3836ef8ab8a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cd719b8671eb5a3e5104216f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:24 2016 +0200 dxgi: Do not store IDXGIFactory in IDXGIDevice. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 3 --- dlls/dxgi/dxgi_private.h | 1 - dlls/dxgi/tests/device.c | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index f5de698..2cf9aa7 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -86,7 +86,6 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); IDXGIAdapter1_Release(device->adapter); - IDXGIFactory1_Release(device->factory); wined3d_private_store_cleanup(&device->private_store); HeapFree(GetProcessHeap(), 0, device); } @@ -454,8 +453,6 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l } wined3d_mutex_unlock(); - device->factory = &dxgi_factory->IDXGIFactory1_iface; - IDXGIFactory1_AddRef(device->factory); device->adapter = &dxgi_adapter->IDXGIAdapter1_iface; IDXGIAdapter1_AddRef(device->adapter); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5a4d43e..aca17ba 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -116,7 +116,6 @@ struct dxgi_device LONG refcount; struct wined3d_private_store private_store; struct wined3d_device *wined3d_device; - IDXGIFactory1 *factory; IDXGIAdapter1 *adapter; }; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 1baea71..ab294f8 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -467,7 +467,7 @@ static void test_create_swapchain(void) expected_refcount = get_refcount((IUnknown *)adapter); refcount = get_refcount((IUnknown *)factory); - todo_wine ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); refcount = get_refcount((IUnknown *)device); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); @@ -499,7 +499,7 @@ static void test_create_swapchain(void) IDXGISwapChain_Release(swapchain); refcount = get_refcount((IUnknown *)factory); - todo_wine ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); for (i = 0; i < sizeof(refresh_list)/sizeof(refresh_list[0]); i++) {

1 0

Józef Kucia : dxgi: Do not store IDXGIAdapters in IDXGIFactory.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: eb039240e52c3324e9ec8631a9fcdae6d1b2c5bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb039240e52c3324e9ec8631a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:23 2016 +0200 dxgi: Do not store IDXGIAdapters in IDXGIFactory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 25 +++++++++++++----- dlls/dxgi/dxgi_private.h | 7 +++-- dlls/dxgi/factory.c | 69 +++++++++++------------------------------------- dlls/dxgi/output.c | 4 +-- dlls/dxgi/tests/device.c | 22 +++++++-------- 5 files changed, 50 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb039240e52c3324e9ec8…

1 0

Józef Kucia : dxgi: Store IDXGIAdapter in IDXGIDevice.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 25ad11cef766eeb6706363e299e5885d6996ae12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ad11cef766eeb6706363e29… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:22 2016 +0200 dxgi: Store IDXGIAdapter in IDXGIDevice. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 35 ++++++++++++++++++----------------- dlls/dxgi/dxgi_private.h | 1 + 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 0c82383..f5de698 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -72,21 +72,23 @@ static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IWineDXGIDevice *iface) static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); + ULONG refcount = InterlockedDecrement(&device->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", device, refcount); if (!refcount) { - if (This->child_layer) IUnknown_Release(This->child_layer); + if (device->child_layer) + IUnknown_Release(device->child_layer); wined3d_mutex_lock(); - wined3d_device_uninit_3d(This->wined3d_device); - wined3d_device_decref(This->wined3d_device); + wined3d_device_uninit_3d(device->wined3d_device); + wined3d_device_decref(device->wined3d_device); wined3d_mutex_unlock(); - IDXGIFactory1_Release(This->factory); - wined3d_private_store_cleanup(&This->private_store); - HeapFree(GetProcessHeap(), 0, This); + IDXGIAdapter1_Release(device->adapter); + IDXGIFactory1_Release(device->factory); + wined3d_private_store_cleanup(&device->private_store); + HeapFree(GetProcessHeap(), 0, device); } return refcount; @@ -148,16 +150,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetParent(IWineDXGIDevice *iface, R static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IWineDXGIDevice *iface, IDXGIAdapter **adapter) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - struct wined3d_device_creation_parameters create_parameters; + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); - TRACE("iface %p, adapter %p\n", iface, adapter); + TRACE("iface %p, adapter %p.\n", iface, adapter); - wined3d_mutex_lock(); - wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters); - wined3d_mutex_unlock(); - - return IDXGIFactory1_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter); + *adapter = (IDXGIAdapter *)device->adapter; + IDXGIAdapter_AddRef(*adapter); + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *iface, @@ -457,6 +456,8 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l device->factory = &dxgi_factory->IDXGIFactory1_iface; IDXGIFactory1_AddRef(device->factory); + device->adapter = &dxgi_adapter->IDXGIAdapter1_iface; + IDXGIAdapter1_AddRef(device->adapter); return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index a4ed850..7c81900 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -119,6 +119,7 @@ struct dxgi_device struct wined3d_private_store private_store; struct wined3d_device *wined3d_device; IDXGIFactory1 *factory; + IDXGIAdapter1 *adapter; }; HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *layer,

1 0

Józef Kucia : dxgi: Do not store IDXGIOutputs in IDXGIAdapter.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: b835a358819a6bd70bfc3b6f5b76c1d9d5cc55a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b835a358819a6bd70bfc3b6f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:21 2016 +0200 dxgi: Do not store IDXGIOutputs in IDXGIAdapter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 28 +++++++++++----------------- dlls/dxgi/dxgi_private.h | 5 ++--- dlls/dxgi/factory.c | 15 +-------------- dlls/dxgi/output.c | 27 +++++++++++++++++++-------- dlls/dxgi/tests/device.c | 18 +++++++++--------- 5 files changed, 42 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b835a358819a6bd70bfc3…

1 0

Huw Davies : gdi32/tests: Allocate the font enum data structures.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: ef3422213162b2e5dc8811377d2be0e41ae22a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef3422213162b2e5dc8811377… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 14 11:12:35 2016 +0100 gdi32/tests: Allocate the font enum data structures. These are in excess of 250kB and may overflow the stack. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 119 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 82 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a1917b4..eb6669b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -107,6 +107,22 @@ static void init(void) system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } +static void *heap_alloc( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), 0, len ); +} + +static void *heap_realloc( void *p, size_t len ) +{ + if (!p) return heap_alloc( len ); + return HeapReAlloc( GetProcessHeap(), 0, p, len ); +} + +static void heap_free( void *p ) +{ + HeapFree( GetProcessHeap(), 0, p ); +} + static INT CALLBACK is_truetype_font_installed_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { if (type != TRUETYPE_FONTTYPE) return 1; @@ -2736,24 +2752,22 @@ static void test_GetFontUnicodeRanges(void) ReleaseDC(NULL, hdc); } -#define MAX_ENUM_FONTS 4096 - struct enum_font_data { - int total; - LOGFONTA lf[MAX_ENUM_FONTS]; + int total, size; + LOGFONTA *lf; }; struct enum_fullname_data { - int total; - ENUMLOGFONTA elf[MAX_ENUM_FONTS]; + int total, size; + ENUMLOGFONTA *elf; }; struct enum_font_dataW { - int total; - LOGFONTW lf[MAX_ENUM_FONTS]; + int total, size; + LOGFONTW *lf; }; static INT CALLBACK arial_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lParam) @@ -2771,10 +2785,13 @@ static INT CALLBACK arial_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, D if (0) /* Disabled to limit console spam */ trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -2794,10 +2811,13 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, if (0) /* Disabled to limit console spam */ trace("enumed font %s, charset %d, height %d, weight %d, italic %d\n", wine_dbgstr_w(lf->lfFaceName), lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -2871,6 +2891,8 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) skip("%s is not installed\n", font_name); return; } + memset( &efd, 0, sizeof(efd) ); + memset( &efdw, 0, sizeof(efdw) ); hdc = GetDC(0); @@ -3064,6 +3086,9 @@ else } ReleaseDC(0, hdc); + + heap_free( efd.lf ); + heap_free( efdw.lf ); } static INT CALLBACK enum_multi_charset_font_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lParam) @@ -3093,10 +3118,13 @@ static INT CALLBACK enum_font_data_proc(const LOGFONTA *lf, const TEXTMETRICA *n if (type != TRUETYPE_FONTTYPE) return 1; - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -3107,10 +3135,13 @@ static INT CALLBACK enum_fullname_data_proc(const LOGFONTA *lf, const TEXTMETRIC if (type != TRUETYPE_FONTTYPE) return 1; - if (efnd->total < MAX_ENUM_FONTS) - efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } + efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 1; } @@ -3144,7 +3175,7 @@ static void test_EnumFontFamiliesEx_default_charset(void) target.lfCharSet = ANSI_CHARSET; } - efd.total = 0; + memset(&efd, 0, sizeof(efd)); memset(&enum_font, 0, sizeof(enum_font)); strcpy(enum_font.lfFaceName, target.lfFaceName); enum_font.lfCharSet = DEFAULT_CHARSET; @@ -3152,15 +3183,14 @@ static void test_EnumFontFamiliesEx_default_charset(void) ReleaseDC(0, hdc); trace("'%s' has %d charsets.\n", target.lfFaceName, efd.total); - if (efd.total < 2) { + if (efd.total < 2) ok(0, "EnumFontFamilies is broken. Expected >= 2, got %d.\n", efd.total); - return; - } - - ok(efd.lf[0].lfCharSet == target.lfCharSet, - "(%s) got charset %d expected %d\n", - efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, target.lfCharSet); + else + ok(efd.lf[0].lfCharSet == target.lfCharSet, + "(%s) got charset %d expected %d\n", + efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, target.lfCharSet); + heap_free(efd.lf); return; } @@ -5215,6 +5245,12 @@ if (0) /* Disabled to limit console spam */ if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg") != 0) return 1; + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 0; } @@ -5230,6 +5266,12 @@ if (0) /* Disabled to limit console spam */ if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg 2") != 0) return 1; + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 0; } @@ -5261,7 +5303,7 @@ static void test_EnumFonts_subst(void) memset(&lf, 0, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; strcpy(lf.lfFaceName, "MS Shell Dlg"); ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg should be enumerated\n"); @@ -5271,12 +5313,12 @@ static void test_EnumFonts_subst(void) ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg"); ok(ret, "did not expect MS Shell Dlg\n"); - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; ret = EnumFontFamiliesExA(hdc, NULL, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); ok(ret, "MS Shell Dlg 2 should not be enumerated\n"); ok(!efnd.total, "MS Shell Dlg 2 should not be enumerated\n"); - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; strcpy(lf.lfFaceName, "MS Shell Dlg 2"); ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg 2 should be enumerated\n"); @@ -5286,6 +5328,7 @@ static void test_EnumFonts_subst(void) ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); ok(ret, "did not expect MS Shell Dlg 2\n"); + heap_free(efnd.elf); DeleteDC(hdc); } @@ -5396,7 +5439,7 @@ static void test_fullname2_helper(const char *Family) lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; strcpy(lf.lfFaceName, Family); - efnd.total = 0; + memset(&efnd, 0, sizeof(efnd)); EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); if (efnd.total == 0) skip("%s is not installed\n", lf.lfFaceName); @@ -5477,6 +5520,7 @@ static void test_fullname2_helper(const char *Family) HeapFree(GetProcessHeap(), 0, bufW); HeapFree(GetProcessHeap(), 0, bufA); } + heap_free(efnd.elf); DeleteDC(hdc); } @@ -6225,7 +6269,7 @@ static void test_vertical_order(void) lf.lfQuality = DEFAULT_QUALITY; lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; - efd.total = 0; + memset( &efd, 0, sizeof(efd) ); EnumFontFamiliesExA(hdc, &lf, enum_font_data_proc, (LPARAM)&efd, 0); for (i = 0; i < efd.total; i++) { @@ -6239,6 +6283,7 @@ static void test_vertical_order(void) } } } + heap_free( efd.lf ); DeleteDC( hdc ); }

1 0

Francois Gouget : ole32/tests: Fix spelling of a test function name.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: a648b87bff3cd248863bbd1332f5dce905052ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a648b87bff3cd248863bbd133… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 19:20:38 2016 +0200 ole32/tests: Fix spelling of a test function name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 3eb9901..13e5220 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -455,7 +455,7 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) return S_OK; } -static void test_get_clipboard_unitialized(void) +static void test_get_clipboard_uninitialized(void) { HRESULT hr; IDataObject *pDObj; @@ -1603,7 +1603,7 @@ static void test_get_clipboard_locked(void) START_TEST(clipboard) { - test_get_clipboard_unitialized(); + test_get_clipboard_uninitialized(); test_set_clipboard(); test_consumer_refs(); test_flushed_getdata();

1 0

Francois Gouget : wineps.drv: Fix spelling of a prototype' s parameter name.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 7e74c1d29253f9e3118ac3c0c6a8aa9350156c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e74c1d29253f9e3118ac3c0c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 19:20:16 2016 +0200 wineps.drv: Fix spelling of a prototype's parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/psdrv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 75c062a..79f23ea 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -549,7 +549,7 @@ extern BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) DEC extern BOOL PSDRV_SelectDownloadFont(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteDownloadGlyphShow(PHYSDEV dev, const WORD *glpyhs, UINT count) DECLSPEC_HIDDEN; +extern BOOL PSDRV_WriteDownloadGlyphShow(PHYSDEV dev, const WORD *glyphs, UINT count) DECLSPEC_HIDDEN; extern BOOL PSDRV_EmptyDownloadList(PHYSDEV dev, BOOL write_undef) DECLSPEC_HIDDEN; extern DWORD write_spool( PHYSDEV dev, const void *data, DWORD num ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : winex11.drv: Use InitOnceExecuteOnce in has_opengl.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: ef6890835d4148dfce9cc7500f3848ba6306ec22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6890835d4148dfce9cc7500… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 16:31:07 2016 +0200 winex11.drv: Use InitOnceExecuteOnce in has_opengl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ab29ce4..0f7534e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -573,18 +573,14 @@ done: return ret; } -static BOOL has_opengl(void) -{ - static BOOL init_done = FALSE; - static void *opengl_handle; +static void *opengl_handle; +static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) +{ char buffer[200]; int error_base, event_base; unsigned int i; - if (init_done) return (opengl_handle != NULL); - init_done = TRUE; - /* No need to load any other libraries as according to the ABI, libGL should be self-sufficient and include all dependencies */ opengl_handle = wine_dlopen(SONAME_LIBGL, RTLD_NOW|RTLD_GLOBAL, buffer, sizeof(buffer)); @@ -592,7 +588,7 @@ static BOOL has_opengl(void) { ERR( "Failed to load libGL: %s\n", buffer ); ERR( "OpenGL support is disabled.\n"); - return FALSE; + return TRUE; } for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) @@ -757,7 +753,14 @@ static BOOL has_opengl(void) failed: wine_dlclose(opengl_handle, NULL, 0); opengl_handle = NULL; - return FALSE; + return TRUE; +} + +static BOOL has_opengl(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce(&init_once, init_opengl, NULL, NULL); + return opengl_handle != NULL; } static const char *debugstr_fbconfig( GLXFBConfig fbconfig )

1 0

Francois Gouget : include: Fix spelling of a method's parameter name.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 5f522029e1c2f735b65c366eae830960679930ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f522029e1c2f735b65c366ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 19:21:07 2016 +0200 include: Fix spelling of a method's parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/axextend.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/axextend.idl b/include/axextend.idl index bde2229..63eb542 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -178,7 +178,7 @@ interface IFilterMapper : IUnknown [in] CLSID clsInMaj, [in] CLSID clsInSub, [in] BOOL bRender, - [in] BOOL bOututNeeded, + [in] BOOL bOutputNeeded, [in] CLSID clsOutMaj, [in] CLSID clsOutSub );

1 0

Francois Gouget : tools: Fix spelling of a variable name.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 74979b0660620cb5425a1b7fddf2d2e4fc943f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74979b0660620cb5425a1b7fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 19:20:52 2016 +0200 tools: Fix spelling of a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_local.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index 9cea587..5a4dcea 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -320,14 +320,14 @@ sub _check_statements($$$) { if($first_debug_message && $called_name =~ /^(?:FIXME|TRACE)$/) { $first_debug_message = 0; if($called_arguments =~ /^\"$(.*?)$(.*?)\"\s*,\s*(.*?)$/) { - my $formating = $1; + my $formatting = $1; my $extra = $2; my $arguments = $3; my $format; my $argument; my $n = 0; - while($formating && ($formating =~ s/^([^,]*),?//, $format = $1, $format =~ s/^\s*(.*?)\s*$/$1/) && + while($formatting && ($formatting =~ s/^([^,]*),?//, $format = $1, $format =~ s/^\s*(.*?)\s*$/$1/) && $arguments && ($arguments =~ s/^([^,]*),?//, $argument = $1, $argument =~ s/^\s*(.*?)\s*$/$1/)) { my $type = @{$function->argument_types}[$n];

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
75
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 April 2016