wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Jörg Höhle : mmdevapi/tests: Fix some test failures on native.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 260c8ce9b4b5f3b1422c0c8d456d535286972e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=260c8ce9b4b5f3b1422c0c8d4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 7 23:11:46 2012 +0100 mmdevapi/tests: Fix some test failures on native. --- dlls/mmdevapi/tests/render.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 8590abd..f918460 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -267,7 +267,8 @@ static void test_audioclient(void) fmtex->dwChannelMask = 0; hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &fmt2); - ok(hr == S_OK, "IsFormatSupported(dwChannelMask = 0) call returns %08x\n", hr); + ok(hr == S_OK || broken(hr == S_FALSE /* w7 Realtek HDA */), + "IsFormatSupported(dwChannelMask = 0) call returns %08x\n", hr); ok(fmtex->dwChannelMask == 0, "Passed format was modified\n"); CoTaskMemFree(fmt2); @@ -304,7 +305,8 @@ static void test_audioclient(void) ok(hr == S_OK, "Valid GetStreamLatency call returns %08x\n", hr); trace("Returned latency: %u.%04u ms\n", (UINT)(t2/10000), (UINT)(t2 % 10000)); - ok(t2 >= t1, "Latency < default period, delta %ldus\n", (long)((t2-t1)/10)); + ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000), + "Latency < default period, delta %ldus\n", (long)((t2-t1)/10)); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); @@ -415,10 +417,10 @@ static void test_formats(AUDCLNT_SHAREMODE mode) fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr, hrs); else /* On testbot 48000x16x1 claims support, but does not Initialize. - * 5:1 cards Initialize 44100|48000x16x1 yet claim no support. */ + * Some cards Initialize 44100|48000x16x1 yet claim no support. */ ok(hrs == S_OK ? hr == S_OK || broken(hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED) : hr == AUDCLNT_E_ENDPOINT_CREATE_FAILED || broken(hr == S_OK && - pwfx->nChannels > 2 && fmt.nChannels == 1), + fmt.nChannels == 1 && pwfx->wBitsPerSample == fmt.wBitsPerSample), "Initialize(exclus., %ux%2ux%u) returns %08x\n", fmt.nSamplesPerSec, fmt.wBitsPerSample, fmt.nChannels, hr);

1 0

Jacek Caban : mshtml: Open document in a new window in IHlinkTarget:: Navigate if the document is not embedded.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 7bbe0d5ca6a9005d0c781d671c06a74fe9f2b0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bbe0d5ca6a9005d0c781d671… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 10 17:07:36 2012 +0100 mshtml: Open document in a new window in IHlinkTarget::Navigate if the document is not embedded. --- dlls/mshtml/hlink.c | 4 ++++ dlls/mshtml/navigate.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c index fd836de..4e63498 100644 --- a/dlls/mshtml/hlink.c +++ b/dlls/mshtml/hlink.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "binding.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -83,6 +84,9 @@ static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, L if(pwzJumpLocation) FIXME("JumpLocation not supported\n"); + if(!This->doc_obj->client) + return navigate_new_window(This->window, This->window->uri, NULL, NULL); + return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); } diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ea1f532..9b650f4 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2030,7 +2030,10 @@ HRESULT navigate_new_window(HTMLWindow *window, IUri *uri, const WCHAR *name, IH IWebBrowser2_put_Visible(web_browser, VARIANT_TRUE); IWebBrowser2_Release(web_browser); - *ret = new_window; + if(ret) + *ret = new_window; + else + IHTMLWindow2_Release(new_window); return S_OK; }

1 0

Jacek Caban : jscript: Fixed continue inside for..in statement.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: dc5a75a7ace93c159290e193d01f1aa88feb2224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc5a75a7ace93c159290e193d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 10 16:10:29 2012 +0100 jscript: Fixed continue inside for..in statement. --- dlls/jscript/compile.c | 9 +++------ dlls/jscript/tests/lang.js | 22 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4cdd2ed..19fd0c2 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1237,18 +1237,15 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s static HRESULT pop_to_stat(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx) { - statement_ctx_t *iter = ctx->stat_ctx; unsigned stack_pop = 0; + statement_ctx_t *iter; - while(iter) { + for(iter = ctx->stat_ctx; iter != stat_ctx; iter = iter->next) { if(iter->using_scope && !push_instr(ctx, OP_pop_scope)) return E_OUTOFMEMORY; if(iter->using_except && !push_instr(ctx, OP_pop_except)) return E_OUTOFMEMORY; stack_pop += iter->stack_use; - if(iter == stat_ctx) - break; - iter = iter->next; } /* FIXME: optimize */ @@ -1308,7 +1305,7 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * if(stat->identifier) return push_instr(ctx, OP_label) ? S_OK : E_OUTOFMEMORY; /* FIXME */ - hres = pop_to_stat(ctx, pop_ctx); + hres = pop_to_stat(ctx, pop_ctx->next); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d7182c6..58d4599 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -839,8 +839,8 @@ for(tmp in obj1.nonexistent) ok(false, "for(tmp in obj1.nonexistent) called with tmp = " + tmp); ok(!("nonexistent" in obj1), "nonexistent added to obj1 by for..in loop"); -var i, j; +var i, j; tmp = ""; i = 0; @@ -896,6 +896,26 @@ for(j in [1,2,3]) { } ok(tmp === "1234", "tmp = " + tmp); +tmp = 0; +for(var iter in [1,2,3]) { + tmp += +iter; + continue; +} +ok(tmp === 3, "tmp = " + tmp); + +tmp = false; +for(var iter in [1,2,3]) { + switch(+iter) { + case 1: + tmp = true; + try { + continue; + }finally {} + default: + continue; + } +} +ok(tmp, "tmp = " + tmp); ok((void 1) === undefined, "(void 1) !== undefined");

1 0

Nikolay Sivov : msxml3: Debug output support for VT_ERROR.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 9575b906a4e09499799543620f4ebfe6ff8e0d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9575b906a4e09499799543620… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 15:33:34 2012 +0300 msxml3: Debug output support for VT_ERROR. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index c4e4303..464ef90 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -289,6 +289,8 @@ const char *debugstr_variant(const VARIANT *v) case VT_BSTR|VT_BYREF: return wine_dbg_sprintf("{VT_BSTR|VT_BYREF: ptr %p, data %s}", V_BSTRREF(v), debugstr_w(V_BSTRREF(v) ? *V_BSTRREF(v) : NULL)); + case VT_ERROR: + return wine_dbg_sprintf("{VT_ERROR: 0x%08x}", V_ERROR(v)); default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); }

1 0

Dmitry Timoshkov : msvcrt: Add some tests for strftime/wcsftime.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 42157151d0b4e9fcc2ffd72cc16ded5c157ff10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42157151d0b4e9fcc2ffd72cc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 10 16:02:04 2012 +0800 msvcrt: Add some tests for strftime/wcsftime. --- dlls/msvcrt/tests/time.c | 47 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 950042c..a7790d5 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -25,6 +25,7 @@ #include <stdlib.h> /*setenv*/ #include <stdio.h> /*printf*/ +#include <locale.h> #include <errno.h> #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) @@ -37,6 +38,7 @@ static __time32_t (__cdecl *p_mkgmtime32)(struct tm*); static struct tm* (__cdecl *p_gmtime32)(__time32_t*); +static struct tm* (__cdecl *p_gmtime)(time_t*); static errno_t (__cdecl *p_gmtime32_s)(struct tm*, __time32_t*); static errno_t (__cdecl *p_strtime_s)(char*,size_t); static errno_t (__cdecl *p_strdate_s)(char*,size_t); @@ -44,12 +46,15 @@ static errno_t (__cdecl *p_localtime32_s)(struct tm*, __time32_t*); static errno_t (__cdecl *p_localtime64_s)(struct tm*, __time64_t*); static int* (__cdecl *p__daylight)(void); static int* (__cdecl *p___p__daylight)(void); +static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); +static size_t (__cdecl *p_wcsftime)(wchar_t *, size_t, const wchar_t *, const struct tm *); static void init(void) { - HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + HMODULE hmod = LoadLibrary("msvcrt.dll"); p_gmtime32 = (void*)GetProcAddress(hmod, "_gmtime32"); + p_gmtime = (void*)GetProcAddress(hmod, "gmtime"); p_gmtime32_s = (void*)GetProcAddress(hmod, "_gmtime32_s"); p_mkgmtime32 = (void*)GetProcAddress(hmod, "_mkgmtime32"); p_strtime_s = (void*)GetProcAddress(hmod, "_strtime_s"); @@ -58,6 +63,8 @@ static void init(void) p_localtime64_s = (void*)GetProcAddress(hmod, "_localtime64_s"); p__daylight = (void*)GetProcAddress(hmod, "__daylight"); p___p__daylight = (void*)GetProcAddress(hmod, "__p__daylight"); + p_strftime = (void*)GetProcAddress(hmod, "strftime"); + p_wcsftime = (void*)GetProcAddress(hmod, "wcsftime"); } static int get_test_year(time_t *start) @@ -568,10 +575,48 @@ static void test_daylight(void) ok(ret1 && ret1 == ret2, "got %p\n", ret1); } +static void test_strftime(void) +{ + static const wchar_t cW[] = { '%','c',0 }; + static const char expected[] = "01/01/70 00:00:00"; + time_t gmt; + struct tm* gmt_tm; + char buf[256], bufA[256]; + WCHAR bufW[256]; + long retA, retW; + + if (!p_strftime || !p_wcsftime || !p_gmtime) + { + win_skip("strftime, wcsftime or gmtime is not available\n"); + return; + } + + setlocale(LC_TIME, "C"); + + gmt = 0; + gmt_tm = p_gmtime(&gmt); + ok(gmt_tm != NULL, "gmtime failed\n"); + + retA = strftime(bufA, 256, "%c", gmt_tm); +todo_wine { + ok(retA == 17, "expected 17, got %ld\n", retA); + ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA); +} + retW = wcsftime(bufW, 256, cW, gmt_tm); +todo_wine + ok(retW == 17, "expected 17, got %ld\n", retW); + ok(retA == retW, "expected %ld, got %ld\n", retA, retW); + buf[0] = 0; + retA = WideCharToMultiByte(CP_ACP, 0, bufW, retW, buf, 256, NULL, NULL); + buf[retA] = 0; + ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); +} + START_TEST(time) { init(); + test_strftime(); test_ctime(); test_gmtime(); test_mktime();

1 0

André Hentschel : dbghelp: No need for WINE_ prefixed ERR.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: b95574e2867f89d53d7f76d8b088f6e02b539ec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95574e2867f89d53d7f76d8b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 9 23:23:09 2012 +0100 dbghelp: No need for WINE_ prefixed ERR. --- dlls/dbghelp/pe_module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index ba7f1a2..79a4d90 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -600,8 +600,8 @@ static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* mod if (nDbg != 1 || dbg->Type != IMAGE_DEBUG_TYPE_MISC || misc->DataType != IMAGE_DEBUG_MISC_EXENAME) { - WINE_ERR("-Debug info stripped, but no .DBG file in module %s\n", - debugstr_w(module->module.ModuleName)); + ERR("-Debug info stripped, but no .DBG file in module %s\n", + debugstr_w(module->module.ModuleName)); } else {

1 0

André Hentschel : setupapi: Add stub for CM_Get_DevNode_Registry_Property_ExW.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: c83b67bc4ff37222d56761669618f7533d6d0c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83b67bc4ff37222d56761669… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 9 23:07:10 2012 +0100 setupapi: Add stub for CM_Get_DevNode_Registry_Property_ExW. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 44097ef..450ce02 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -57,7 +57,7 @@ @ stub CM_Get_DevNode_Registry_PropertyA @ stub CM_Get_DevNode_Registry_PropertyW @ stub CM_Get_DevNode_Registry_Property_ExA -@ stub CM_Get_DevNode_Registry_Property_ExW +@ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 25639f5..2d5d80a 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -68,7 +68,7 @@ @ stub CM_Get_DevNode_Registry_PropertyA @ stub CM_Get_DevNode_Registry_PropertyW @ stub CM_Get_DevNode_Registry_Property_ExA -@ stub CM_Get_DevNode_Registry_Property_ExW +@ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) @ stub CM_Get_DevNode_Status @ stub CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index f53b3ad..b43a343 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -359,6 +359,16 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class, } /*********************************************************************** + * CM_Get_DevNode_Registry_Property_ExW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW(DEVINST dev, ULONG prop, PULONG regdatatype, + PVOID buf, PULONG len, ULONG flags, HMACHINE machine) +{ + FIXME("0x%08x %u %p %p %p 0x%08x %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Enumerate_Classes (SETUPAPI.@) */ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags)

1 0

Aric Stewart : usp10: Better handle cases in single line edit controls where es-> x_offset exceeds line length.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 3ebb878470a7c30a4120554e846ea17a7a723318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebb878470a7c30a4120554e8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jan 9 13:30:31 2012 -0600 usp10: Better handle cases in single line edit controls where es->x_offset exceeds line length. --- dlls/user32/edit.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 0fcc9db..81cb6cc 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1093,6 +1093,7 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) { if (es->x_offset >= get_text_length(es)) { + int leftover = es->x_offset - get_text_length(es); if (es->ssa) { const SIZE *size; @@ -1101,8 +1102,10 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) } else xoff = 0; + xoff += es->char_width * leftover; } - ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); + else + ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); } else xoff = 0;

1 0

Alexandre Julliard : gdi32: Get rid of the CreateDIBSection driver entry point.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: fbbf3ba40814129effa1be087b29414e139dcf3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbbf3ba40814129effa1be087… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 14:21:01 2012 +0100 gdi32: Get rid of the CreateDIBSection driver entry point. --- dlls/gdi32/dibdrv/dc.c | 1 - dlls/gdi32/driver.c | 6 ------ dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/freetype.c | 1 - dlls/gdi32/mfdrv/init.c | 1 - dlls/gdi32/path.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/xrender.c | 1 - include/wine/gdi_driver.h | 3 +-- 10 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 220224f..9f1a633 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -575,7 +575,6 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ dibdrv_CreateDC, /* pCreateDC */ - NULL, /* pCreateDIBSection */ dibdrv_DeleteBitmap, /* pDeleteBitmap */ dibdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 29b6973..36bf48f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -227,11 +227,6 @@ static BOOL nulldrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, return FALSE; } -static HBITMAP nulldrv_CreateDIBSection( PHYSDEV dev, HBITMAP bitmap, BITMAPINFO *info, UINT usage ) -{ - return bitmap; -} - static BOOL nulldrv_DeleteBitmap( HBITMAP bitmap ) { return TRUE; @@ -739,7 +734,6 @@ const struct gdi_dc_funcs null_driver = nulldrv_CreateBitmap, /* pCreateBitmap */ nulldrv_CreateCompatibleDC, /* pCreateCompatibleDC */ nulldrv_CreateDC, /* pCreateDC */ - nulldrv_CreateDIBSection, /* pCreateDIBSection */ nulldrv_DeleteBitmap, /* pDeleteBitmap */ nulldrv_DeleteDC, /* pDeleteDC */ nulldrv_DeleteObject, /* pDeleteObject */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 28c2b2f..f988ebd 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -51,7 +51,6 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ - NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ EMFDRV_DeleteDC, /* pDeleteDC */ EMFDRV_DeleteObject, /* pDeleteObject */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 537d81a..37725a1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7158,7 +7158,6 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ freetype_CreateDC, /* pCreateDC */ - NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ freetype_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 0aa9f3f..e02c6be 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -96,7 +96,6 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pCreateBitmap */ MFDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ NULL, /* pCreateDC */ - NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ MFDRV_DeleteDC, /* pDeleteDC */ MFDRV_DeleteObject, /* pDeleteObject */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 4d753fd..52f103d 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2250,7 +2250,6 @@ const struct gdi_dc_funcs path_driver = NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ pathdrv_CreateDC, /* pCreateDC */ - NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ pathdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 5f54244..fa47573 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -834,7 +834,6 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pCreateBitmap */ PSDRV_CreateCompatibleDC, /* pCreateCompatibleDC */ PSDRV_CreateDC, /* pCreateDC */ - NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ PSDRV_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 15f110b..0530e31 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -467,7 +467,6 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_CreateBitmap, /* pCreateBitmap */ X11DRV_CreateCompatibleDC, /* pCreateCompatibleDC */ X11DRV_CreateDC, /* pCreateDC */ - X11DRV_CreateDIBSection, /* pCreateDIBSection */ X11DRV_DeleteBitmap, /* pDeleteBitmap */ X11DRV_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index dc3d55b..feb8523 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2684,7 +2684,6 @@ static const struct gdi_dc_funcs xrender_funcs = xrenderdrv_CreateBitmap, /* pCreateBitmap */ xrenderdrv_CreateCompatibleDC, /* pCreateCompatibleDC */ xrenderdrv_CreateDC, /* pCreateDC */ - NULL, /* pCreateDIBSection */ xrenderdrv_DeleteBitmap, /* pDeleteBitmap */ xrenderdrv_DeleteDC, /* pDeleteDC */ NULL, /* pDeleteObject */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 2ba1b7b..eb64b36 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -77,7 +77,6 @@ struct gdi_dc_funcs BOOL (*pCreateBitmap)(PHYSDEV,HBITMAP); BOOL (*pCreateCompatibleDC)(PHYSDEV,PHYSDEV*); BOOL (*pCreateDC)(PHYSDEV*,LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); - HBITMAP (*pCreateDIBSection)(PHYSDEV,HBITMAP,BITMAPINFO *,UINT); BOOL (*pDeleteBitmap)(HBITMAP); BOOL (*pDeleteDC)(PHYSDEV); BOOL (*pDeleteObject)(PHYSDEV,HGDIOBJ); @@ -212,7 +211,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 23 +#define WINE_GDI_DRIVER_VERSION 24 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : gdi32: Use the bitmap part of the DIBSECTION structure for the DDB object information .
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 71ea68b65727a7abac8f179035fe895f8b641a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ea68b65727a7abac8f17903… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 16:09:54 2012 +0100 gdi32: Use the bitmap part of the DIBSECTION structure for the DDB object information. --- dlls/gdi32/bitmap.c | 63 +++++++++++++++++++++++---------------------- dlls/gdi32/brush.c | 8 +++--- dlls/gdi32/dib.c | 30 +++++++++------------ dlls/gdi32/dibdrv/dc.c | 12 ++++---- dlls/gdi32/gdi_private.h | 1 - 5 files changed, 55 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71ea68b65727a7abac8f1…

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
98
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 January 2012