September 2011 - Wine-commits

Stefan Dösinger : d3d9/tests: Add a slop to the fog tests for X1600 GPUs.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 6bf2eb76bb1f9c9bc7ea52079ec3e274d1bb0ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf2eb76bb1f9c9bc7ea52079… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 22:25:44 2011 +0200 d3d9/tests: Add a slop to the fog tests for X1600 GPUs. --- dlls/d3d9/tests/visual.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fd7f387..972f8d6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1231,9 +1231,11 @@ static void fog_test(IDirect3DDevice9 *device) } color = getPixelColor(device, 160, 360); - ok(color_match(color, 0x00ff0000, 4), "Unfogged quad has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00), 4), + "Unfogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Fogged out quad has color %08x\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); @@ -1270,7 +1272,8 @@ static void fog_test(IDirect3DDevice9 *device) color = getPixelColor(device, 160, 360); todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Fogged out quad has color %08x\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); @@ -1357,13 +1360,17 @@ static void fog_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); } color = getPixelColor(device, 10, 10); - ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Rangefog with vertex fog returned color 0x%08x\n", color); color = getPixelColor(device, 630, 10); - ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Rangefog with vertex fog returned color 0x%08x\n", color); color = getPixelColor(device, 10, 470); - ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Rangefog with vertex fog returned color 0x%08x\n", color); color = getPixelColor(device, 630, 470); - ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Rangefog with vertex fog returned color 0x%08x\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed, hr %#x.\n", hr);

1 0

Stefan Dösinger : d3d9/Tests: State getters don' t work with PUREDEVICEs.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 7759729fc70edca0770d39f0624c9243a60e84ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=7759729fc70edca0770d39f06… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 22:56:08 2011 +0200 d3d9/Tests: State getters don't work with PUREDEVICEs. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1e1527a..625dce9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2004,7 +2004,7 @@ static void test_lights(void) present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &present_parameters, &device ); + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device ); ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, "IDirect3D9_CreateDevice failed with %08x\n", hr); if(!device)

1 0

Stefan Dösinger : d3d8/test: Add slop to some fog tests.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 8b57a585ad3afd3a8ea79eeb0cc19f84c74b5537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b57a585ad3afd3a8ea79eeb0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 23:01:44 2011 +0200 d3d8/test: Add slop to some fog tests. --- dlls/d3d8/tests/visual.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 33e9841..e90553a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -509,13 +509,17 @@ static void fog_test(IDirect3DDevice8 *device) } color = getPixelColor(device, 160, 360); - ok(color == 0x00FF0000, "Untransformed vertex with no table or vertex fog has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xFF, 0x00, 0x00), 1), + "Untransformed vertex with no table or vertex fog has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000FF00, "Untransformed vertex with linear vertex fog has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xFF, 0x00), 1), + "Untransformed vertex with linear vertex fog has color %08x\n", color); color = getPixelColor(device, 480, 120); - ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xFF, 0xFF, 0x00), 1), + "Transformed vertex with linear vertex fog has color %08x\n", color); color = getPixelColor(device, 480, 360); - ok(color == 0x0000FF00, "Transformed vertex with linear table fog has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xFF, 0x00), 1), + "Transformed vertex with linear table fog has color %08x\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); @@ -557,7 +561,8 @@ static void fog_test(IDirect3DDevice8 *device) color = getPixelColor(device, 160, 360); ok(color_match(color, 0x00ff0000, 4), "Unfogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Fogged out quad has color %08x\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); @@ -594,7 +599,8 @@ static void fog_test(IDirect3DDevice8 *device) color = getPixelColor(device, 160, 360); todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 1), + "Fogged out quad has color %08x\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL);

1 0

Stefan Dösinger : d3d8/tests: State getters don' t work with PUREDEVICEs.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: c7b509b16c4b869024b371647865255eb883c1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b509b16c4b869024b371647… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 23:02:08 2011 +0200 d3d8/tests: State getters don't work with PUREDEVICEs. --- dlls/d3d8/tests/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index aeed57f..524ce2b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1726,7 +1726,7 @@ static void test_lights(void) d3dpp.AutoDepthStencilFormat = D3DFMT_D16; hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device ); + D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp, &device ); ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %08x\n", hr); if(!device) @@ -2525,7 +2525,7 @@ static void test_ApplyStateBlock(void) d3dpp.AutoDepthStencilFormat = D3DFMT_D16; hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device ); + D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp, &device ); ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %#x\n", hr); if(!device)

1 0

Stefan Dösinger : ddraw/tests: Add some slop to the fog tests.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: eac78fd488bfe928d16e4d2573da1f3a43562bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=eac78fd488bfe928d16e4d257… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 23:12:09 2011 +0200 ddraw/tests: Add some slop to the fog tests. --- dlls/ddraw/tests/visual.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 3cb698f..96c940f 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -586,15 +586,15 @@ static void fog_test(IDirect3DDevice7 *device) } color = getPixelColor(device, 160, 360); - ok(color == 0x00FF0000, "Untransformed vertex with no table or vertex fog has color %08x\n", color); + ok(color_match(color, 0x00FF0000, 1), "Untransformed vertex with no table or vertex fog has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000FF00, "Untransformed vertex with linear vertex fog has color %08x\n", color); + ok(color_match(color, 0x0000FF00, 1), "Untransformed vertex with linear vertex fog has color %08x\n", color); color = getPixelColor(device, 480, 120); - ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); + ok(color_match(color, 0x00FFFF00, 1), "Transformed vertex with linear vertex fog has color %08x\n", color); if(caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE) { color = getPixelColor(device, 480, 360); - ok(color == 0x0000FF00, "Transformed vertex with linear table fog has color %08x\n", color); + ok(color_match(color, 0x0000FF00, 1), "Transformed vertex with linear table fog has color %08x\n", color); } else { @@ -641,7 +641,7 @@ static void fog_test(IDirect3DDevice7 *device) color = getPixelColor(device, 160, 360); ok(color_match(color, 0x00ff0000, 4), "Unfogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, 0x0000ff00, 1), "Fogged out quad has color %08x\n", color); /* Test fog behavior with an orthogonal (but not identity) projection matrix */ hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)world_mat2); @@ -673,7 +673,7 @@ static void fog_test(IDirect3DDevice7 *device) color = getPixelColor(device, 160, 360); todo_wine ok(color_match(color, 0x00e51900, 4), "Partially fogged quad has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000ff00, "Fogged out quad has color %08x\n", color); + ok(color_match(color, 0x0000ff00, 1), "Fogged out quad has color %08x\n", color); hr = IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_WORLD, (D3DMATRIX *)ident_mat); ok(hr == D3D_OK, "SetTransform returned %#08x\n", hr);

1 0

Francois Gouget : pdh: Add more Pdh macros and prototypes to the headers.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: fe9b079286476d436e985902d9e6565a10f08674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9b079286476d436e985902d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:00:00 2011 +0200 pdh: Add more Pdh macros and prototypes to the headers. --- include/pdh.h | 28 ++++++++++++++++++++ include/pdhmsg.h | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 6 ++++ include/winperf.h | 5 +++ 4 files changed, 111 insertions(+), 0 deletions(-) diff --git a/include/pdh.h b/include/pdh.h index 7f3d334..30591ac 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -37,6 +37,10 @@ typedef HANDLE PDH_HQUERY; typedef HANDLE PDH_HCOUNTER; typedef HANDLE PDH_HLOG; +typedef PDH_HCOUNTER HCOUNTER; +typedef PDH_HQUERY HQUERY; +typedef PDH_HLOG HLOG; + #define PDH_CVERSION_WIN40 0x0400 #define PDH_CVERSION_WIN50 0x0500 #define PDH_VERSION 0x0503 @@ -57,6 +61,16 @@ typedef HANDLE PDH_HLOG; #define DATA_SOURCE_LOGFILE 0x00000002 #define DATA_SOURCE_WBEM 0x00000004 +#ifdef WINE_NO_UNICODE_MACROS +# define DECL_PDH_TYPE_AW(name) /* nothing */ +#else /* WINE_NO_UNICODE_MACROS */ +# ifdef UNICODE +# define DECL_PDH_TYPE_AW(name) typedef name##_W name; +# else +# define DECL_PDH_TYPE_AW(name) typedef name##_A name; +# endif +#endif /* WINE_NO_UNICODE_MACROS */ + typedef struct _PDH_FMT_COUNTERVALUE { DWORD CStatus; @@ -99,6 +113,9 @@ typedef struct _PDH_COUNTER_PATH_ELEMENTS_W LPWSTR szCounterName; } PDH_COUNTER_PATH_ELEMENTS_W, *PPDH_COUNTER_PATH_ELEMENTS_W; +DECL_PDH_TYPE_AW(PDH_COUNTER_PATH_ELEMENTS) +DECL_PDH_TYPE_AW(PPDH_COUNTER_PATH_ELEMENTS) + typedef struct _PDH_DATA_ITEM_PATH_ELEMENTS_A { LPSTR szMachineName; @@ -115,6 +132,9 @@ typedef struct _PDH_DATA_ITEM_PATH_ELEMENTS_W LPWSTR szInstanceName; } PDH_DATA_ITEM_PATH_ELEMENTS_W, *PPDH_DATA_ITEM_PATH_ELEMENTS_W; +DECL_PDH_TYPE_AW(PDH_DATA_ITEM_PATH_ELEMENTS) +DECL_PDH_TYPE_AW(PPDH_DATA_ITEM_PATH_ELEMENTS) + typedef struct _PDH_COUNTER_INFO_A { DWORD dwLength; @@ -173,6 +193,11 @@ typedef struct _PDH_COUNTER_INFO_W DWORD DataBuffer[1]; } PDH_COUNTER_INFO_W, *PPDH_COUNTER_INFO_W; +DECL_PDH_TYPE_AW(PDH_COUNTER_INFO) +DECL_PDH_TYPE_AW(PPDH_COUNTER_INFO) + +#undef DECL_PDH_TYPE_AW + PDH_STATUS WINAPI PdhAddCounterA(PDH_HQUERY, LPCSTR, DWORD_PTR, PDH_HCOUNTER *); PDH_STATUS WINAPI PdhAddCounterW(PDH_HQUERY, LPCWSTR, DWORD_PTR, PDH_HCOUNTER *); #define PdhAddCounter WINELIB_NAME_AW(PdhAddCounter) @@ -183,6 +208,9 @@ PDH_STATUS WINAPI PdhCloseQuery(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryData(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryDataEx(PDH_HQUERY, DWORD, HANDLE); PDH_STATUS WINAPI PdhCollectQueryDataWithTime(PDH_HQUERY,LONGLONG *); +PDH_STATUS WINAPI PdhEnumObjectsA(LPCSTR,LPCSTR,PZZSTR,LPDWORD,DWORD,BOOL); +PDH_STATUS WINAPI PdhEnumObjectsW(LPCWSTR,LPCWSTR,PZZWSTR,LPDWORD,DWORD,BOOL); +#define PdhEnumObjects WINELIB_NAME_AW(PdhEnumObjects) PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR, LPCSTR, LPCSTR, LPSTR, LPDWORD, LPSTR, LPDWORD, DWORD, DWORD); PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR, LPCWSTR, LPCWSTR, LPWSTR, LPDWORD, LPWSTR, LPDWORD, DWORD, DWORD); #define PdhEnumObjectItems WINELIB_NAME_AW(PdhEnumObjectItems) diff --git a/include/pdhmsg.h b/include/pdhmsg.h index f5bcbb3..bb7534a 100644 --- a/include/pdhmsg.h +++ b/include/pdhmsg.h @@ -22,18 +22,90 @@ #define _PDH_MSG_H_ #define PDH_CSTATUS_VALID_DATA 0x00000000 +#define PDH_CSTATUS_NEW_DATA 0x00000001 #define PDH_CSTATUS_NO_MACHINE 0x800007d0 +#define PDH_CSTATUS_NO_INSTANCE 0x800007d1 #define PDH_MORE_DATA 0x800007d2 +#define PDH_CSTATUS_ITEM_NOT_VALIDATED 0x800007d3 +#define PDH_RETRY 0x800007d4 #define PDH_NO_DATA 0x800007d5 +#define PDH_CALC_NEGATIVE_DENOMINATOR 0x800007d6 +#define PDH_CALC_NEGATIVE_TIMEBASE 0x800007d7 +#define PDH_CALC_NEGATIVE_VALUE 0x800007d8 +#define PDH_DIALOG_CANCELLED 0x800007d9 +#define PDH_END_OF_LOG_FILE 0x800007da +#define PDH_ASYNC_QUERY_TIMEOUT 0x800007db +#define PDH_CANNOT_SET_DEFAULT_REALTIME_DATASOURCE 0x800007dc +#define PDH_UNABLE_MAP_NAME_FILES 0x80000bd5 +#define PDH_PLA_VALIDATION_WARNING 0x80000bf3 #define PDH_CSTATUS_NO_OBJECT 0xc0000bb8 #define PDH_CSTATUS_NO_COUNTER 0xc0000bb9 +#define PDH_CSTATUS_INVALID_DATA 0xc0000bba #define PDH_MEMORY_ALLOCATION_FAILURE 0xc0000bbb #define PDH_INVALID_HANDLE 0xc0000bbc #define PDH_INVALID_ARGUMENT 0xc0000bbd +#define PDH_FUNCTION_NOT_FOUND 0xc0000bbe +#define PDH_CSTATUS_NO_COUNTERNAME 0xc0000bbf #define PDH_CSTATUS_BAD_COUNTERNAME 0xc0000bc0 +#define PDH_INVALID_BUFFER 0xc0000bc1 #define PDH_INSUFFICIENT_BUFFER 0xc0000bc2 +#define PDH_CANNOT_CONNECT_MACHINE 0xc0000bc3 +#define PDH_INVALID_PATH 0xc0000bc4 +#define PDH_INVALID_INSTANCE 0xc0000bc5 #define PDH_INVALID_DATA 0xc0000bc6 +#define PDH_NO_DIALOG_DATA 0xc0000bc7 +#define PDH_CANNOT_READ_NAME_STRINGS 0xc0000bc8 +#define PDH_LOG_FILE_CREATE_ERROR 0xc0000bc9 +#define PDH_LOG_FILE_OPEN_ERROR 0xc0000bca +#define PDH_LOG_TYPE_NOT_FOUND 0xc0000bcb +#define PDH_NO_MORE_DATA 0xc0000bcc +#define PDH_ENTRY_NOT_IN_LOG_FILE 0xc0000bcd +#define PDH_DATA_SOURCE_IS_LOG_FILE 0xc0000bce +#define PDH_DATA_SOURCE_IS_REAL_TIME 0xc0000bcf +#define PDH_UNABLE_READ_LOG_HEADER 0xc0000bd0 +#define PDH_FILE_NOT_FOUND 0xc0000bd1 +#define PDH_FILE_ALREADY_EXISTS 0xc0000bd2 #define PDH_NOT_IMPLEMENTED 0xc0000bd3 #define PDH_STRING_NOT_FOUND 0xc0000bd4 +#define PDH_UNKNOWN_LOG_FORMAT 0xc0000bd6 +#define PDH_UNKNOWN_LOGSVC_COMMAND 0xc0000bd7 +#define PDH_LOGSVC_QUERY_NOT_FOUND 0xc0000bd8 +#define PDH_LOGSVC_NOT_OPENED 0xc0000bd9 +#define PDH_WBEM_ERROR 0xc0000bda +#define PDH_ACCESS_DENIED 0xc0000bdb +#define PDH_LOG_FILE_TOO_SMALL 0xc0000bdc +#define PDH_INVALID_DATASOURCE 0xc0000bdd +#define PDH_INVALID_SQLDB 0xc0000bde +#define PDH_NO_COUNTERS 0xc0000bdf +#define PDH_SQL_ALLOC_FAILED 0xc0000be0 +#define PDH_SQL_ALLOCCON_FAILED 0xc0000be1 +#define PDH_SQL_EXEC_DIRECT_FAILED 0xc0000be2 +#define PDH_SQL_FETCH_FAILED 0xc0000be3 +#define PDH_SQL_ROWCOUNT_FAILED 0xc0000be4 +#define PDH_SQL_MORE_RESULTS_FAILED 0xc0000be5 +#define PDH_SQL_CONNECT_FAILED 0xc0000be6 +#define PDH_SQL_BIND_FAILED 0xc0000be7 +#define PDH_CANNOT_CONNECT_WMI_SERVER 0xc0000be8 +#define PDH_PLA_COLLECTION_ALREADY_RUNNING 0xc0000be9 +#define PDH_PLA_ERROR_SCHEDULE_OVERLAP 0xc0000bea +#define PDH_PLA_COLLECTION_NOT_FOUND 0xc0000beb +#define PDH_PLA_ERROR_SCHEDULE_ELAPSED 0xc0000bec +#define PDH_PLA_ERROR_NOSTART 0xc0000bed +#define PDH_PLA_ERROR_ALREADY_EXISTS 0xc0000bee +#define PDH_PLA_ERROR_TYPE_MISMATCH 0xc0000bef +#define PDH_PLA_ERROR_FILEPATH 0xc0000bf0 +#define PDH_PLA_SERVICE_ERROR 0xc0000bf1 +#define PDH_PLA_VALIDATION_ERROR 0xc0000bf2 +#define PDH_PLA_ERROR_NAME_TOO_LONG 0xc0000bf4 +#define PDH_INVALID_SQL_LOG_FORMAT 0xc0000bf5 +#define PDH_COUNTER_ALREADY_IN_QUERY 0xc0000bf6 +#define PDH_BINARY_LOG_CORRUPT 0xc0000bf7 +#define PDH_LOG_SAMPLE_TOO_SMALL 0xc0000bf8 +#define PDH_OS_LATER_VERSION 0xc0000bf9 +#define PDH_OS_EARLIER_VERSION 0xc0000bfa +#define PDH_INCORRECT_APPEND_TIME 0xc0000bfb +#define PDH_UNMATCHED_APPEND_COUNTER 0xc0000bfc +#define PDH_SQL_ALTER_DETAIL_FAILED 0xc0000bfd +#define PDH_QUERY_PERF_DATA_TIMEOUT 0xc0000bfe #endif /* _PDH_MSG_H_ */ diff --git a/include/winnt.h b/include/winnt.h index 8ff6a7f..f8adbcb 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -431,6 +431,8 @@ typedef CHAR *PCH, *LPCH; typedef const CHAR *PCCH, *LPCCH; typedef CHAR *PSTR, *LPSTR, *NPSTR; typedef const CHAR *PCSTR, *LPCSTR; +typedef CHAR *PZZSTR; +typedef const CHAR *PCZZSTR; /* Unicode string types */ typedef WCHAR *PWCH, *LPWCH; @@ -453,6 +455,8 @@ typedef WCHAR TCHAR, *PTCHAR; #endif typedef LPWSTR PTSTR, LPTSTR; typedef LPCWSTR PCTSTR, LPCTSTR; +typedef PZZSTR PZZTSTR; +typedef PCZZSTR PCZZTSTR; # define __TEXT(string) L##string # else /* UNICODE */ # ifndef _TCHAR_DEFINED @@ -461,6 +465,8 @@ typedef CHAR TCHAR, *PTCHAR; # endif typedef LPSTR PTSTR, LPTSTR; typedef LPCSTR PCTSTR, LPCTSTR; +typedef PZZWSTR PZZTSTR; +typedef PCZZWSTR PCZZTSTR; # define __TEXT(string) string # endif /* UNICODE */ # define TEXT(quote) __TEXT(quote) diff --git a/include/winperf.h b/include/winperf.h index eb68ac3..b62f24b 100644 --- a/include/winperf.h +++ b/include/winperf.h @@ -62,4 +62,9 @@ #define PERF_DISPLAY_SECONDS 0x30000000 #define PERF_DISPLAY_NOSHOW 0x40000000 +#define PERF_DETAIL_NOVICE 100 +#define PERF_DETAIL_ADVANCED 200 +#define PERF_DETAIL_EXPERT 300 +#define PERF_DETAIL_WIZARD 400 + #endif /* _WINPERF_ */

1 0

Francois Gouget : pdh/tests: Rename a counter to make the purpose of the test immediately clear.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 4c531edfd2d7e5fdd9faec5edae0fdfe4c9a9724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c531edfd2d7e5fdd9faec5ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:01:27 2011 +0200 pdh/tests: Rename a counter to make the purpose of the test immediately clear. --- dlls/pdh/tests/pdh.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 094ad74..5ca1c24 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -54,7 +54,7 @@ static const WCHAR uptime[] = static const WCHAR system_uptime[] = {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; -static const WCHAR system_downtime[] = /* does not exist */ +static const WCHAR nonexistent_counter[] = {'\\','S','y','s','t','e','m','\\','S','y','s','t','e','m',' ','D','o','w','n',' ','T','i','m','e',0}; static const WCHAR percentage_processor_time[] = {'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')', @@ -129,7 +129,7 @@ static void test_PdhAddCounterA( void ) ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterA failed 0x%08x\n", ret); - ret = PdhAddCounterA( query, "\\System\\System Down Time", 0, &counter ); + ret = PdhAddCounterA( query, "\\System\\Nonexistent Counter", 0, &counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterA failed 0x%08x\n", ret); ok(!counter, "PdhAddCounterA failed %p\n", counter); @@ -176,7 +176,7 @@ static void test_PdhAddCounterW( void ) ret = PdhAddCounterW( query, percentage_processor_time, 0, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret); - ret = PdhAddCounterW( query, system_downtime, 0, &counter ); + ret = PdhAddCounterW( query, nonexistent_counter, 0, &counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterW failed 0x%08x\n", ret); ok(!counter, "PdhAddCounterW failed %p\n", counter); @@ -267,7 +267,7 @@ static void test_PdhAddEnglishCounterW( void ) ret = pPdhAddEnglishCounterW( query, system_uptime, 0, NULL ); ok(ret == PDH_INVALID_ARGUMENT, "PdhAddEnglishCounterW failed 0x%08x\n", ret); - ret = pPdhAddEnglishCounterW( query, system_downtime, 0, &counter ); + ret = pPdhAddEnglishCounterW( query, nonexistent_counter, 0, &counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddEnglishCounterW failed 0x%08x\n", ret); ok(!counter, "PdhAddEnglishCounterA failed %p\n", counter); @@ -705,7 +705,7 @@ static void test_PdhValidatePathA( void ) ret = PdhValidatePathA( "System Up Time" ); ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathA failed 0x%08x\n", ret); - ret = PdhValidatePathA( "\\System\\System Down Time" ); + ret = PdhValidatePathA( "\\System\\Nonexistent Counter" ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathA failed 0x%08x\n", ret); ret = PdhValidatePathA( "\\System\\System Up Time" ); @@ -731,7 +731,7 @@ static void test_PdhValidatePathW( void ) ret = PdhValidatePathW( uptime ); ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathW failed 0x%08x\n", ret); - ret = PdhValidatePathW( system_downtime ); + ret = PdhValidatePathW( nonexistent_counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathW failed 0x%08x\n", ret); ret = PdhValidatePathW( system_uptime ); @@ -780,7 +780,7 @@ static void test_PdhValidatePathExW( void ) ret = pPdhValidatePathExW( NULL, uptime ); ok(ret == PDH_CSTATUS_BAD_COUNTERNAME, "PdhValidatePathExW failed 0x%08x\n", ret); - ret = pPdhValidatePathExW( NULL, system_downtime ); + ret = pPdhValidatePathExW( NULL, nonexistent_counter ); ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhValidatePathExW failed 0x%08x\n", ret); ret = pPdhValidatePathExW( NULL, system_uptime );

1 0

Francois Gouget : pdh/tests: Make the test pass on Windows 2000.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 770537011a0ecd6a22b56dc1042c3d7266198c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=770537011a0ecd6a22b56dc10… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:04:03 2011 +0200 pdh/tests: Make the test pass on Windows 2000. --- dlls/pdh/tests/pdh.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 5ca1c24..f6fac16 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -130,7 +130,9 @@ static void test_PdhAddCounterA( void ) ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterA failed 0x%08x\n", ret); ret = PdhAddCounterA( query, "\\System\\Nonexistent Counter", 0, &counter ); - ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterA failed 0x%08x\n", ret); + ok(ret == PDH_CSTATUS_NO_COUNTER || + broken(ret == PDH_INVALID_PATH), /* Win2K */ + "PdhAddCounterA failed 0x%08x\n", ret); ok(!counter, "PdhAddCounterA failed %p\n", counter); ret = PdhAddCounterA( query, "\\System\\System Up Time", 0, &counter ); @@ -177,7 +179,9 @@ static void test_PdhAddCounterW( void ) ok(ret == PDH_INVALID_ARGUMENT, "PdhAddCounterW failed 0x%08x\n", ret); ret = PdhAddCounterW( query, nonexistent_counter, 0, &counter ); - ok(ret == PDH_CSTATUS_NO_COUNTER, "PdhAddCounterW failed 0x%08x\n", ret); + ok(ret == PDH_CSTATUS_NO_COUNTER || + broken(ret == PDH_INVALID_PATH), /* Win2K */ + "PdhAddCounterW failed 0x%08x\n", ret); ok(!counter, "PdhAddCounterW failed %p\n", counter); ret = PdhAddCounterW( query, percentage_processor_time, 0, &counter );

1 0

Francois Gouget : pdh/tests: Some tests require that the user interface be in English.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 25088379d9f3506fda32833945423407f581d29b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25088379d9f3506fda3283394… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 16 01:05:20 2011 +0200 pdh/tests: Some tests require that the user interface be in English. --- dlls/pdh/tests/pdh.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index f6fac16..9690020 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -37,6 +37,30 @@ static PDH_STATUS (WINAPI *pPdhValidatePathExW)(PDH_HLOG, LPCWSTR); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( pdh, #func ); + +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static void init_function_ptrs( void ) { pdh = GetModuleHandle( "pdh" ); @@ -962,9 +986,9 @@ static void test_PdhGetDllVersion(void) START_TEST(pdh) { - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + if (!is_lang_english()) { - skip("non-english locale\n"); + skip("An English UI is needed for the pdh tests\n"); return; } init_function_ptrs();

1 0

Alexandre Julliard : winex11: Implement the CreateBitmap entry point in the XRender driver.
by Alexandre Julliard 16 Sep '11

16 Sep '11

Module: wine Branch: master Commit: 46cbdd0efc8140581249f6ce39f96c5b8fa4244e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46cbdd0efc8140581249f6ce3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 19:48:46 2011 +0200 winex11: Implement the CreateBitmap entry point in the XRender driver. --- dlls/winex11.drv/bitmap.c | 80 ++++++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/xrender.c | 87 ++++++++++++++++++++++---------------------- 3 files changed, 88 insertions(+), 81 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 6c5eb26..2f5655e 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -122,6 +122,41 @@ HBITMAP X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) } +/*********************************************************************** + * X11DRV_create_phys_bitmap + */ +BOOL X11DRV_create_phys_bitmap( HBITMAP hbitmap, const BITMAP *bitmap, int depth, + int true_color, const ColorShifts *shifts ) +{ + X_PHYSBITMAP *physBitmap; + + if (!(physBitmap = X11DRV_init_phys_bitmap( hbitmap ))) return FALSE; + + physBitmap->pixmap_depth = depth; + physBitmap->trueColor = true_color; + if (true_color) physBitmap->pixmap_color_shifts = *shifts; + + wine_tsx11_lock(); + physBitmap->pixmap = XCreatePixmap( gdi_display, root_window, + bitmap->bmWidth, bitmap->bmHeight, physBitmap->pixmap_depth ); + if (physBitmap->pixmap) + { + GC gc = get_bitmap_gc( depth ); + XSetFunction( gdi_display, gc, GXclear ); + XFillRectangle( gdi_display, physBitmap->pixmap, gc, 0, 0, bitmap->bmWidth, bitmap->bmHeight ); + XSetFunction( gdi_display, gc, GXcopy ); + } + wine_tsx11_unlock(); + if (!physBitmap->pixmap) + { + WARN("Can't create Pixmap\n"); + HeapFree( GetProcessHeap(), 0, physBitmap ); + return FALSE; + } + return TRUE; +} + + /**************************************************************************** * CreateBitmap (X11DRV.@) * @@ -131,7 +166,6 @@ HBITMAP X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) */ BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) { - X_PHYSBITMAP *physBitmap; BITMAP bitmap; if (!GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE; @@ -146,50 +180,22 @@ BOOL X11DRV_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) bitmap.bmPlanes, bitmap.bmBitsPixel); return FALSE; } - if (hbitmap == BITMAP_stock_phys_bitmap.hbitmap) - { - ERR( "called for stock bitmap, please report\n" ); - return FALSE; - } TRACE("(%p) %dx%d %d bpp\n", hbitmap, bitmap.bmWidth, bitmap.bmHeight, bitmap.bmBitsPixel); - if (!(physBitmap = X11DRV_init_phys_bitmap( hbitmap ))) return FALSE; - - if (!X11DRV_XRender_SetPhysBitmapDepth( physBitmap, bitmap.bmBitsPixel, NULL )) + if (bitmap.bmBitsPixel == 1) { - if(bitmap.bmBitsPixel == 1) - { - physBitmap->pixmap_depth = 1; - physBitmap->trueColor = FALSE; - } - else + if (hbitmap == BITMAP_stock_phys_bitmap.hbitmap) { - physBitmap->pixmap_depth = screen_depth; - physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; - physBitmap->trueColor = (visual->class == TrueColor || visual->class == DirectColor); + ERR( "called for stock bitmap, please report\n" ); + return FALSE; } + return X11DRV_create_phys_bitmap( hbitmap, &bitmap, 1, FALSE, NULL ); } - wine_tsx11_lock(); - /* Create the pixmap */ - physBitmap->pixmap = XCreatePixmap(gdi_display, root_window, - bitmap.bmWidth, bitmap.bmHeight, physBitmap->pixmap_depth); - if (physBitmap->pixmap) - { - GC gc = get_bitmap_gc(physBitmap->pixmap_depth); - XSetFunction( gdi_display, gc, GXclear ); - XFillRectangle( gdi_display, physBitmap->pixmap, gc, 0, 0, bitmap.bmWidth, bitmap.bmHeight ); - XSetFunction( gdi_display, gc, GXcopy ); - } - wine_tsx11_unlock(); - if (!physBitmap->pixmap) - { - WARN("Can't create Pixmap\n"); - HeapFree( GetProcessHeap(), 0, physBitmap ); - return FALSE; - } - return TRUE; + return X11DRV_create_phys_bitmap( hbitmap, &bitmap, screen_depth, + (visual->class == TrueColor || visual->class == DirectColor), + &X11DRV_PALETTE_default_shifts ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8be8a98..11e3e17 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -274,6 +274,8 @@ extern HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc) DECLSPEC_H extern Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc ) DECLSPEC_HIDDEN; extern X_PHYSBITMAP *X11DRV_get_phys_bitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern X_PHYSBITMAP *X11DRV_init_phys_bitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_create_phys_bitmap( HBITMAP hbitmap, const BITMAP *bitmap, int depth, + int true_color, const ColorShifts *shifts ) DECLSPEC_HIDDEN; extern Pixmap X11DRV_get_pixmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 34a7bb5..3288787 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1185,6 +1185,31 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID */ static BOOL xrenderdrv_CreateBitmap( PHYSDEV dev, HBITMAP hbitmap ) { + XRenderPictFormat *pict_format = NULL; + ColorShifts shifts; + BITMAP bitmap; + + if (!GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE; + + if (bitmap.bmPlanes == 1 && bitmap.bmBitsPixel == screen_bpp) + { + switch (bitmap.bmBitsPixel) + { + case 16: pict_format = pict_formats[WXR_FORMAT_R5G6B5]; break; + case 24: pict_format = pict_formats[WXR_FORMAT_R8G8B8]; break; + case 32: pict_format = pict_formats[WXR_FORMAT_A8R8G8B8]; break; + } + } + + if (pict_format) + { + X11DRV_PALETTE_ComputeColorShifts( &shifts, + pict_format->direct.redMask << pict_format->direct.red, + pict_format->direct.greenMask << pict_format->direct.green, + pict_format->direct.blueMask << pict_format->direct.blue ); + return X11DRV_create_phys_bitmap( hbitmap, &bitmap, pict_format->depth, TRUE, &shifts ); + } + dev = GET_NEXT_PHYSDEV( dev, pCreateBitmap ); return dev->funcs->pCreateBitmap( dev, hbitmap ); } @@ -1253,8 +1278,12 @@ static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_r BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) { - XRenderPictFormat *pict_format = NULL; + XRenderPictFormat *pict_format; ColorShifts shifts; + const DWORD *bitfields; + static const DWORD bitfields_32[3] = {0xff0000, 0x00ff00, 0x0000ff}; + static const DWORD bitfields_16[3] = {0x7c00, 0x03e0, 0x001f}; + /* When XRender is not around we can only use the screen_depth and when needed we perform depth conversion * in software. Further we also return the screen depth for paletted formats or TrueColor formats with a low @@ -1262,52 +1291,22 @@ BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, if (!X11DRV_XRender_Installed || bits_pixel <= 8) return FALSE; - if (dib) - { - const DWORD *bitfields; - static const DWORD bitfields_32[3] = {0xff0000, 0x00ff00, 0x0000ff}; - static const DWORD bitfields_16[3] = {0x7c00, 0x03e0, 0x001f}; - - if(dib->dsBmih.biCompression == BI_BITFIELDS) - bitfields = dib->dsBitfields; - else if(bits_pixel == 24 || bits_pixel == 32) - bitfields = bitfields_32; - else - bitfields = bitfields_16; - - X11DRV_PALETTE_ComputeColorShifts(&shifts, bitfields[0], bitfields[1], bitfields[2]); - pict_format = pict_formats[get_xrender_format_from_color_shifts(dib->dsBm.bmBitsPixel, &shifts)]; - - /* Common formats should be in our picture format table. */ - if (!pict_format) - { - TRACE("Unhandled dibsection format bpp=%d, redMask=%x, greenMask=%x, blueMask=%x\n", - dib->dsBm.bmBitsPixel, bitfields[0], bitfields[1], bitfields[2]); - return FALSE; - } - } + if(dib->dsBmih.biCompression == BI_BITFIELDS) + bitfields = dib->dsBitfields; + else if(bits_pixel == 24 || bits_pixel == 32) + bitfields = bitfields_32; else - { - int red_mask, green_mask, blue_mask; - - /* We are dealing with a DDB */ - switch (bits_pixel) - { - case 16: pict_format = pict_formats[WXR_FORMAT_R5G6B5]; break; - case 24: pict_format = pict_formats[WXR_FORMAT_R8G8B8]; break; - case 32: pict_format = pict_formats[WXR_FORMAT_A8R8G8B8]; break; - } + bitfields = bitfields_16; - if (!pict_format) - { - TRACE("Unhandled DDB bits_pixel=%d\n", bits_pixel); - return FALSE; - } + X11DRV_PALETTE_ComputeColorShifts(&shifts, bitfields[0], bitfields[1], bitfields[2]); + pict_format = pict_formats[get_xrender_format_from_color_shifts(dib->dsBm.bmBitsPixel, &shifts)]; - red_mask = pict_format->direct.redMask << pict_format->direct.red; - green_mask = pict_format->direct.greenMask << pict_format->direct.green; - blue_mask = pict_format->direct.blueMask << pict_format->direct.blue; - X11DRV_PALETTE_ComputeColorShifts(&shifts, red_mask, green_mask, blue_mask); + /* Common formats should be in our picture format table. */ + if (!pict_format) + { + TRACE("Unhandled dibsection format bpp=%d, redMask=%x, greenMask=%x, blueMask=%x\n", + dib->dsBm.bmBitsPixel, bitfields[0], bitfields[1], bitfields[2]); + return FALSE; } physBitmap->pixmap_depth = pict_format->depth;

1 0