June 2012 - Wine-Commits - list.winehq.org

Alexandre Julliard : shell32: Remove the applet valid flag and improve the error handling.
by Alexandre Julliard June 6, 2012

June 6, 2012

Module: wine Branch: master Commit: 2729cc1b3d34387dcb8ae0ce2a7d6d9e9ac81b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2729cc1b3d34387dcb8ae0ce2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 6 11:46:20 2012 +0200 shell32: Remove the applet valid flag and improve the error handling. --- dlls/shell32/control.c | 44 +++++++++++++++++++------------------------- dlls/shell32/cpanel.h | 1 - 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index cb080d5..d8e4df1 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -49,10 +49,9 @@ void Control_UnloadApplet(CPlApplet* applet) { unsigned i; - for (i = 0; i < applet->count; i++) { - if (!applet->info[i].valid) continue; + for (i = 0; i < applet->count; i++) applet->proc(applet->hWnd, CPL_STOP, i, applet->info[i].data); - } + if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); FreeLibrary(applet->hModule); list_remove( &applet->entry ); @@ -70,6 +69,13 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) if (!(applet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*applet)))) return applet; + if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) { + WARN("Cannot allocate memory for applet path\n"); + goto theError; + } + + lstrcpyW(applet->cmd, cmd); + applet->hWnd = hWnd; if (!(applet->hModule = LoadLibraryW(cmd))) { @@ -86,23 +92,16 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) } if ((applet->count = applet->proc(hWnd, CPL_GETCOUNT, 0L, 0L)) == 0) { WARN("No subprogram in applet\n"); + applet->proc(applet->hWnd, CPL_EXIT, 0, 0); goto theError; } applet = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, applet, - sizeof(*applet) + (applet->count - 1) * sizeof(NEWCPLINFOW)); - - if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) { - WARN("Cannot allocate memory for applet path\n"); - goto theError; - } - - lstrcpyW(applet->cmd, cmd); + FIELD_OFFSET( CPlApplet, info[applet->count] )); for (i = 0; i < applet->count; i++) { ZeroMemory(&newinfo, sizeof(newinfo)); newinfo.dwSize = sizeof(NEWCPLINFOA); - applet->info[i].valid = TRUE; applet->info[i].helpfile[0] = 0; /* proc is supposed to return a null value upon success for * CPL_INQUIRE and CPL_NEWINQUIRE @@ -170,7 +169,9 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) return applet; theError: - Control_UnloadApplet(applet); + FreeLibrary(applet->hModule); + HeapFree(GetProcessHeap(), 0, applet->cmd); + HeapFree(GetProcessHeap(), 0, applet); return NULL; } @@ -277,9 +278,6 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) LIST_FOR_EACH_ENTRY( applet, &panel->applets, CPlApplet, entry ) { for (i = 0; i < applet->count; i++) { - if (!applet->info[i].valid) - continue; - /* set up a CPlItem for this particular subprogram */ item = HeapAlloc(GetProcessHeap(), 0, sizeof(CPlItem)); @@ -787,12 +785,10 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) /* we've been given a textual parameter (or none at all) */ if (sp == -1) { while ((++sp) != applet->count) { - if (applet->info[sp].valid) { - TRACE("sp %d, name %s\n", sp, debugstr_w(applet->info[sp].name)); + TRACE("sp %d, name %s\n", sp, debugstr_w(applet->info[sp].name)); - if (StrCmpIW(extraPmts, applet->info[sp].name) == 0) - break; - } + if (StrCmpIW(extraPmts, applet->info[sp].name) == 0) + break; } } @@ -801,10 +797,8 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) sp = 0; } - if (applet->info[sp].valid) { - if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) - applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].data); - } + if (!applet->proc(applet->hWnd, CPL_STARTWPARMSW, sp, (LPARAM)extraPmts)) + applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].data); Control_UnloadApplet(applet); } diff --git a/dlls/shell32/cpanel.h b/dlls/shell32/cpanel.h index 7974d06..285fa8e 100644 --- a/dlls/shell32/cpanel.h +++ b/dlls/shell32/cpanel.h @@ -26,7 +26,6 @@ struct applet_info { - BOOL valid; LONG_PTR data; HICON icon; WCHAR name[256];

1 0

Detlef Riekenberg : kernel32/tests: Remove debug code from GetProductInfo.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: 8c83c66bcb165cb44ec1a80d2940a939413394da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c83c66bcb165cb44ec1a80d2… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Jun 5 18:10:33 2012 +0200 kernel32/tests: Remove debug code from GetProductInfo. --- dlls/kernel32/tests/version.c | 29 ----------------------------- 1 files changed, 0 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index bb71cf8..265eae4 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -44,27 +44,8 @@ static void init_function_pointers(void) KERNEL32_GET_PROC(VerSetConditionMask); } -#define PRODUCT2NAME(x) case x:\ - return #x; - -static const char * product_to_name(DWORD product) -{ - switch (product) - { - PRODUCT2NAME(PRODUCT_PROFESSIONAL) - PRODUCT2NAME(PRODUCT_STANDARD_SERVER) - PRODUCT2NAME(PRODUCT_BUSINESS) - PRODUCT2NAME(PRODUCT_ULTIMATE) - PRODUCT2NAME(PRODUCT_ULTIMATE_N) - PRODUCT2NAME(PRODUCT_HOME_PREMIUM) - } - return ""; -} -#undef PRODUCT2NAME - static void test_GetProductInfo(void) { - OSVERSIONINFOEXA os; DWORD product; DWORD res; DWORD table[] = {9,8,7,6, @@ -94,22 +75,12 @@ static void test_GetProductInfo(void) return; } - memset(&os, 0, sizeof(OSVERSIONINFOEXA)); - os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); - res = GetVersionExA((OSVERSIONINFOA *)&os); - ok(res, "got %d (expected TRUE)\n", res); - - trace("%s %u.%u (SP: %u.%u)\n", os.wProductType == VER_NT_WORKSTATION ? "Workstation" : "Server", - os.dwMajorVersion, os.dwMinorVersion, os.wServicePackMajor, os.wServicePackMinor); - while (*entry) { /* SetLastError() / GetLastError(): value is untouched */ product = 0xdeadbeef; SetLastError(0xdeadbeef); res = pGetProductInfo(entry[0], entry[1], entry[2], entry[3], &product); - trace("%d.%d / %d.%d: got %d and 0x%x %s\n", - entry[0], entry[1], entry[2], entry[3], res, product, product_to_name(product)); if (entry[0] >= 6) ok(res && (product > PRODUCT_UNDEFINED) && (product <= PRODUCT_EMBEDDED) && (GetLastError() == 0xdeadbeef),

1 0

Lucas Zawacki : joy.cpl: Added joystick listing.
by Alexandre Julliard June 5, 2012

June 5, 2012

1 0

Alexandre Julliard : shell32: Use a default icon for control panels without one.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: c1e40a8bf49157020c6bc28c4f2ee0acb87bcaa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1e40a8bf49157020c6bc28c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 19:54:23 2012 +0200 shell32: Use a default icon for control panels without one. --- dlls/shell32/control.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 988f249..6237894 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -301,8 +301,10 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) if (InsertMenuItemW(hSubMenu, menucount, TRUE, &mii)) { /* add the list view item */ - index = ImageList_AddIcon(panel->hImageListLarge, applet->info[i].icon); - ImageList_AddIcon(panel->hImageListSmall, applet->info[i].icon); + HICON icon = applet->info[i].icon; + if (!icon) icon = LoadImageW( 0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, 0, 0, LR_SHARED ); + index = ImageList_AddIcon(panel->hImageListLarge, icon); + ImageList_AddIcon(panel->hImageListSmall, icon); lvItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM; lvItem.iItem = menucount;

1 0

Alexandre Julliard : shell32: Convert the control panel list to a standard list.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: 6f9f6b1aa6dc64bac9bf4e43b474c5d23a1c8539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9f6b1aa6dc64bac9bf4e43b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 5 19:55:27 2012 +0200 shell32: Convert the control panel list to a standard list. --- dlls/shell32/control.c | 31 +++++++++++++------------------ dlls/shell32/cpanel.h | 7 ++++--- dlls/shell32/cpanelfolder.c | 2 +- 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 6237894..cb080d5 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -45,10 +45,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shlctrl); -CPlApplet* Control_UnloadApplet(CPlApplet* applet) +void Control_UnloadApplet(CPlApplet* applet) { unsigned i; - CPlApplet* next; for (i = 0; i < applet->count; i++) { if (!applet->info[i].valid) continue; @@ -56,10 +55,9 @@ CPlApplet* Control_UnloadApplet(CPlApplet* applet) } if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); FreeLibrary(applet->hModule); - next = applet->next; + list_remove( &applet->entry ); HeapFree(GetProcessHeap(), 0, applet->cmd); HeapFree(GetProcessHeap(), 0, applet); - return next; } CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) @@ -168,9 +166,7 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) } } - applet->next = panel->first; - panel->first = applet; - + list_add_head( &panel->applets, &applet->entry ); return applet; theError: @@ -278,7 +274,8 @@ static void Control_WndProc_Create(HWND hWnd, const CREATESTRUCTW* cs) hSubMenu = GetSubMenu(hMenu, 0); menucount = 0; - for (applet = panel->first; applet; applet = applet->next) { + LIST_FOR_EACH_ENTRY( applet, &panel->applets, CPlApplet, entry ) + { for (i = 0; i < applet->count; i++) { if (!applet->info[i].valid) continue; @@ -450,9 +447,9 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, return 0; case WM_DESTROY: { - CPlApplet* applet = panel->first; - while (applet) - applet = Control_UnloadApplet(applet); + CPlApplet *applet, *next; + LIST_FOR_EACH_ENTRY_SAFE( applet, next, &panel->applets, CPlApplet, entry ) + Control_UnloadApplet(applet); } Control_FreeCPlItems(hWnd, panel); PostQuitMessage(0); @@ -717,6 +714,7 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) LPWSTR extraPmtsBuf = NULL; LPWSTR extraPmts = NULL; int quoted = 0; + CPlApplet *applet; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; @@ -783,13 +781,9 @@ static void Control_DoLaunch(CPanel* panel, HWND hWnd, LPCWSTR wszCmd) TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); - Control_LoadApplet(hWnd, buffer, panel); - - if (panel->first) { - CPlApplet* applet = panel->first; - - assert(applet && applet->next == NULL); - + applet = Control_LoadApplet(hWnd, buffer, panel); + if (applet) + { /* we've been given a textual parameter (or none at all) */ if (sp == -1) { while ((++sp) != applet->count) { @@ -830,6 +824,7 @@ void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdS hWnd, hInst, debugstr_w(cmd), nCmdShow); memset(&panel, 0, sizeof(panel)); + list_init( &panel.applets ); if (!cmd || !*cmd) { Control_DoWindow(&panel, hWnd, hInst); diff --git a/dlls/shell32/cpanel.h b/dlls/shell32/cpanel.h index 60dd719..7974d06 100644 --- a/dlls/shell32/cpanel.h +++ b/dlls/shell32/cpanel.h @@ -21,6 +21,7 @@ #ifndef __WINE_SHELL_CPANEL_H #define __WINE_SHELL_CPANEL_H +#include "wine/list.h" #include "cpl.h" struct applet_info @@ -34,7 +35,7 @@ struct applet_info }; typedef struct CPlApplet { - struct CPlApplet* next; /* linked list */ + struct list entry; HWND hWnd; LPWSTR cmd; /* path to applet */ unsigned count; /* number of subprograms */ @@ -44,7 +45,7 @@ typedef struct CPlApplet { } CPlApplet; typedef struct CPanel { - CPlApplet* first; + struct list applets; HWND hWnd; HINSTANCE hInst; unsigned total_subprogs; @@ -61,6 +62,6 @@ typedef struct CPlItem { } CPlItem; CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) DECLSPEC_HIDDEN; -CPlApplet* Control_UnloadApplet(CPlApplet* applet) DECLSPEC_HIDDEN; +void Control_UnloadApplet(CPlApplet* applet) DECLSPEC_HIDDEN; #endif /* __WINE_SHELL_CPANEL_H */ diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 1229e47..ff862ce 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -302,7 +302,7 @@ static BOOL SHELL_RegisterCPanelApp(IEnumIDListImpl *list, LPCSTR path) MultiByteToWideChar(CP_ACP, 0, path, -1, wpath, MAX_PATH); - panel.first = NULL; + list_init( &panel.applets ); applet = Control_LoadApplet(0, wpath, &panel); if (applet)

1 0

Lucas Zawacki : joy.cpl: First version of the joystick configuration applet .
by Alexandre Julliard June 5, 2012

June 5, 2012

1 0

Józef Kucia : windowscodecs/tests: Fix the expected values in some ok() messages.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: cc547444dfe8a8b1598cbfa1b0d8d360553621e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc547444dfe8a8b1598cbfa1b… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 5 13:21:12 2012 +0200 windowscodecs/tests: Fix the expected values in some ok() messages. --- dlls/windowscodecs/tests/stream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 0dbcddf..a3295e6 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -160,7 +160,7 @@ static void test_StreamOnMemory(void) hr = IWICStream_Read(pStream, MemBuf, 12, &uBytesRead); ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); if(SUCCEEDED(hr)) { - ok(uBytesRead == 12, "Read %u bytes, expected %u\n", uBytesRead, 3); + ok(uBytesRead == 12, "Read %u bytes, expected %u\n", uBytesRead, 12); ok(memcmp(MemBuf, CmpMem, 12) == 0, "Read returned invalid data!\n"); /* check whether the seek pointer has moved correctly */ @@ -506,7 +506,7 @@ static void test_StreamOnStreamRange(void) hr = IWICStream_Read(pSubStream, MemBuf, 12, &uBytesRead); ok(hr == S_OK, "Read returned with %#x, expected %#x\n", hr, S_OK); if(SUCCEEDED(hr)) { - ok(uBytesRead == 12, "Read %u bytes, expected %u\n", uBytesRead, 3); + ok(uBytesRead == 12, "Read %u bytes, expected %u\n", uBytesRead, 12); ok(memcmp(MemBuf, CmpMem+20, 12) == 0, "Read returned invalid data!\n"); /* check whether the seek pointer has moved correctly */

1 0

Christian Costa : d3drm: Implement IDirect3DRMMesh_GetGroupColor.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: ab8619e92063729e16835e46e5c15e5b4e20ef4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8619e92063729e16835e46e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 4 19:30:41 2012 +0200 d3drm: Implement IDirect3DRMMesh_GetGroupColor. --- dlls/d3drm/meshbuilder.c | 5 +++-- dlls/d3drm/tests/d3drm.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c14dee0..c46b1a0 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -43,6 +43,7 @@ typedef struct { unsigned vertex_per_face; DWORD face_data_size; unsigned* face_data; + D3DCOLOR color; IDirect3DRMMaterial2* material; IDirect3DRMTexture3* texture; } mesh_group; @@ -2750,9 +2751,9 @@ static D3DCOLOR WINAPI IDirect3DRMMeshImpl_GetGroupColor(IDirect3DRMMesh* iface, { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u): stub\n", This, id); + TRACE("(%p)->(%u)\n", This, id); - return 0; + return This->groups[id].color; } static D3DRMMAPPING WINAPI IDirect3DRMMeshImpl_GetGroupMapping(IDirect3DRMMesh* iface, D3DRMGROUPINDEX id) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0cc9c83..54a356a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -189,6 +189,7 @@ static void test_MeshBuilder(void) DWORD f[8]; char name[10]; DWORD size; + D3DCOLOR color; hr = pDirect3DRMCreate(&pD3DRM); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -367,6 +368,8 @@ static void test_MeshBuilder(void) ok(nb_faces == 1, "Wrong number of faces %u (must be 1)\n", nb_faces); todo_wine ok(nb_face_vertices == 3, "Wrong number of vertices per face %u (must be 3)\n", nb_face_vertices); todo_wine ok(data_size == 3, "Wrong number of face data bytes %u (must be 3)\n", data_size); + color = IDirect3DRMMesh_GetGroupColor(mesh, 0); + todo_wine ok(color == 0xff00ff00, "Wrong color returned %#x instead of %#x\n", color, 0xff00ff00); hr = IDirect3DRMMesh_GetGroupTexture(mesh, 0, &texture); ok(hr == D3DRM_OK, "GetCroupTexture failed returning hr = %x\n", hr); ok(texture == NULL, "No texture should be present\n");

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshBuilderX_SetColor and IDirect3DRMMeshBuilderX_SetColorRGB .
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: 08cfdc1191f50d3e9a1464d6193c4fef995d22e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08cfdc1191f50d3e9a1464d61… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jun 4 19:30:33 2012 +0200 d3drm: Implement IDirect3DRMMeshBuilderX_SetColor and IDirect3DRMMeshBuilderX_SetColorRGB. --- dlls/d3drm/d3drm_private.h | 2 ++ dlls/d3drm/light.c | 2 -- dlls/d3drm/meshbuilder.c | 23 +++++++++++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 3a8982d..939304c 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -24,6 +24,8 @@ #include "d3drm.h" #include "dxfile.h" +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) + HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 1326b6a..12c8623 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) - typedef struct { IDirect3DRMLight IDirect3DRMLight_iface; LONG ref; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 3a6890c..c14dee0 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -74,6 +74,7 @@ typedef struct { LPVOID pFaceData; DWORD nb_coords2d; Coords2d* pCoords2d; + D3DCOLOR color; IDirect3DRMMaterial2* material; } IDirect3DRMMeshBuilderImpl; @@ -615,9 +616,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetColorRGB(IDirect3DRMMeshBui { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%f,%f,%f): stub\n", This, red, green, blue); + TRACE("(%p)->(%f,%f,%f)\n", This, red, green, blue); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_SetColorRGB(&This->IDirect3DRMMeshBuilder3_iface, red, green, blue); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetColor(IDirect3DRMMeshBuilder2* iface, @@ -625,9 +626,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetColor(IDirect3DRMMeshBuilde { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%x): stub\n", This, color); + TRACE("(%p)->(%x)\n", This, color); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_SetColor(&This->IDirect3DRMMeshBuilder3_iface, color); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTexture(IDirect3DRMMeshBuilder2* iface, @@ -1702,9 +1703,13 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetColorRGB(IDirect3DRMMeshBui { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%f,%f,%f): stub\n", This, red, green, blue); + TRACE("(%p)->(%f,%f,%f)\n", This, red, green, blue); - return E_NOTIMPL; + This->color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), + (BYTE)(green * 255.0f), + (BYTE)(blue * 255.0f)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetColor(IDirect3DRMMeshBuilder3* iface, @@ -1712,9 +1717,11 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetColor(IDirect3DRMMeshBuilde { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%x): stub\n", This, color); + TRACE("(%p)->(%x)\n", This, color); - return E_NOTIMPL; + This->color = color; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetTexture(IDirect3DRMMeshBuilder3* iface,

1 0

Aric Stewart : usp10: Correct glyph caching beyond the BMP.
by Alexandre Julliard June 5, 2012

June 5, 2012

Module: wine Branch: master Commit: 7fbf72c40083f7f97a12e60de247d94b635f400d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbf72c40083f7f97a12e60de… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 4 11:14:27 2012 -0500 usp10: Correct glyph caching beyond the BMP. --- dlls/usp10/usp10.c | 23 ++++++++++++++++++----- dlls/usp10/usp10_internal.h | 6 +++++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ff842b0..8942a42 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -746,18 +746,24 @@ static inline BYTE get_cache_pitch_family(SCRIPT_CACHE *psc) static inline WORD get_cache_glyph(SCRIPT_CACHE *psc, DWORD c) { - WORD *block = ((ScriptCache *)*psc)->glyphs[c >> GLYPH_BLOCK_SHIFT]; + CacheGlyphPage *page = ((ScriptCache *)*psc)->page[c / 0x10000]; + WORD *block; + if (!page) return 0; + block = page->glyphs[(c % 0x10000) >> GLYPH_BLOCK_SHIFT]; if (!block) return 0; - return block[c & GLYPH_BLOCK_MASK]; + return block[(c % 0x10000) & GLYPH_BLOCK_MASK]; } static inline WORD set_cache_glyph(SCRIPT_CACHE *psc, WCHAR c, WORD glyph) { - WORD **block = &((ScriptCache *)*psc)->glyphs[c >> GLYPH_BLOCK_SHIFT]; + CacheGlyphPage **page = &((ScriptCache *)*psc)->page[c / 0x10000]; + WORD **block; + if (!*page && !(*page = heap_alloc_zero(sizeof(CacheGlyphPage)))) return 0; + block = &(*page)->glyphs[(c % 0x10000) >> GLYPH_BLOCK_SHIFT]; if (!*block && !(*block = heap_alloc_zero(sizeof(WORD) * GLYPH_BLOCK_SIZE))) return 0; - return ((*block)[c & GLYPH_BLOCK_MASK] = glyph); + return ((*block)[(c % 0x10000) & GLYPH_BLOCK_MASK] = glyph); } static inline BOOL get_cache_glyph_widths(SCRIPT_CACHE *psc, WORD glyph, ABC *abc) @@ -965,9 +971,16 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) unsigned int i; for (i = 0; i < GLYPH_MAX / GLYPH_BLOCK_SIZE; i++) { - heap_free(((ScriptCache *)*psc)->glyphs[i]); heap_free(((ScriptCache *)*psc)->widths[i]); } + for (i = 0; i < 0x10; i++) + { + int j; + if (((ScriptCache *)*psc)->page[i]) + for (j = 0; j < GLYPH_MAX / GLYPH_BLOCK_SIZE; j++) + heap_free(((ScriptCache *)*psc)->page[i]->glyphs[j]); + heap_free(((ScriptCache *)*psc)->page[i]); + } heap_free(((ScriptCache *)*psc)->GSUB_Table); heap_free(((ScriptCache *)*psc)->GDEF_Table); heap_free(((ScriptCache *)*psc)->CMAP_Table); diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 558eb55..013e383 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -151,10 +151,14 @@ typedef struct { } LoadedScript; typedef struct { + WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; +} CacheGlyphPage; + +typedef struct { LOGFONTW lf; TEXTMETRICW tm; BOOL sfnt; - WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; + CacheGlyphPage *page[0x10]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table; LPVOID GDEF_Table;

1 0