wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Frédéric Delanoy : wldap32: Use BOOL type where appropriate.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 8610acde5cac236d9612b912ee24e60249770008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8610acde5cac236d9612b912e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 23:33:52 2013 +0200 wldap32: Use BOOL type where appropriate. --- dlls/wldap32/init.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index b5aed58..2c3ff7c 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -113,13 +113,12 @@ oom: } /* Determine if a URL starts with a known LDAP scheme */ -static int has_ldap_scheme( char *url ) +static BOOL has_ldap_scheme( char *url ) { - if (!strncasecmp( url, "ldap://", 7 ) || - !strncasecmp( url, "ldaps://", 8 ) || - !strncasecmp( url, "ldapi://", 8 ) || - !strncasecmp( url, "cldap://", 8 )) return 1; - return 0; + return !strncasecmp( url, "ldap://", 7 ) || + !strncasecmp( url, "ldaps://", 8 ) || + !strncasecmp( url, "ldapi://", 8 ) || + !strncasecmp( url, "cldap://", 8 ); } /* Flatten an array of hostnames into a space separated string of URLs.

1 0

Frédéric Delanoy : propsys: Use BOOL type where appropriate.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 0ab0384047ecde32614110bcb909c1f07ba51fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ab0384047ecde32614110bcb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 1 23:33:51 2013 +0200 propsys: Use BOOL type where appropriate. --- dlls/propsys/propsys_main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index ce9131b..8d05ad0 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -315,7 +315,7 @@ static BOOL string_to_guid(LPCWSTR s, LPGUID id) HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) { - int has_minus = 0, has_comma = 0; + BOOL has_minus = FALSE, has_comma = FALSE; TRACE("(%s, %p)\n", debugstr_w(pszString), pkey); @@ -341,7 +341,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) if (has_comma) return S_OK; else - has_comma = 1; + has_comma = TRUE; } pszString++; } @@ -357,7 +357,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) { if (*pszString == '-') { - has_minus = 1; + has_minus = TRUE; pszString++; } } @@ -372,7 +372,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) if (*pszString == '-') { - has_minus = 1; + has_minus = TRUE; pszString++; }

1 0

Henri Verbeet : d3dcompiler: Get rid of the BWRITERSHADER_PARAM_DSTMOD_TYPE typedef.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 48a6375dfc545aa5cb5c418441e5113a12369eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a6375dfc545aa5cb5c41844… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:28 2013 +0200 d3dcompiler: Get rid of the BWRITERSHADER_PARAM_DSTMOD_TYPE typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5767e8b..0d40664 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -494,12 +494,13 @@ enum bwritervs_rastout_offsets #define BWRITERSP_WRITEMASK_3 0x8 /* .w a */ #define BWRITERSP_WRITEMASK_ALL 0xf /* all */ -typedef enum _BWRITERSHADER_PARAM_DSTMOD_TYPE { +enum bwritershader_param_dstmod_type +{ BWRITERSPDM_NONE = 0, BWRITERSPDM_SATURATE = 1, BWRITERSPDM_PARTIALPRECISION = 2, BWRITERSPDM_MSAMPCENTROID = 4, -} BWRITERSHADER_PARAM_DSTMOD_TYPE; +}; typedef enum _BWRITERSAMPLER_TEXTURE_TYPE { BWRITERSTT_UNKNOWN = 0,

1 0

Henri Verbeet : d3dcompiler: Get rid of the BWRITERVS_RASTOUT_OFFSETS typedef.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: f67af28261e5680a755b5b930b209f94d74b040e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f67af28261e5680a755b5b930… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:27 2013 +0200 d3dcompiler: Get rid of the BWRITERVS_RASTOUT_OFFSETS typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 284bf8f..5767e8b 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -481,12 +481,12 @@ enum bwritershader_param_register_type BWRITERSPR_PREDICATE }; -typedef enum _BWRITERVS_RASTOUT_OFFSETS +enum bwritervs_rastout_offsets { BWRITERSRO_POSITION, BWRITERSRO_FOG, BWRITERSRO_POINT_SIZE -} BWRITERVS_RASTOUT_OFFSETS; +}; #define BWRITERSP_WRITEMASK_0 0x1 /* .x r */ #define BWRITERSP_WRITEMASK_1 0x2 /* .y g */

1 0

Henri Verbeet : wined3d: Send vertex buffer binding updates through the command stream.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 57ec706ddea980faff67944d922b9622ca76948c URL: http://source.winehq.org/git/wine.git/?a=commit;h=57ec706ddea980faff67944d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:26 2013 +0200 wined3d: Send vertex buffer binding updates through the command stream. --- dlls/wined3d/cs.c | 46 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 21 +---------------- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 50 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1e427f4..cdb49ce 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -33,6 +33,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_RENDER_TARGET, WINED3D_CS_OP_SET_DEPTH_STENCIL, WINED3D_CS_OP_SET_VERTEX_DECLARATION, + WINED3D_CS_OP_SET_STREAM_SOURCE, }; struct wined3d_cs_present @@ -98,6 +99,15 @@ struct wined3d_cs_set_vertex_declaration struct wined3d_vertex_declaration *declaration; }; +struct wined3d_cs_set_stream_source +{ + enum wined3d_cs_op opcode; + UINT stream_idx; + struct wined3d_buffer *buffer; + UINT offset; + UINT stride; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -310,6 +320,41 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3 cs->ops->submit(cs); } +static void wined3d_cs_exec_set_stream_source(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_stream_source *op = data; + struct wined3d_stream_state *stream; + struct wined3d_buffer *prev; + + stream = &cs->state.streams[op->stream_idx]; + prev = stream->buffer; + stream->buffer = op->buffer; + stream->offset = op->offset; + stream->stride = op->stride; + + if (op->buffer) + InterlockedIncrement(&op->buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); + + device_invalidate_state(cs->device, STATE_STREAMSRC); +} + +void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, + struct wined3d_buffer *buffer, UINT offset, UINT stride) +{ + struct wined3d_cs_set_stream_source *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_STREAM_SOURCE; + op->stream_idx = stream_idx; + op->buffer = buffer; + op->offset = offset; + op->stride = stride; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -320,6 +365,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_RENDER_TARGET */ wined3d_cs_exec_set_render_target, /* WINED3D_CS_OP_SET_DEPTH_STENCIL */ wined3d_cs_exec_set_depth_stencil, /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, + /* WINED3D_CS_OP_SET_STREAM_SOURCE */ wined3d_cs_exec_set_stream_source, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d581479..6b6234b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1239,29 +1239,12 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI stream->offset = offset; } - /* Handle recording of state blocks. */ - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); - if (buffer) - wined3d_buffer_incref(buffer); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); - return WINED3D_OK; - } - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); wined3d_buffer_incref(buffer); - } + if (!device->recording) + wined3d_cs_emit_set_stream_source(device->cs, stream_idx, buffer, offset, stride); if (prev_buffer) - { - InterlockedDecrement(&prev_buffer->resource.bind_count); wined3d_buffer_decref(prev_buffer); - } - - device_invalidate_state(device, STATE_STREAMSRC); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 648780f..719aa87 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2490,6 +2490,8 @@ void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_sur void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, struct wined3d_surface *render_target) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, + struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d3d9: Don' t mask out internal wined3d usage flags in surface_init().
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: f31d2485beadc49f5e83770c69d9619bec05fd03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31d2485beadc49f5e83770c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:25 2013 +0200 d3d9: Don't mask out internal wined3d usage flags in surface_init(). --- dlls/d3d9/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index a031c6e..99f0b0f 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -424,7 +424,7 @@ HRESULT surface_init(struct d3d9_surface *surface, struct d3d9_device *device, U wined3d_mutex_lock(); hr = wined3d_surface_create(device->wined3d_device, width, height, wined3dformat_from_d3dformat(format), - usage & WINED3DUSAGE_MASK, (enum wined3d_pool)pool, multisample_type, multisample_quality, + usage, (enum wined3d_pool)pool, multisample_type, multisample_quality, flags, surface, &d3d9_surface_wined3d_parent_ops, &surface->wined3d_surface); wined3d_mutex_unlock(); if (FAILED(hr))

1 0

Henri Verbeet : d3d8: Don' t mask out internal wined3d usage flags in surface_init().
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 74759444547ba457e2eee9631c8179eaee10c7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74759444547ba457e2eee9631… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 2 09:55:24 2013 +0200 d3d8: Don't mask out internal wined3d usage flags in surface_init(). --- dlls/d3d8/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 2196011..a157c51 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -343,7 +343,7 @@ HRESULT surface_init(struct d3d8_surface *surface, struct d3d8_device *device, U wined3d_mutex_lock(); hr = wined3d_surface_create(device->wined3d_device, width, height, wined3dformat_from_d3dformat(format), - usage & WINED3DUSAGE_MASK, (enum wined3d_pool)pool, multisample_type, multisample_quality, + usage, (enum wined3d_pool)pool, multisample_type, multisample_quality, flags, surface, &d3d8_surface_wined3d_parent_ops, &surface->wined3d_surface); wined3d_mutex_unlock(); if (FAILED(hr))

1 0

Michael Stefaniuc : tests: Compile the tests by default with -D__WINESRC__.
by Alexandre Julliard 02 Oct '13

02 Oct '13

1 0

Michael Stefaniuc : tests: Readying some tests for the compilation with -D__WINESRC__.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 2e1708dc1beffeebef5e9b495046924f47ee1042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1708dc1beffeebef5e9b495… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 1 23:26:28 2013 +0200 tests: Readying some tests for the compilation with -D__WINESRC__. --- dlls/atl/tests/atl_ax.c | 4 ++-- dlls/dplayx/tests/dplayx.c | 2 +- dlls/fusion/tests/asmcache.c | 4 ++-- dlls/lz32/tests/lzexpand_main.c | 4 ++-- dlls/pdh/tests/pdh.c | 2 +- dlls/snmpapi/tests/util.c | 2 +- programs/wscript/tests/run.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/atl/tests/atl_ax.c b/dlls/atl/tests/atl_ax.c index ea9ce32..f2dad74 100644 --- a/dlls/atl/tests/atl_ax.c +++ b/dlls/atl/tests/atl_ax.c @@ -51,12 +51,12 @@ static ATOM register_class(void) WNDCLASSA wndclassA; wndclassA.style = 0; - wndclassA.lpfnWndProc = DefWindowProc; + wndclassA.lpfnWndProc = DefWindowProcA; wndclassA.cbClsExtra = 0; wndclassA.cbWndExtra = 0; wndclassA.hInstance = GetModuleHandleA(NULL); wndclassA.hIcon = NULL; - wndclassA.hCursor = LoadCursorA(NULL, IDC_ARROW); + wndclassA.hCursor = LoadCursorA(NULL, (LPSTR)IDC_ARROW); wndclassA.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); wndclassA.lpszMenuName = NULL; wndclassA.lpszClassName = "WineAtlTestClass"; diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 44c9b50..fb76c37 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -667,7 +667,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W /* IP address string */ addressElements[1].guidDataType = DPAID_INet; - addressElements[1].dwDataSize = lstrlen(strIPAddressString) + 1; + addressElements[1].dwDataSize = lstrlenA(strIPAddressString) + 1; addressElements[1].lpData = (LPVOID) strIPAddressString; /* Optional Port number */ diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index da39505..6fe72bf 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -944,7 +944,7 @@ static void test_InstallAssembly(void) GetWindowsDirectoryA(dllpath, MAX_PATH); strcat(dllpath, "\\assembly\\GAC_MSIL\\wine\\\\1.0.0.0__2d03617b1c31e2f5\\wine.dll"); - attr = GetFileAttributes(dllpath); + attr = GetFileAttributesA(dllpath); ok(attr != INVALID_FILE_ATTRIBUTES, "Expected assembly to exist\n"); /* uninstall the assembly from the GAC */ @@ -954,7 +954,7 @@ static void test_InstallAssembly(void) ok(disp == IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, "Expected IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED, got %d\n", disp); - attr = GetFileAttributes(dllpath); + attr = GetFileAttributesA(dllpath); ok(attr == INVALID_FILE_ATTRIBUTES, "Expected assembly not to exist\n"); disp = 0xf00dbad; diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 41792d6..4980cf7 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -83,8 +83,8 @@ static void full_file_path_name_in_a_CWD(const char *src, char *dst, BOOL expect if(expect_short) { memcpy(shortname, dst, MAX_PATH); - retval = GetShortPathName(shortname, dst, MAX_PATH-1); - ok(retval > 0, "GetShortPathName returned %d for '%s', GLE=%d\n", + retval = GetShortPathNameA(shortname, dst, MAX_PATH-1); + ok(retval > 0, "GetShortPathNameA returned %d for '%s', GLE=%d\n", retval, dst, GetLastError()); } } diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 9690020..f492d5a 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -63,7 +63,7 @@ static BOOL is_lang_english(void) static void init_function_ptrs( void ) { - pdh = GetModuleHandle( "pdh" ); + pdh = GetModuleHandleA( "pdh" ); GETFUNCPTR( PdhAddEnglishCounterA ) GETFUNCPTR( PdhAddEnglishCounterW ) GETFUNCPTR( PdhCollectQueryDataWithTime ) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 908d5e2..0c517c1 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -32,7 +32,7 @@ static INT (WINAPI *pSnmpUtilOctetsNCmp)(AsnOctetString*, AsnOctetString*, UINT static void InitFunctionPtrs(void) { - HMODULE hSnmpapi = GetModuleHandle("snmpapi.dll"); + HMODULE hSnmpapi = GetModuleHandleA("snmpapi.dll"); #define SNMPAPI_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hSnmpapi, #func); \ diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 567bf45..75d8f6e 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -366,7 +366,7 @@ static void run_test(const char *file_name) CHECK_CALLED(reportSuccess); } -static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG_PTR param) +static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param) { const char *script_data, *ext; DWORD script_size, size; @@ -418,7 +418,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init) DWORD res; if(!init) { - RegDeleteKey(HKEY_CLASSES_ROOT, key_name); + RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name); return TRUE; }

1 0

Michael Stefaniuc : windowscodecs/tests: Use the W version of GetObject().
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 2720e815041dcf389381c2c16d17510cfc80ff1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2720e815041dcf389381c2c16… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 1 23:22:27 2013 +0200 windowscodecs/tests: Use the W version of GetObject(). --- dlls/windowscodecs/tests/bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 3c79ce8..8de990a 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -152,7 +152,7 @@ static HBITMAP create_dib(int width, int height, int bpp, LOGPALETTE *pal, const hdib = CreateDIBSection(0, bmi, DIB_RGB_COLORS, &bits, NULL, 0); ok(hdib != 0, "CreateDIBSection(%dx%d,%d bpp) failed\n", width, height, bpp); - GetObject(hdib, sizeof(bm), &bm); + GetObjectW(hdib, sizeof(bm), &bm); ok(bm.bmWidth == width, "expected %d, got %d\n", width, bm.bmWidth); ok(bm.bmHeight == height, "expected %d, got %d\n", height, bm.bmHeight); ok(bm.bmPlanes == 1, "expected 1, got %d\n", bm.bmPlanes);

1 0

← Newer
1
...
69
70
71
72
73
74
75
76
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 October 2013