wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Henri Verbeet : ddraw/tests: Properly create offscreen plain surfaces.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 9677805ec456f61e750923c621f777fcb5efafe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9677805ec456f61e750923c62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 28 11:26:52 2014 +0100 ddraw/tests: Properly create offscreen plain surfaces. It's not entirely clear what kind of surface is actually created when just DDSCAPS_SYSTEMMEMORY is specified, but at the very least its format appears to be validated against the current display mode, which is not what we want. --- dlls/ddraw/tests/ddraw2.c | 12 +++++++----- dlls/ddraw/tests/ddraw4.c | 12 +++++++----- dlls/ddraw/tests/ddraw7.c | 12 +++++++----- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e016852..6b34912 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4753,7 +4753,7 @@ static void test_set_surface_desc(void) U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -4798,7 +4798,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); @@ -4813,7 +4814,7 @@ static void test_set_surface_desc(void) ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); ddsd.ddsCaps.dwCaps = 0; @@ -4822,7 +4823,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ reset_ddsd(&ddsd); @@ -5050,7 +5052,7 @@ static void test_user_memory_getdc(void) U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0786e8b..ad1e724 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5359,7 +5359,7 @@ static void test_set_surface_desc(void) U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -5400,7 +5400,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ @@ -5416,7 +5417,7 @@ static void test_set_surface_desc(void) ddsd.lpSurface = data; hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); ddsd.ddsCaps.dwCaps = 0; @@ -5426,7 +5427,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ @@ -5652,7 +5654,7 @@ static void test_user_memory_getdc(void) U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 287c5c3..24c38bc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5237,7 +5237,7 @@ static void test_set_surface_desc(void) U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -5279,7 +5279,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ @@ -5295,7 +5296,7 @@ static void test_set_surface_desc(void) ddsd.lpSurface = data; hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); ddsd.ddsCaps.dwCaps = 0; @@ -5305,7 +5306,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN), + "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ @@ -5531,7 +5533,7 @@ static void test_user_memory_getdc(void) U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000ff; - ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0

Henri Verbeet : ddraw/tests: Try 24 bpp display modes if 32 bpp modes are unavailable.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 048f4d4c2663bcbf1216552b130459933420fb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=048f4d4c2663bcbf1216552b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 28 11:26:51 2014 +0100 ddraw/tests: Try 24 bpp display modes if 32 bpp modes are unavailable. --- dlls/ddraw/tests/ddraw1.c | 63 ++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw2.c | 75 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw4.c | 75 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 75 +++++++++++++++++++++++++-------------------- 4 files changed, 158 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=048f4d4c2663bcbf12165…

1 0

Henri Verbeet : d3d9/tests: Get rid of "skip_once" in yuv_layout_test().
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 1168948764ebe0ecc9a22a3cd509b8525b195a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1168948764ebe0ecc9a22a3cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 28 11:26:50 2014 +0100 d3d9/tests: Get rid of "skip_once" in yuv_layout_test(). --- dlls/d3d9/tests/visual.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e107471..4d921dc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10522,7 +10522,6 @@ static void yuv_layout_test(IDirect3DDevice9 *device) BYTE *buf, *chroma_buf, *u_buf, *v_buf; UINT width = 20, height = 16; D3DCAPS9 caps; - D3DFORMAT skip_once = D3DFMT_UNKNOWN; D3DSURFACE_DESC desc; static const struct @@ -10582,21 +10581,13 @@ static void yuv_layout_test(IDirect3DDevice9 *device) if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, format) != D3D_OK) { - if (skip_once != format) - { - skip("%s is not supported.\n", fmt_string); - skip_once = format; - } + skip("%s is not supported.\n", fmt_string); continue; } if (FAILED(IDirect3D9_CheckDeviceFormatConversion(d3d, 0, D3DDEVTYPE_HAL, format, desc.Format))) { - if (skip_once != format) - { - skip("Driver cannot blit %s surfaces.\n", fmt_string); - skip_once = format; - } + skip("Driver cannot blit %s surfaces.\n", fmt_string); continue; }

1 0

Hans Leidekker : wbemprox: Add support for negated expressions in WHERE clauses.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: d0d9b9dcd7fd9bd5114ab8a2f59754caeaa422eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d9b9dcd7fd9bd5114ab8a2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 28 11:23:39 2014 +0100 wbemprox: Add support for negated expressions in WHERE clauses. --- dlls/wbemprox/query.c | 9 +++++++++ dlls/wbemprox/wbemprox_private.h | 3 ++- dlls/wbemprox/wql.y | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 6933da2..921c3cd 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -250,6 +250,15 @@ static HRESULT eval_unary( const struct table *table, UINT row, const struct com UINT column; LONGLONG lval; + if (expr->op == OP_NOT) + { + hr = eval_cond( table, row, expr->left, &lval, type ); + if (hr != S_OK) + return hr; + *val = !lval; + return S_OK; + } + hr = get_column_index( table, expr->left->u.propval->name, &column ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 0e39d00..da4f84f 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -53,7 +53,8 @@ enum operator OP_NE = 8, OP_ISNULL = 9, OP_NOTNULL = 10, - OP_LIKE = 11 + OP_LIKE = 11, + OP_NOT = 12 }; struct expr; diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 58663d0..6eabe19 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -318,6 +318,12 @@ expr: if (!$$) YYABORT; } + | TK_NOT expr + { + $$ = expr_unary( ctx, $2, OP_NOT ); + if (!$$) + YYABORT; + } | prop_val TK_EQ const_val { $$ = expr_complex( ctx, $1, OP_EQ, $3 );

1 0

Hans Leidekker : wbemprox: Implement Win32_PhysicalMedia.Tag.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 14bc54d536bec5b57874dd12bec6df4a95ff9351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14bc54d536bec5b57874dd12b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 28 11:22:01 2014 +0100 wbemprox: Implement Win32_PhysicalMedia.Tag. --- dlls/wbemprox/builtin.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 449eb2f..118ec0a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -395,7 +395,8 @@ static const struct column col_param[] = }; static const struct column col_physicalmedia[] = { - { prop_serialnumberW, CIM_STRING } + { prop_serialnumberW, CIM_STRING }, + { prop_tagW, CIM_STRING } }; static const struct column col_process[] = { @@ -538,6 +539,8 @@ static const WCHAR os_nameW[] = '\\','P','a','r','t','i','t','i','o','n','1',0}; static const WCHAR os_versionW[] = {'5','.','1','.','2','6','0','0',0}; +static const WCHAR physicalmedia_tagW[] = + {'\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; static const WCHAR videocontroller_dactypeW[] = @@ -677,6 +680,7 @@ struct record_param struct record_physicalmedia { const WCHAR *serialnumber; + const WCHAR *tag; }; struct record_process { @@ -801,7 +805,7 @@ static const struct record_param data_param[] = static const struct record_physicalmedia data_physicalmedia[] = { - { diskdrive_serialW } + { diskdrive_serialW, physicalmedia_tagW } }; static const struct record_qualifier data_qualifier[] = {

1 0

Hans Leidekker : wbemprox: Implement Win32_DiskDrive.MediaType.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 59b9c36df54ecfaa2b5867064cb7731b6571584a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b9c36df54ecfaa2b5867064… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 28 11:21:11 2014 +0100 wbemprox: Implement Win32_DiskDrive.MediaType. --- dlls/wbemprox/builtin.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4b02ea2..449eb2f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -181,6 +181,8 @@ static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_maxclockspeedW[] = {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; +static const WCHAR prop_mediatypeW[] = + {'M','e','d','i','a','T','y','p','e',0}; static const WCHAR prop_memberW[] = {'M','e','m','b','e','r',0}; static const WCHAR prop_methodW[] = @@ -315,6 +317,7 @@ static const struct column col_diskdrive[] = { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_indexW, CIM_UINT32, VT_I4 }, { prop_manufacturerW, CIM_STRING }, + { prop_mediatypeW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_serialnumberW, CIM_STRING } }; @@ -507,10 +510,12 @@ static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; static const WCHAR diskdrive_deviceidW[] = {'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; -static const WCHAR diskdrive_modelW[] = - {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; static const WCHAR diskdrive_manufacturerW[] = {'(','S','t','a','n','d','a','r','d',' ','d','i','s','k',' ','d','r','i','v','e','s',')',0}; +static const WCHAR diskdrive_mediatypeW[] = + {'F','i','x','e','d',' ','h','a','r','d',' ','d','i','s','k',0}; +static const WCHAR diskdrive_modelW[] = + {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; static const WCHAR diskdrive_serialW[] = {'W','I','N','E','H','D','I','S','K',0}; static const WCHAR networkadapter_pnpdeviceidW[]= @@ -593,6 +598,7 @@ struct record_diskdrive const WCHAR *device_id; UINT32 index; const WCHAR *manufacturer; + const WCHAR *mediatype; const WCHAR *name; const WCHAR *serialnumber; }; @@ -762,7 +768,8 @@ static const struct record_bios data_bios[] = }; static const struct record_diskdrive data_diskdrive[] = { - { diskdrive_deviceidW, 0, diskdrive_manufacturerW, diskdrive_modelW, diskdrive_serialW } + { diskdrive_deviceidW, 0, diskdrive_manufacturerW, diskdrive_mediatypeW, diskdrive_modelW, + diskdrive_serialW } }; static const struct record_param data_param[] = {

1 0

Nikolay Sivov : kernel32: Partial implementation for GetCalendarInfoEx().
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 95142cad53df5d67f5061f9c7861b91a4c179f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95142cad53df5d67f5061f9c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 09:13:56 2014 +0400 kernel32: Partial implementation for GetCalendarInfoEx(). --- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/time.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index 7c6f6fe..7b3c86f 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -9,7 +9,7 @@ @ stdcall GetACP() kernel32.GetACP @ stdcall GetCPInfo(long ptr) kernel32.GetCPInfo @ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW -@ stub GetCalendarInfoEx +@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx @ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW @ stub GetFileMUIInfo @ stub GetFileMUIPath diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f7f3320..f8d3a80 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -442,6 +442,7 @@ @ stdcall GetCPInfoExW(long long ptr) @ stdcall GetCalendarInfoA(long long long ptr long ptr) @ stdcall GetCalendarInfoW(long long long ptr long ptr) +@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) # @ stub GetComPlusPackageInstallStatus @ stdcall GetCommConfig(long ptr long) @ stdcall GetCommMask(long ptr) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 77c71cb..4dc5d0e 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -798,6 +798,18 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, } /********************************************************************* + * GetCalendarInfoEx (KERNEL32.@) + */ +int WINAPI GetCalendarInfoEx(LPCWSTR locale, CALID calendar, LPCWSTR lpReserved, CALTYPE caltype, + LPWSTR data, int len, DWORD *value) +{ + LCID lcid = LocaleNameToLCID(locale, 0); + FIXME("(%s, %d, %p, 0x%08x, %p, %d, %p): semi-stub\n", debugstr_w(locale), calendar, lpReserved, caltype, + data, len, value); + return GetCalendarInfoW(lcid, calendar, caltype, data, len, value); +} + +/********************************************************************* * SetCalendarInfoA (KERNEL32.@) * */

1 0

Nikolay Sivov : dmime: COM cleanup of IDirectMusicGraph interface.
by Alexandre Julliard 03 Mar '14

03 Mar '14

Module: wine Branch: master Commit: 91ee56769c4037dc62b945e6b8f74554c0197f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ee56769c4037dc62b945e6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 08:57:06 2014 +0400 dmime: COM cleanup of IDirectMusicGraph interface. --- dlls/dmime/dmime_private.h | 17 -- dlls/dmime/graph.c | 512 +++++++++++++++++++++++--------------------- 2 files changed, 271 insertions(+), 258 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91ee56769c4037dc62b94…

1 0

André Hentschel : Fix WWN 364
by Jeremy Newman 03 Mar '14

03 Mar '14

Module: website Branch: master Commit: 5db1bc5c78614b128de572ba3c0d33d512564ec5 URL: http://source.winehq.org/git/website.git/?a=commit;h=5db1bc5c78614b128de572… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 3 18:51:28 2014 +0100 Fix WWN 364 --- wwn/en/wn20140303_364.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/wwn/en/wn20140303_364.xml b/wwn/en/wn20140303_364.xml index 2148c6a..3134161 100644 --- a/wwn/en/wn20140303_364.xml +++ b/wwn/en/wn20140303_364.xml @@ -87,11 +87,9 @@ Shortly after the last WWN, Marcus wrote: <p> Wine is an accepted organization for GSoC 2014, would-be students should now discuss project ideas with us as in one week the Student application period opens. </p> -<quote> <p> -For each article you buy, we donate part of our benefit to Wine HQ. This way we all win :) +See <a href="http://wiki.winehq.org/SummerOfCode">our Wiki</a> for more informations and project ideas. </p> -</quote> </section> <section @@ -101,11 +99,16 @@ For each article you buy, we donate part of our benefit to Wine HQ. This way we posts="0" > <p> -Ismael Barros once wrote: As the design seems to be liked, we just made the garments available for sale. As always, you can find them at <a href="http://www.freewear.org/?org=Wine">freewear.org</a>. +Ismael Barros once wrote: +</p> +<quote> +<p> +As the design seems to be liked, we just made the garments available for sale. As always, you can find them at <a href="http://www.freewear.org/?org=Wine">freewear.org</a> </p> <p> -Ismael Barros once wrote: As the design seems to be liked, we just made the garments available for sale. As always, you can find them at <a href="http://www.freewear.org/?org=Wine">freewear.org</a>. +For each article you buy, we donate part of our benefit to Wine HQ. This way we all win :) </p> +</quote> </section> <section

1 0

André Hentschel : Add WWN 364
by Jeremy Newman 03 Mar '14

03 Mar '14

Module: website Branch: master Commit: 9f7757ac780763c972910c426ed72d158d910761 URL: http://source.winehq.org/git/website.git/?a=commit;h=9f7757ac780763c972910c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 3 17:52:05 2014 +0100 Add WWN 364 --- news/de/2014030301.xml | 16 + news/en/2014030301.xml | 16 + wwn/en/wn20140303_364.xml | 1577 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1609 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=9f7757ac780763c972…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2014