February 2015 - Wine-Commits

Jacek Caban : wininet: Always use winsock sockets.
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: 5436fef80722fe7896aed5e659c31fdade4ef5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5436fef80722fe7896aed5e65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 13 12:12:29 2015 +0100 wininet: Always use winsock sockets. --- dlls/wininet/Makefile.in | 4 +- dlls/wininet/cookie.c | 10 +-- dlls/wininet/dialogs.c | 7 +- dlls/wininet/ftp.c | 61 ++++---------- dlls/wininet/http.c | 22 ++--- dlls/wininet/internet.c | 18 +--- dlls/wininet/internet.h | 23 ------ dlls/wininet/netconnection.c | 193 ++++--------------------------------------- dlls/wininet/urlcache.c | 11 +-- dlls/wininet/utility.c | 60 ++------------ 10 files changed, 49 insertions(+), 360 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5436fef80722fe7896aed…

1 0

Hans Leidekker : wbemprox: Implement Win32_SID.
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: 91c7a84af5b52c2b507cb5559a97362a79c7fa61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c7a84af5b52c2b507cb5559… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 13 13:40:36 2015 +0100 wbemprox: Implement Win32_SID. --- dlls/wbemprox/builtin.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6b65c35..79ce561 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -39,6 +39,8 @@ #include "winioctl.h" #include "winsvc.h" #include "winver.h" +#include "sddl.h" +#include "ntsecapi.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -89,11 +91,15 @@ static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR class_processor2W[] = {'C','I','M','_','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR class_sidW[] = + {'W','i','n','3','2','_','S','I','D',0}; static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +static const WCHAR prop_accountnameW[] = + {'A','c','c','o','u','n','t','N','a','m','e',0}; static const WCHAR prop_acceptpauseW[] = {'A','c','c','e','p','t','P','a','u','s','e',0}; static const WCHAR prop_acceptstopW[] = @@ -110,6 +116,8 @@ static const WCHAR prop_addresswidthW[] = {'A','d','d','r','e','s','s','W','i','d','t','h',0}; static const WCHAR prop_availabilityW[] = {'A','v','a','i','l','a','b','i','l','i','t','y',0}; +static const WCHAR prop_binaryrepresentationW[] = + {'B','i','n','a','r','y','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; static const WCHAR prop_bootableW[] = {'B','o','o','t','a','b','l','e',0}; static const WCHAR prop_bootpartitionW[] = @@ -248,6 +256,8 @@ static const WCHAR prop_productW[] = {'P','r','o','d','u','c','t',0}; static const WCHAR prop_productnameW[] = {'P','r','o','d','u','c','t','N','a','m','e',0}; +static const WCHAR prop_referenceddomainnameW[] = + {'R','e','f','e','r','e','n','c','e','d','D','o','m','a','i','n','N','a','m','e',0}; static const WCHAR prop_releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR prop_serialnumberW[] = @@ -262,6 +272,10 @@ static const WCHAR prop_smbiosbiosversionW[] = {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; static const WCHAR prop_startmodeW[] = {'S','t','a','r','t','M','o','d','e',0}; +static const WCHAR prop_sidW[] = + {'S','I','D',0}; +static const WCHAR prop_sidlengthW[] = + {'S','i','d','L','e','n','g','t','h',0}; static const WCHAR prop_sizeW[] = {'S','i','z','e',0}; static const WCHAR prop_speedW[] = @@ -517,6 +531,14 @@ static const struct column col_service[] = { method_startserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { method_stopserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; +static const struct column col_sid[] = +{ + { prop_accountnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_binaryrepresentationW, CIM_UINT8|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { prop_referenceddomainnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_sidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_sidlengthW, CIM_UINT32 } +}; static const struct column col_sounddevice[] = { { prop_nameW, CIM_STRING }, @@ -855,6 +877,14 @@ struct record_service class_method *start_service; class_method *stop_service; }; +struct record_sid +{ + const WCHAR *accountname; + const UINT8 *binaryrepresentation; + const WCHAR *referenceddomainname; + const WCHAR *sid; + UINT32 sidlength; +}; struct record_sounddevice { const WCHAR *name; @@ -2421,6 +2451,91 @@ done: return fill_status; } +static WCHAR *get_accountname( LSA_TRANSLATED_NAME *name ) +{ + if (!name || !name->Name.Buffer) return NULL; + return heap_strdupW( name->Name.Buffer ); +} +static UINT8 *get_binaryrepresentation( PSID sid, UINT len ) +{ + UINT8 *ret = heap_alloc( len ); + if (!ret) return NULL; + memcpy( ret, sid, len ); + return ret; +} +static WCHAR *get_referenceddomainname( LSA_REFERENCED_DOMAIN_LIST *domain ) +{ + if (!domain || !domain->Domains || !domain->Domains->Name.Buffer) return NULL; + return heap_strdupW( domain->Domains->Name.Buffer ); +} +static const WCHAR *find_sid_str( const struct expr *cond ) +{ + const struct expr *left, *right; + const WCHAR *ret = NULL; + + if (!cond || cond->type != EXPR_COMPLEX || cond->u.expr.op != OP_EQ) return NULL; + + left = cond->u.expr.left; + right = cond->u.expr.right; + if (left->type == EXPR_PROPVAL && right->type == EXPR_SVAL && !strcmpiW( left->u.propval->name, prop_sidW )) + { + ret = right->u.sval; + } + else if (left->type == EXPR_SVAL && right->type == EXPR_PROPVAL && !strcmpiW( right->u.propval->name, prop_sidW )) + { + ret = left->u.sval; + } + return ret; +} + +static enum fill_status fill_sid( struct table *table, const struct expr *cond ) +{ + PSID sid; + LSA_REFERENCED_DOMAIN_LIST *domain; + LSA_TRANSLATED_NAME *name; + LSA_HANDLE handle; + LSA_OBJECT_ATTRIBUTES attrs; + const WCHAR *str; + struct record_sid *rec; + UINT len; + + if (!(str = find_sid_str( cond ))) return FILL_STATUS_FAILED; + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + if (!ConvertStringSidToSidW( str, &sid )) return FILL_STATUS_FAILED; + len = GetLengthSid( sid ); + + memset( &attrs, 0, sizeof(attrs) ); + attrs.Length = sizeof(attrs); + if (LsaOpenPolicy( NULL, &attrs, POLICY_ALL_ACCESS, &handle )) + { + LocalFree( sid ); + return FILL_STATUS_FAILED; + } + if (LsaLookupSids( handle, 1, &sid, &domain, &name )) + { + LocalFree( sid ); + LsaClose( handle ); + return FILL_STATUS_FAILED; + } + + rec = (struct record_sid *)table->data; + rec->accountname = get_accountname( name ); + rec->binaryrepresentation = get_binaryrepresentation( sid, len ); + rec->referenceddomainname = get_referenceddomainname( domain ); + rec->sid = heap_strdupW( str ); + rec->sidlength = len; + + TRACE("created 1 row\n"); + table->num_rows = 1; + + LsaFreeMemory( domain ); + LsaFreeMemory( name ); + LocalFree( sid ); + LsaClose( handle ); + return FILL_STATUS_FILTERED; +} + static UINT32 get_bits_per_pixel( UINT *hres, UINT *vres ) { HDC hdc = GetDC( NULL ); @@ -2524,6 +2639,7 @@ static struct table builtin_classes[] = { class_processor2W, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0, (BYTE *)data_qualifier }, { class_serviceW, SIZEOF(col_service), col_service, 0, 0, NULL, fill_service }, + { class_sidW, SIZEOF(col_sid), col_sid, 0, 0, NULL, fill_sid }, { class_sounddeviceW, SIZEOF(col_sounddevice), col_sounddevice, SIZEOF(data_sounddevice), 0, (BYTE *)data_sounddevice }, { class_stdregprovW, SIZEOF(col_stdregprov), col_stdregprov, SIZEOF(data_stdregprov), 0, (BYTE *)data_stdregprov }, { class_systemsecurityW, SIZEOF(col_systemsecurity), col_systemsecurity, SIZEOF(data_systemsecurity), 0, (BYTE *)data_systemsecurity },

1 0

Stefan Dösinger : d3d/tests: Geforce8+ GPUs abs() table fog.
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: f75d1b0c2f77d8c85f7c2a9bcc3545f14e271a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75d1b0c2f77d8c85f7c2a9bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 13 10:51:38 2015 +0100 d3d/tests: Geforce8+ GPUs abs() table fog. --- dlls/d3d8/tests/visual.c | 23 ++++++++++++++--------- dlls/d3d9/tests/visual.c | 23 ++++++++++++++--------- dlls/ddraw/tests/ddraw7.c | 28 +++++++++++++++++++--------- 3 files changed, 47 insertions(+), 27 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 40bbc59..c095463 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5458,26 +5458,30 @@ static void test_negative_fixedfunction_fog(void) DWORD d; } start, end; D3DFOGMODE vfog, tfog; - DWORD color, color_broken; + DWORD color, color_broken, color_broken2; } tests[] = { - /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. */ + /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. + * + * Geforce8+ GPUs on Windows abs() table fog, everything else does not. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, { 0.0f}, {1.0f}, - D3DFOG_NONE, D3DFOG_LINEAR, 0x00ff0000, 0x00ff0000}, + D3DFOG_NONE, D3DFOG_LINEAR, 0x00ff0000, 0x00808000, 0x00808000}, /* r200 GPUs and presumably all d3d8 and older HW clamp the fog * parameters to 0.0 and 1.0 in the table fog case. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, {-1.0f}, {0.0f}, - D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, + D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000, 0x0000ff00}, /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows - * that the abs happens before the fog equation is evaluated. */ + * that the abs happens before the fog equation is evaluated. + * + * Vertex fog abs() behavior is the same on all GPUs. */ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, - D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000}, + D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000, 0x00808000}, {D3DFVF_XYZ, quad, sizeof(*quad), &zero, {-1.0f}, {0.0f}, - D3DFOG_LINEAR, D3DFOG_NONE, 0x0000ff00, 0x0000ff00}, + D3DFOG_LINEAR, D3DFOG_NONE, 0x0000ff00, 0x0000ff00, 0x0000ff00}, {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, - D3DFOG_EXP, D3DFOG_NONE, 0x009b6400, 0x009b6400}, + D3DFOG_EXP, D3DFOG_NONE, 0x009b6400, 0x009b6400, 0x009b6400}, }; D3DCAPS8 caps; @@ -5539,7 +5543,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, tests[i].color, 2) || broken(color_match(color, tests[i].color_broken, 2)), + ok(color_match(color, tests[i].color, 2) || broken(color_match(color, tests[i].color_broken, 2)) + || broken(color_match(color, tests[i].color_broken2, 2)), "Got unexpected color 0x%08x, case %u.\n", color, i); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b4df9c4..a8cf55f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17057,26 +17057,30 @@ static void test_negative_fixedfunction_fog(void) DWORD d; } start, end; D3DFOGMODE vfog, tfog; - DWORD color, color_broken; + DWORD color, color_broken, color_broken2; } tests[] = { - /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. */ + /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. + * + * Geforce8+ GPUs on Windows abs() table fog, everything else does not. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, { 0.0f}, {1.0f}, - D3DFOG_NONE, D3DFOG_LINEAR, 0x00ff0000, 0x00ff0000}, + D3DFOG_NONE, D3DFOG_LINEAR, 0x00ff0000, 0x00808000, 0x00808000}, /* r200 GPUs and presumably all d3d8 and older HW clamp the fog * parameters to 0.0 and 1.0 in the table fog case. */ {D3DFVF_XYZRHW, tquad, sizeof(*tquad), &identity, {-1.0f}, {0.0f}, - D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, + D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000, 0x0000ff00}, /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows - * that the abs happens before the fog equation is evaluated. */ + * that the abs happens before the fog equation is evaluated. + * + * Vertex fog abs() behavior is the same on all GPUs. */ {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, - D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000}, + D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000, 0x00808000}, {D3DFVF_XYZ, quad, sizeof(*quad), &zero, {-1.0f}, {0.0f}, - D3DFOG_LINEAR, D3DFOG_NONE, 0x0000ff00, 0x0000ff00}, + D3DFOG_LINEAR, D3DFOG_NONE, 0x0000ff00, 0x0000ff00, 0x0000ff00}, {D3DFVF_XYZ, quad, sizeof(*quad), &zero, { 0.0f}, {1.0f}, - D3DFOG_EXP, D3DFOG_NONE, 0x009b6400, 0x009b6400}, + D3DFOG_EXP, D3DFOG_NONE, 0x009b6400, 0x009b6400, 0x009b6400}, }; D3DCAPS9 caps; @@ -17138,7 +17142,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, tests[i].color, 2) || broken(color_match(color, tests[i].color_broken, 2)), + ok(color_match(color, tests[i].color, 2) || broken(color_match(color, tests[i].color_broken, 2)) + || broken(color_match(color, tests[i].color_broken2, 2)), "Got unexpected color 0x%08x, case %u.\n", color, i); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 01d0fcb..90ea739 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8097,21 +8097,30 @@ static void test_negative_fixedfunction_fog(void) DWORD d; } start, end; D3DFOGMODE vfog, tfog; - DWORD color, color_broken; + DWORD color, color_broken, color_broken2; } tests[] = { - /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. */ - {D3DFVF_XYZRHW, tquad, &identity, { 0.0f}, {1.0f}, D3DFOG_NONE, D3DFOG_LINEAR, 0x00ff0000, 0x00ff0000}, + /* Run the XYZRHW tests first. Depth clamping is broken after RHW draws on the testbot. + * + * Geforce8+ GPUs on Windows abs() table fog, everything else does not. */ + {D3DFVF_XYZRHW, tquad, &identity, { 0.0f}, {1.0f}, D3DFOG_NONE, D3DFOG_LINEAR, + 0x00ff0000, 0x00808000, 0x00808000}, /* r200 GPUs and presumably all d3d8 and older HW clamp the fog * parameters to 0.0 and 1.0 in the table fog case. */ - {D3DFVF_XYZRHW, tquad, &identity, {-1.0f}, {0.0f}, D3DFOG_NONE, D3DFOG_LINEAR, 0x00808000, 0x00ff0000}, + {D3DFVF_XYZRHW, tquad, &identity, {-1.0f}, {0.0f}, D3DFOG_NONE, D3DFOG_LINEAR, + 0x00808000, 0x00ff0000, 0x0000ff00}, /* test_fog_interpolation shows that vertex fog evaluates the fog * equation in the vertex pipeline. Start = -1.0 && end = 0.0 shows - * that the abs happens before the fog equation is evaluated. */ - {D3DFVF_XYZ, quad, &zero, { 0.0f}, {1.0f}, D3DFOG_LINEAR, D3DFOG_NONE, 0x00808000, 0x00808000}, - {D3DFVF_XYZ, quad, &zero, {-1.0f}, {0.0f}, D3DFOG_LINEAR, D3DFOG_NONE, 0x0000ff00, 0x0000ff00}, - {D3DFVF_XYZ, quad, &zero, { 0.0f}, {1.0f}, D3DFOG_EXP, D3DFOG_NONE, 0x009b6400, 0x009b6400}, + * that the abs happens before the fog equation is evaluated. + * + * Vertex fog abs() behavior is the same on all GPUs. */ + {D3DFVF_XYZ, quad, &zero, { 0.0f}, {1.0f}, D3DFOG_LINEAR, D3DFOG_NONE, + 0x00808000, 0x00808000, 0x00808000}, + {D3DFVF_XYZ, quad, &zero, {-1.0f}, {0.0f}, D3DFOG_LINEAR, D3DFOG_NONE, + 0x0000ff00, 0x0000ff00, 0x0000ff00}, + {D3DFVF_XYZ, quad, &zero, { 0.0f}, {1.0f}, D3DFOG_EXP, D3DFOG_NONE, + 0x009b6400, 0x009b6400, 0x009b6400}, }; D3DDEVICEDESC7 caps; @@ -8170,7 +8179,8 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = get_surface_color(rt, 0, 240); - ok(compare_color(color, tests[i].color, 2) || broken(compare_color(color, tests[i].color_broken, 2)), + ok(compare_color(color, tests[i].color, 2) || broken(compare_color(color, tests[i].color_broken, 2)) + || broken(compare_color(color, tests[i].color_broken2, 2)), "Got unexpected color 0x%08x, case %u.\n", color, i); }

1 0

Mark Harmstone : comctl32: Draw the focus rect on themed checkboxes.
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: f21a968d1cf733dc7d9897780a91b0e73f1e18c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21a968d1cf733dc7d9897780… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 10 22:02:02 2015 +0000 comctl32: Draw the focus rect on themed checkboxes. --- dlls/comctl32/theme_button.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 0f0db6d..3935333 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -47,7 +47,7 @@ typedef enum STATE_DEFAULTED } ButtonState; -typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags); +typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused); static UINT get_drawtext_flags(DWORD style, DWORD ex_style) { @@ -100,7 +100,7 @@ static inline WCHAR *get_button_text(HWND hwnd) return text; } -static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) { static const int states[] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; @@ -125,7 +125,7 @@ static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) { static const int cb_states[3][5] = { @@ -143,8 +143,7 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN static const int cb_size = 13; RECT bgRect, textRect; - HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); - HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; + HFONT font, hPrevFont = NULL; LRESULT checkState = SendMessageW(hwnd, BM_GETCHECK, 0, 0); DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); int part = ((dwStyle & BUTTON_TYPE) == BS_RADIOBUTTON) || ((dwStyle & BUTTON_TYPE) == BS_AUTORADIOBUTTON) @@ -154,6 +153,21 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN ? cb_states[ checkState ][ drawState ] : rb_states[ checkState ][ drawState ]; WCHAR *text = get_button_text(hwnd); + LOGFONTW lf; + BOOL created_font = FALSE; + + HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); + if (SUCCEEDED(hr)) { + font = CreateFontIndirectW(&lf); + if (!font) + TRACE("Failed to create font\n"); + else { + TRACE("font = %s\n", debugstr_w(lf.lfFaceName)); + hPrevFont = SelectObject(hDC, font); + created_font = TRUE; + } + } else + font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); GetClientRect(hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); @@ -172,13 +186,29 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN if (text) { DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); + + if (focused) + { + RECT focusRect; + + focusRect = textRect; + + DrawTextW(hDC, text, lstrlenW(text), &focusRect, dtFlags | DT_CALCRECT); + + if (focusRect.right < textRect.right) focusRect.right++; + focusRect.bottom = textRect.bottom; + + DrawFocusRect( hDC, &focusRect ); + } + HeapFree(GetProcessHeap(), 0, text); } + if (created_font) DeleteObject(font); if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) { static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; @@ -281,7 +311,7 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) else drawState = STATE_DISABLED; hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - paint(theme, hwnd, hDC, drawState, dtFlags); + paint(theme, hwnd, hDC, drawState, dtFlags, state & BST_FOCUS); if (!hParamDC) EndPaint(hwnd, &ps); return TRUE; }

1 0

Mark Harmstone : comctl32: Always redraw background on checkbox repaint.
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: b8d3f1fe247290d5751f3c06c1847929410085a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d3f1fe247290d5751f3c06c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Feb 10 21:58:01 2015 +0000 comctl32: Always redraw background on checkbox repaint. --- dlls/comctl32/theme_button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 78d7cc4..0f0db6d 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -166,8 +166,8 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN bgRect.right = bgRect.left + cb_size; textRect.left = bgRect.right + 6; - if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) - DrawThemeParentBackground(hwnd, hDC, NULL); + DrawThemeParentBackground(hwnd, hDC, NULL); + DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); if (text) {

1 0

Uwe Bonnes : ntdll: Add more serial speed settings.
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: 2148248976d5f1bef8ef12f80f9cf94e9ee869ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2148248976d5f1bef8ef12f80… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Thu Feb 12 17:53:28 2015 +0100 ntdll: Add more serial speed settings. --- dlls/ntdll/serial.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index b03ac61..9f73ce6 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -171,6 +171,36 @@ static NTSTATUS get_baud_rate(int fd, SERIAL_BAUD_RATE* sbr) #ifdef B460800 case B460800: sbr->BaudRate = 460800; break; #endif +#ifdef B500000 + case B500000: sbr->BaudRate = 500000; break; +#endif +#ifdef B921600 + case B921600: sbr->BaudRate = 921600; break; +#endif +#ifdef B1000000 + case B1000000: sbr->BaudRate = 1000000; break; +#endif +#ifdef B1152000 + case B1152000: sbr->BaudRate = 1152000; break; +#endif +#ifdef B1500000 + case B1500000: sbr->BaudRate = 1500000; break; +#endif +#ifdef B2000000 + case B2000000: sbr->BaudRate = 2000000; break; +#endif +#ifdef B2500000 + case B2500000: sbr->BaudRate = 2500000; break; +#endif +#ifdef B3000000 + case B3000000: sbr->BaudRate = 3000000; break; +#endif +#ifdef B3500000 + case B3500000: sbr->BaudRate = 3500000; break; +#endif +#ifdef B4000000 + case B4000000: sbr->BaudRate = 4000000; break; +#endif default: ERR("unknown speed %x\n", speed); return STATUS_INVALID_PARAMETER; @@ -478,6 +508,36 @@ static NTSTATUS set_baud_rate(int fd, const SERIAL_BAUD_RATE* sbr) #ifdef B460800 case 460800: cfsetospeed( &port, B460800 ); break; #endif +#ifdef B500000 + case 500000: cfsetospeed( &port, B500000 ); break; +#endif +#ifdef B921600 + case 921600: cfsetospeed( &port, B921600 ); break; +#endif +#ifdef B1000000 + case 1000000: cfsetospeed( &port, B1000000 ); break; +#endif +#ifdef B1152000 + case 1152000: cfsetospeed( &port, B1152000 ); break; +#endif +#ifdef B1500000 + case 1500000: cfsetospeed( &port, B1500000 ); break; +#endif +#ifdef B2000000 + case 2000000: cfsetospeed( &port, B2000000 ); break; +#endif +#ifdef B2500000 + case 2500000: cfsetospeed( &port, B2500000 ); break; +#endif +#ifdef B3000000 + case 3000000: cfsetospeed( &port, B3000000 ); break; +#endif +#ifdef B3500000 + case 3500000: cfsetospeed( &port, B3500000 ); break; +#endif +#ifdef B4000000 + case 4000000: cfsetospeed( &port, B4000000 ); break; +#endif default: #if defined (HAVE_LINUX_SERIAL_H) && defined (TIOCSSERIAL) {

1 0

Henri Verbeet : wined3d: Add support for appending vertex declaration elements.
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: 849149d5d30ced63154f1b54cfb31ebf62c12453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849149d5d30ced63154f1b54c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 13 10:40:48 2015 +0100 wined3d: Add support for appending vertex declaration elements. --- dlls/d3d10core/inputlayout.c | 2 -- dlls/wined3d/vertexdeclaration.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++-- include/wine/wined3d.h | 6 ++++-- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index e6ac25e..8350875 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -83,8 +83,6 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME e->usage = 0; e->usage_idx = 0; - if (f->AlignedByteOffset == D3D10_APPEND_ALIGNED_ELEMENT) - FIXME("D3D10_APPEND_ALIGNED_ELEMENT not supported\n"); if (f->InputSlotClass != D3D10_INPUT_PER_VERTEX_DATA) FIXME("Ignoring input slot class (%#x)\n", f->InputSlotClass); if (f->InstanceDataStepRate) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cf5378c..df3d8ba 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -216,6 +216,19 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara return E_FAIL; } + if (e->offset == WINED3D_APPEND_ALIGNED_ELEMENT) + { + if (!i) + { + e->offset = 0; + } + else + { + struct wined3d_vertex_declaration_element *prev = &declaration->elements[i - 1]; + e->offset = (prev->offset + prev->format->byte_count + 3) & ~3; + } + } + if (e->offset & 0x3) { WARN("Declaration element %u is not 4 byte aligned(%u), returning E_FAIL.\n", i, e->offset); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2c1a00c..d924271 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2422,8 +2422,8 @@ struct wined3d_vertex_declaration_element { const struct wined3d_format *format; BOOL ffp_valid; - WORD input_slot; - WORD offset; + unsigned int input_slot; + unsigned int offset; UINT output_slot; BYTE method; BYTE usage; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2d3336a..089db9e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1494,6 +1494,8 @@ enum wined3d_display_rotation #define WINED3D_SURFACE_DISCARD 0x00000002 #define WINED3D_SURFACE_PIN_SYSMEM 0x00000004 +#define WINED3D_APPEND_ALIGNED_ELEMENT 0xffffffff + struct wined3d_display_mode { UINT width; @@ -1670,8 +1672,8 @@ struct wined3d_clip_status struct wined3d_vertex_element { enum wined3d_format_id format; - WORD input_slot; - WORD offset; + unsigned int input_slot; + unsigned int offset; UINT output_slot; /* D3D 8 & 10 */ BYTE method; BYTE usage;

1 0

Henri Verbeet : dxgi: Implement dxgi_adapter_SetPrivateDataInterface().
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: 141b024eb0c90ce74f98ae46312afc8ef33ae93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=141b024eb0c90ce74f98ae463… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 13 10:40:50 2015 +0100 dxgi: Implement dxgi_adapter_SetPrivateDataInterface(). --- dlls/dxgi/adapter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 2b1023b..b0ed1d8 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -89,9 +89,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IDXGIAdapter1 *ifac static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapter1 *iface, REFGUID guid, const IUnknown *object) { - FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object); + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, object %p.\n", iface, debugstr_guid(guid), object); + + return dxgi_set_private_data_interface(&adapter->private_store, guid, object); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter1 *iface,

1 0

Yifu Wang : msvcr120: Fixed bugs in Concurrency::critical_section.
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: a11c8758b2e2c70d4a4cc5ad693b56ef7a5ad05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11c8758b2e2c70d4a4cc5ad6… Author: Yifu Wang <ywang(a)esri.com> Date: Tue Dec 30 15:03:36 2014 -0800 msvcr120: Fixed bugs in Concurrency::critical_section. --- dlls/msvcrt/lock.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 328b5b5..6d903dc 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -384,10 +384,11 @@ void __thiscall critical_section_lock(critical_section *this) NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); } - this->unk_active.next = NULL; - if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) - spin_wait_for_next_cs(&q); cs_set_head(this, &q); + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) { + spin_wait_for_next_cs(&q); + this->unk_active.next = q.next; + } } /* ?try_lock(a)critical_section@Concurrency@@QAE_NXZ */ @@ -406,11 +407,11 @@ MSVCRT_bool __thiscall critical_section_try_lock(critical_section *this) memset(&q, 0, sizeof(q)); if(!InterlockedCompareExchangePointer(&this->tail, &q, NULL)) { - this->unk_active.next = NULL; - if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) - spin_wait_for_next_cs(&q); - cs_set_head(this, &q); + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) { + spin_wait_for_next_cs(&q); + this->unk_active.next = q.next; + } return TRUE; } return FALSE; @@ -437,8 +438,10 @@ void __thiscall critical_section_unlock(critical_section *this) break; next = this->unk_active.next; - if(InterlockedCompareExchangePointer(&this->tail, NULL, next) == next) + if(InterlockedCompareExchangePointer(&this->tail, NULL, next) == next) { + HeapFree(GetProcessHeap(), 0, next); return; + } spin_wait_for_next_cs(next); this->unk_active.next = next->next; @@ -491,14 +494,18 @@ MSVCRT_bool __thiscall critical_section_try_lock_for( if(status == STATUS_TIMEOUT) { if(!InterlockedExchange(&q->free, TRUE)) return FALSE; + /* A thread has signaled the event and is block waiting. */ + /* We need to catch the event to wake the thread. */ + NtWaitForKeyedEvent(keyed_event, q, 0, NULL); } } - this->unk_active.next = NULL; - if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, q) != q) + cs_set_head(this, q); + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, q) != q) { spin_wait_for_next_cs(q); + this->unk_active.next = q->next; + } - cs_set_head(this, q); HeapFree(GetProcessHeap(), 0, q); return TRUE; }

1 0

Henri Verbeet : dxgi: Implement dxgi_adapter_SetPrivateData().
by Alexandre Julliard Feb. 13, 2015

Feb. 13, 2015

Module: wine Branch: master Commit: 9dfd95c6cf652ea5ec525fa258582ec11cdc6f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dfd95c6cf652ea5ec525fa25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 13 10:40:49 2015 +0100 dxgi: Implement dxgi_adapter_SetPrivateData(). --- dlls/dxgi/adapter.c | 12 ++++++++---- dlls/dxgi/dxgi_private.h | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index a1359f0..2b1023b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -69,6 +69,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IDXGIAdapter1 *iface) if (!refcount) { IDXGIOutput_Release(adapter->output); + wined3d_private_store_cleanup(&adapter->private_store); HeapFree(GetProcessHeap(), 0, adapter); } @@ -78,9 +79,11 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IDXGIAdapter1 *iface) static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IDXGIAdapter1 *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct dxgi_adapter *adapter = impl_from_IDXGIAdapter1(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return dxgi_set_private_data(&adapter->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapter1 *iface, @@ -228,11 +231,12 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory *par adapter->IDXGIAdapter1_iface.lpVtbl = &dxgi_adapter_vtbl; adapter->parent = parent; adapter->refcount = 1; + wined3d_private_store_init(&adapter->private_store); adapter->ordinal = ordinal; - output = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*output)); - if (!output) + if (!(output = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*output)))) { + wined3d_private_store_cleanup(&adapter->private_store); return E_OUTOFMEMORY; } dxgi_output_init(output, adapter); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 55837f9..6653c21 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -129,6 +129,7 @@ struct dxgi_adapter IDXGIAdapter1 IDXGIAdapter1_iface; struct dxgi_factory *parent; LONG refcount; + struct wined3d_private_store private_store; UINT ordinal; IDXGIOutput *output; };

1 0