wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Maarten Lankhorst : gdiplus: Clean up gdip_format_string.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: fe8e08a5d637b7dec927abdcda65e027aa867a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8e08a5d637b7dec927abdcd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Feb 17 11:06:02 2011 +0100 gdiplus: Clean up gdip_format_string. --- dlls/gdiplus/graphics.c | 46 +++++++++++++++++++++------------------------- 1 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 026b9a2..65700da 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3984,12 +3984,12 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w return GdipIsVisibleRect(graphics, (REAL)x, (REAL)y, (REAL)width, (REAL)height, result); } -typedef GpStatus (*gdip_format_string_callback)(GpGraphics *graphics, +typedef GpStatus (*gdip_format_string_callback)(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, INT lineno, const RectF *bounds, void *user_data); -static GpStatus gdip_format_string(GpGraphics *graphics, +static GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, gdip_format_string_callback callback, void *user_data) @@ -4028,7 +4028,7 @@ static GpStatus gdip_format_string(GpGraphics *graphics, else halign = StringAlignmentNear; while(sum < length){ - GetTextExtentExPointW(graphics->hdc, stringdup + sum, length - sum, + GetTextExtentExPointW(hdc, stringdup + sum, length - sum, nwidth, &fit, NULL, &size); fitcpy = fit; @@ -4066,7 +4066,7 @@ static GpStatus gdip_format_string(GpGraphics *graphics, else lineend = fit; - GetTextExtentExPointW(graphics->hdc, stringdup + sum, lineend, + GetTextExtentExPointW(hdc, stringdup + sum, lineend, nwidth, &j, NULL, &size); bounds.Width = size.cx; @@ -4092,7 +4092,7 @@ static GpStatus gdip_format_string(GpGraphics *graphics, break; } - stat = callback(graphics, stringdup, sum, lineend, + stat = callback(hdc, stringdup, sum, lineend, font, rect, format, lineno, &bounds, user_data); if (stat != Ok) @@ -4119,7 +4119,7 @@ struct measure_ranges_args { GpRegion **regions; }; -static GpStatus measure_ranges_callback(GpGraphics *graphics, +static GpStatus measure_ranges_callback(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, INT lineno, const RectF *bounds, void *user_data) @@ -4140,11 +4140,11 @@ static GpStatus measure_ranges_callback(GpGraphics *graphics, range_rect.Y = bounds->Y; range_rect.Height = bounds->Height; - GetTextExtentExPointW(graphics->hdc, string + index, range_start - index, + GetTextExtentExPointW(hdc, string + index, range_start - index, INT_MAX, NULL, NULL, &range_size); range_rect.X = bounds->X + range_size.cx; - GetTextExtentExPointW(graphics->hdc, string + index, range_end - index, + GetTextExtentExPointW(hdc, string + index, range_end - index, INT_MAX, NULL, NULL, &range_size); range_rect.Width = (bounds->X + range_size.cx) - range_rect.X; @@ -4166,7 +4166,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, int i; HFONT oldfont; struct measure_ranges_args args; - HDC temp_hdc=NULL; + HDC hdc, temp_hdc=NULL; TRACE("(%p %s %d %p %s %p %d %p)\n", graphics, debugstr_w(string), length, font, debugstr_rectf(layoutRect), stringFormat, regionCount, regions); @@ -4179,14 +4179,16 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if(!graphics->hdc) { - temp_hdc = graphics->hdc = CreateCompatibleDC(0); + hdc = temp_hdc = CreateCompatibleDC(0); if (!temp_hdc) return OutOfMemory; } + else + hdc = graphics->hdc; if (stringFormat->attr) TRACE("may be ignoring some format flags: attr %x\n", stringFormat->attr); - oldfont = SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw)); + oldfont = SelectObject(hdc, CreateFontIndirectW(&font->lfw)); for (i=0; i<stringFormat->range_count; i++) { @@ -4197,16 +4199,13 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, args.regions = regions; - stat = gdip_format_string(graphics, string, length, font, layoutRect, stringFormat, + stat = gdip_format_string(hdc, string, length, font, layoutRect, stringFormat, measure_ranges_callback, &args); - DeleteObject(SelectObject(graphics->hdc, oldfont)); + DeleteObject(SelectObject(hdc, oldfont)); if (temp_hdc) - { - graphics->hdc = NULL; DeleteDC(temp_hdc); - } return stat; } @@ -4217,7 +4216,7 @@ struct measure_string_args { INT *linesfilled; }; -static GpStatus measure_string_callback(GpGraphics *graphics, +static GpStatus measure_string_callback(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, INT lineno, const RectF *bounds, void *user_data) @@ -4261,7 +4260,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(!graphics->hdc) { - temp_hdc = graphics->hdc = CreateCompatibleDC(0); + temp_hdc = CreateCompatibleDC(0); if (!temp_hdc) return OutOfMemory; } @@ -4282,16 +4281,13 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.codepointsfitted = codepointsfitted; args.linesfilled = linesfilled; - gdip_format_string(graphics, string, length, font, rect, format, + gdip_format_string(graphics->hdc ? graphics->hdc : temp_hdc, string, length, font, rect, format, measure_string_callback, &args); DeleteObject(SelectObject(graphics->hdc, oldfont)); if (temp_hdc) - { - graphics->hdc = NULL; DeleteDC(temp_hdc); - } return Ok; } @@ -4302,7 +4298,7 @@ struct draw_string_args { REAL ang_cos, ang_sin; }; -static GpStatus draw_string_callback(GpGraphics *graphics, +static GpStatus draw_string_callback(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, INT lineno, const RectF *bounds, void *user_data) @@ -4313,7 +4309,7 @@ static GpStatus draw_string_callback(GpGraphics *graphics, drawcoord.left = drawcoord.right = args->drawbase.x + roundr(args->ang_sin * bounds->Y); drawcoord.top = drawcoord.bottom = args->drawbase.y + roundr(args->ang_cos * bounds->Y); - DrawTextW(graphics->hdc, string + index, length, &drawcoord, args->drawflags); + DrawTextW(hdc, string + index, length, &drawcoord, args->drawflags); return Ok; } @@ -4436,7 +4432,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string args.drawflags = DT_NOCLIP | DT_EXPANDTABS | DT_RIGHT; } - gdip_format_string(graphics, string, length, font, &scaled_rect, format, + gdip_format_string(graphics->hdc, string, length, font, &scaled_rect, format, draw_string_callback, &args); DeleteObject(rgn);

1 0

Jacek Caban : mshtml: Added support for indexed access to form elements.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: 0af2a117c348bc9e6cf09b50c80713f64805984f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0af2a117c348bc9e6cf09b50c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 3 15:18:26 2011 +0100 mshtml: Added support for indexed access to form elements. --- dlls/mshtml/htmlform.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index d9c2bce..ac6d39c 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -534,6 +534,20 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, return E_FAIL; } + if(len > MSHTML_CUSTOM_DISPID_CNT) + len = MSHTML_CUSTOM_DISPID_CNT; + + /* FIXME: Implement in more generic way */ + if('0' <= *name && *name <= '9') { + WCHAR *end_ptr; + + i = strtoulW(name, &end_ptr, 10); + if(!*end_ptr && i < len) { + *pid = MSHTML_DISPID_CUSTOM_MIN + i; + return S_OK; + } + } + nsAString_InitDepend(&nsname, nameW); nsAString_Init(&nsstr, NULL); for(i = 0; i < len; ++i) {

1 0

Joris Huizer : userenv: GetUserProfileDirectoryW: Plug memory leak.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: fa7c08820b0234f107d594b8ba49bf1156f0be50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa7c08820b0234f107d594b8b… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Wed Mar 2 21:28:43 2011 +0100 userenv: GetUserProfileDirectoryW: Plug memory leak. --- dlls/userenv/userenv_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 6a2a953..6221e7e 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -187,6 +187,7 @@ BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, ret = TRUE; done: + HeapFree( GetProcessHeap(), 0, t ); HeapFree( GetProcessHeap(), 0, userW ); HeapFree( GetProcessHeap(), 0, dirW ); return ret;

1 0

Juan Lang : wininet: Support setting the expired time in SetUrlCacheEntryInfo.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: 75cc509daef08920ea38655e4b52fc083be90081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cc509daef08920ea38655e4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 2 09:07:58 2011 -0800 wininet: Support setting the expired time in SetUrlCacheEntryInfo. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 2129f42..a52de20 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1090,7 +1090,7 @@ static DWORD URLCache_SetEntryInfo(URL_CACHEFILE_ENTRY * pUrlEntry, const INTERN if (dwFieldControl & CACHE_ENTRY_EXEMPT_DELTA_FC) pUrlEntry->dwExemptDelta = lpCacheEntryInfo->u.dwExemptDelta; if (dwFieldControl & CACHE_ENTRY_EXPTIME_FC) - FIXME("CACHE_ENTRY_EXPTIME_FC unimplemented\n"); + FileTimeToDosDateTime(&lpCacheEntryInfo->ExpireTime, &pUrlEntry->wExpiredDate, &pUrlEntry->wExpiredTime); if (dwFieldControl & CACHE_ENTRY_HEADERINFO_FC) FIXME("CACHE_ENTRY_HEADERINFO_FC unimplemented\n"); if (dwFieldControl & CACHE_ENTRY_HITRATE_FC)

1 0

Juan Lang : wininet: Use correct scheme for cache entries.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: b9c348a0b30dca03f8d64f6a36a262a4784296ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c348a0b30dca03f8d64f6a3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Mar 2 08:28:39 2011 -0800 wininet: Use correct scheme for cache entries. --- dlls/wininet/http.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ae45b08..0467860 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1533,15 +1533,25 @@ static DWORD HTTP_ResolveName(http_request_t *request) static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf) { + static const WCHAR http[] = { 'h','t','t','p',':','/','/',0 }; + static const WCHAR https[] = { 'h','t','t','p','s',':','/','/',0 }; + static const WCHAR slash[] = { '/',0 }; LPHTTPHEADERW host_header; - - static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; + LPCWSTR scheme; host_header = HTTP_GetHeader(req, hostW); if(!host_header) return FALSE; - sprintfW(buf, formatW, host_header->lpszValue, req->path); /* FIXME */ + if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) + scheme = https; + else + scheme = http; + strcpyW(buf, scheme); + strcatW(buf, host_header->lpszValue); + if (req->path[0] != '/') + strcatW(buf, slash); + strcatW(buf, req->path); return TRUE; }

1 0

André Hentschel : t2embed: Add stub for TTEmbedFont.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: 29d5887b5c4c24b8d52988324fbea65a5dacb696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d5887b5c4c24b8d52988324… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 3 13:09:56 2011 +0100 t2embed: Add stub for TTEmbedFont. --- dlls/t2embed/main.c | 13 +++++++++++++ dlls/t2embed/t2embed.spec | 4 ++-- include/t2embapi.h | 8 ++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 6d12eff..f3f1a00 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -60,6 +60,19 @@ LONG WINAPI TTLoadEmbeddedFont(HANDLE *phFontReference, ULONG ulFlags, return E_API_NOTIMPL; } +LONG WINAPI TTEmbedFont(HDC hDC, ULONG ulFlags, ULONG ulCharSet, ULONG *pulPrivStatus, + ULONG *pulStatus, WRITEEMBEDPROC lpfnWriteToStream, LPVOID lpvWriteStream, + USHORT *pusCharCodeSet, USHORT usCharCodeCount, USHORT usLanguage, + TTEMBEDINFO *pTTEmbedInfo) +{ + FIXME("(%p 0x%08x 0x%08x %p %p %p %p %p %u %u %p) stub\n", hDC, + ulFlags, ulCharSet, pulPrivStatus, pulStatus, lpfnWriteToStream, + lpvWriteStream, pusCharCodeSet, usCharCodeCount, usLanguage, + pTTEmbedInfo); + + return E_API_NOTIMPL; +} + LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) { FIXME("(%p %p) stub\n", hDC, status); diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index 2566fa2..120eaaa 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -1,6 +1,6 @@ @ stub TTCharToUnicode @ stub TTDeleteEmbeddedFont -@ stub TTEmbedFont +@ stdcall TTEmbedFont(ptr long long ptr ptr ptr ptr ptr long long ptr) @ stub TTEmbedFontFromFileA @ stub TTEnableEmbeddingForFacename @ stub TTGetEmbeddedFontInfo @@ -11,7 +11,7 @@ @ stub TTRunValidationTests @ stub _TTCharToUnicode@24 @ stub _TTDeleteEmbeddedFont@12 -@ stub _TTEmbedFont@44 +@ stdcall _TTEmbedFont@44(ptr long long ptr ptr ptr ptr ptr long long ptr) TTEmbedFont @ stub _TTEmbedFontFromFileA@52 @ stub _TTEnableEmbeddingForFacename@8 @ stub _TTGetEmbeddedFontInfo@28 diff --git a/include/t2embapi.h b/include/t2embapi.h index d0ddef2..151bfc1 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -28,6 +28,7 @@ extern "C" { #define E_API_NOTIMPL 0x0001L typedef ULONG (WINAPIV * READEMBEDPROC)(void*,void*,ULONG); +typedef ULONG (WINAPIV * WRITEEMBEDPROC)(void*,void*,ULONG); typedef struct { @@ -36,6 +37,13 @@ typedef struct unsigned short *pusRefStr; } TTLOADINFO; +typedef struct +{ + unsigned short usStructSize; + unsigned short usRootStrSize; + unsigned short *pusRootStr; +} TTEMBEDINFO; + LONG WINAPI TTLoadEmbeddedFont(HANDLE*,ULONG,ULONG*,ULONG,ULONG*,READEMBEDPROC, LPVOID,LPWSTR,LPSTR,TTLOADINFO*);

1 0

Huw Davies : widl: Initialise [out] only conformant arrays.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: 09dd285d8c6458643a5eb6eb5dfa999368a46c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dd285d8c6458643a5eb6eb5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 2 11:14:36 2011 +0000 widl: Initialise [out] only conformant arrays. This isn't strictly what midl does, however VB relies on the array in IEnumVARIANT_Next() being zero initialised. Native uses stubless proxies, where the initialisation is performed in NdrStubCall2(). --- tools/widl/typegen.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5702cbc..2d2bd75 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4034,10 +4034,22 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char if (type_array_has_conformance(var->type)) { unsigned int size; - type_t *type = var->type; + type_t *type; fprintf(file, " = NdrAllocate(&__frame->_StubMsg, "); - for ( ; + for (type = var->type; + is_array(type) && type_array_has_conformance(type); + type = type_array_get_element(type)) + { + write_expr(file, type_array_get_conformance(type), TRUE, + TRUE, NULL, NULL, local_var_prefix); + fprintf(file, " * "); + } + size = type_memsize(type); + fprintf(file, "%u);\n", size); + + print_file(file, indent, "memset(%s%s, 0, ", local_var_prefix, var->name); + for (type = var->type; is_array(type) && type_array_has_conformance(type); type = type_array_get_element(type)) {

1 0

Peter Urbanec : wintab32: Better handling of XInput initialisation errors.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: 0ea8bf17fa1df2b18d8d3a9fda56db472da94948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea8bf17fa1df2b18d8d3a9fd… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Thu Mar 3 19:26:33 2011 +1100 wintab32: Better handling of XInput initialisation errors. --- dlls/winex11.drv/wintab.c | 16 ++++++++++------ dlls/wintab32/context.c | 31 +++++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 7d7bfcc..7a9e749 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -484,7 +484,7 @@ static void disable_system_cursors(void) /*********************************************************************** * X11DRV_LoadTabletInfo (X11DRV.@) */ -void CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) +BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) { const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; @@ -507,7 +507,7 @@ void CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) if (!X11DRV_XInput_Init()) { ERR("Unable to initialize the XInput library.\n"); - return; + return FALSE; } hwndTabletDefault = hwnddefault; @@ -555,9 +555,9 @@ void CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) devices = pXListInputDevices(data->display, &num_devices); if (!devices) { - WARN("XInput Extensions reported as not avalable\n"); + WARN("XInput Extensions reported as not available\n"); wine_tsx11_unlock(); - return; + return FALSE; } TRACE("XListInputDevices reports %d devices\n", num_devices); for (loop=0; loop < num_devices; loop++) @@ -778,6 +778,7 @@ void CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) } wine_tsx11_unlock(); + return TRUE; } static int figure_deg(int x, int y) @@ -971,7 +972,7 @@ int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) XEventClass event_list[7]; Window win = X11DRV_get_whole_window( hOwner ); - if (!win) return 0; + if (!win || !xinput_handle) return 0; TRACE("Creating context for window %p (%lx) %i cursors\n", hOwner, win, gNumCursors); @@ -1080,6 +1081,8 @@ UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) LPWTI_CURSORS_INFO tgtcursor; TRACE("(%u, %u, %p)\n", wCategory, nIndex, lpOutput); + if (!xinput_handle) return 0; + switch(wCategory) { case 0: @@ -1512,8 +1515,9 @@ int CDECL X11DRV_GetCurrentPacket(LPWTPACKET packet) /*********************************************************************** * LoadTabletInfo (X11DRV.@) */ -void CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) +BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) { + return FALSE; } /*********************************************************************** diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 30f0021..c8940b3 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -42,7 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintab32); * http://www.csl.sony.co.jp/projects/ar/restricted/wintabl.html */ -static BOOL gLoaded; static LPOPENCONTEXT gOpenContexts; static HCTX gTopContext = (HCTX)0xc00; @@ -151,12 +150,26 @@ static LPOPENCONTEXT TABLET_FindOpenContext(HCTX hCtx) return NULL; } -static void LoadTablet(void) +static inline BOOL LoadTablet(void) { - TRACE("Initializing the tablet to hwnd %p\n",hwndDefault); - gLoaded= TRUE; - if (pLoadTabletInfo) - pLoadTabletInfo(hwndDefault); + static enum {TI_START = 0, TI_OK, TI_FAIL} loaded = TI_START; + + if (loaded == TI_START) + { + TRACE("Initializing the tablet to hwnd %p\n",hwndDefault); + + if (pLoadTabletInfo && pLoadTabletInfo(hwndDefault)) + { + loaded = TI_OK; + } + else + { + loaded = TI_FAIL; + ERR("LoadTabletInfo(%p) failed\n", hwndDefault); + } + } + + return loaded == TI_OK; } int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, @@ -366,9 +379,9 @@ static UINT WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode) { UINT result; + if (!LoadTablet()) return 0; + TRACE("(%d, %d, %p, %d)\n", wCategory, nIndex, lpOutput, bUnicode); - if (gLoaded == FALSE) - LoadTablet(); /* * Handle system extents here, as we can use user32.dll code to set them. @@ -450,6 +463,8 @@ HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) { LPOPENCONTEXT newcontext; + if (!LoadTablet()) return 0; + TRACE("hWnd=%p, lpLogCtx=%p, fEnable=%u\n", hWnd, lpLogCtx, fEnable); DUMPCONTEXT(*lpLogCtx);

1 0

Henri Verbeet : wined3d: Pass gl_info to basetexture_bind().
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: af0a4b6956b0c9cb44a0c00b479c9cb892b64e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0a4b6956b0c9cb44a0c00b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 3 09:24:11 2011 +0100 wined3d: Pass gl_info to basetexture_bind(). --- dlls/wined3d/basetexture.c | 4 ++-- dlls/wined3d/cubetexture.c | 8 ++++---- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 3 ++- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/volume.c | 2 +- dlls/wined3d/volumetexture.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 6 ++++-- 8 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 534847f..e14185b 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -238,9 +238,9 @@ void basetexture_set_dirty(IWineD3DBaseTextureImpl *texture, BOOL dirty) } /* Context activation is done by the caller. */ -HRESULT basetexture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb, BOOL *set_surface_desc) +HRESULT basetexture_bind(IWineD3DBaseTextureImpl *texture, + const struct wined3d_gl_info *gl_info, BOOL srgb, BOOL *set_surface_desc) { - const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; HRESULT hr = WINED3D_OK; GLenum textureDimensions; BOOL isNewTexture = FALSE; diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 2500650..765c11a 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -28,18 +28,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); /* Context activation is done by the caller. */ -static HRESULT cubetexture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb) +static HRESULT cubetexture_bind(IWineD3DBaseTextureImpl *texture, + const struct wined3d_gl_info *gl_info, BOOL srgb) { BOOL set_gl_texture_desc; HRESULT hr; - TRACE("texture %p, srgb %#x.\n", texture, srgb); + TRACE("texture %p, gl_info %p, srgb %#x.\n", texture, gl_info, srgb); - hr = basetexture_bind(texture, srgb, &set_gl_texture_desc); + hr = basetexture_bind(texture, gl_info, srgb, &set_gl_texture_desc); if (set_gl_texture_desc && SUCCEEDED(hr)) { UINT sub_count = texture->baseTexture.level_count * texture->baseTexture.layer_count; - const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; BOOL srgb_tex = !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] && texture->baseTexture.is_srgb; GLuint name = srgb_tex ? texture->baseTexture.texture_srgb.name : texture->baseTexture.texture_rgb.name; UINT i; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1f9a7fd..daecba2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3646,7 +3646,7 @@ static void sampler(DWORD state_id, struct wined3d_stateblock *stateblock, struc IWineD3DBaseTextureImpl *texture = state->textures[sampler]; BOOL srgb = state->sampler_states[sampler][WINED3DSAMP_SRGBTEXTURE]; - texture->baseTexture.texture_ops->texture_bind(texture, srgb); + texture->baseTexture.texture_ops->texture_bind(texture, gl_info, srgb); basetexture_apply_state_changes(texture, state->sampler_states[sampler], gl_info); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 30e1d64..7f0a42c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -701,9 +701,10 @@ void surface_bind(IWineD3DSurfaceImpl *surface, BOOL srgb) if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { IWineD3DBaseTextureImpl *texture = surface->container.u.texture; + const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; TRACE("Passing to container (%p).\n", texture); - texture->baseTexture.texture_ops->texture_bind(texture, srgb); + texture->baseTexture.texture_ops->texture_bind(texture, gl_info, srgb); } else { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0491a8e..8f98739 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -28,17 +28,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); /* Context activation is done by the caller. */ -static HRESULT texture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb) +static HRESULT texture_bind(IWineD3DBaseTextureImpl *texture, + const struct wined3d_gl_info *gl_info, BOOL srgb) { BOOL set_gl_texture_desc; HRESULT hr; - TRACE("texture %p, srgb %#x.\n", texture, srgb); + TRACE("texture %p, gl_info %p, srgb %#x.\n", texture, gl_info, srgb); - hr = basetexture_bind(texture, srgb, &set_gl_texture_desc); + hr = basetexture_bind(texture, gl_info, srgb, &set_gl_texture_desc); if (set_gl_texture_desc && SUCCEEDED(hr)) { - const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; BOOL srgb_tex = !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] && texture->baseTexture.is_srgb; struct gl_texture *gl_tex; UINT i; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index e877cfb..03bc5e6 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -60,7 +60,7 @@ static void volume_bind_and_dirtify(struct IWineD3DVolumeImpl *volume) IWineD3DDeviceImpl_MarkStateDirty(volume->resource.device, STATE_SAMPLER(active_sampler)); } - container->baseTexture.texture_ops->texture_bind(container, FALSE); + container->baseTexture.texture_ops->texture_bind(container, gl_info, FALSE); } void volume_add_dirty_box(struct IWineD3DVolumeImpl *volume, const WINED3DBOX *dirty_box) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 2ac6091..e24ff79 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -27,13 +27,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); /* Context activation is done by the caller. */ -static HRESULT volumetexture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb) +static HRESULT volumetexture_bind(IWineD3DBaseTextureImpl *texture, + const struct wined3d_gl_info *gl_info, BOOL srgb) { BOOL dummy; - TRACE("texture %p, srgb %#x.\n", texture, srgb); + TRACE("texture %p, gl_info %p, srgb %#x.\n", texture, gl_info, srgb); - return basetexture_bind(texture, srgb, &dummy); + return basetexture_bind(texture, gl_info, srgb, &dummy); } /* Do not call while under the GL lock. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb619a5..709ffc5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1871,7 +1871,8 @@ struct gl_texture struct wined3d_texture_ops { - HRESULT (*texture_bind)(struct IWineD3DBaseTextureImpl *texture, BOOL srgb); + HRESULT (*texture_bind)(struct IWineD3DBaseTextureImpl *texture, + const struct wined3d_gl_info *gl_info, BOOL srgb); void (*texture_preload)(struct IWineD3DBaseTextureImpl *texture, enum WINED3DSRGB srgb); }; @@ -1919,7 +1920,8 @@ static inline struct gl_texture *basetexture_get_gl_texture(IWineD3DBaseTextureI void basetexture_apply_state_changes(IWineD3DBaseTextureImpl *texture, const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -HRESULT basetexture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; +HRESULT basetexture_bind(IWineD3DBaseTextureImpl *texture, + const struct wined3d_gl_info *gl_info, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; void basetexture_cleanup(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN; WINED3DTEXTUREFILTERTYPE basetexture_get_autogen_filter_type(IWineD3DBaseTextureImpl *texture) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use EXT_texture_sRGB_decode to avoid sRGB texture duplication.
by Alexandre Julliard 03 Mar '11

03 Mar '11

Module: wine Branch: master Commit: 75c8e9f7b42173eb3c08e4ae87d485caca431a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c8e9f7b42173eb3c08e4ae8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 3 09:24:10 2011 +0100 wined3d: Use EXT_texture_sRGB_decode to avoid sRGB texture duplication. --- dlls/wined3d/basetexture.c | 18 +++++++++++++++--- dlls/wined3d/context.c | 16 +++++++++------- dlls/wined3d/cubetexture.c | 12 ++++++------ dlls/wined3d/surface.c | 18 ++++++++++++++++++ dlls/wined3d/texture.c | 14 +++++++------- dlls/wined3d/utils.c | 16 +++++++++++----- dlls/wined3d/wined3d_private.h | 13 +++++++++---- 7 files changed, 75 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75c8e9f7b42173eb3c08e…

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
85
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 March 2011