September 2011 - Wine-commits

Henri Verbeet : wined3d: Don' t print the context recreation FIXME for FBO ORM.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 66637ea35cceb4aed9e276e145ba24310f8a269d URL: http://source.winehq.org/git/wine.git/?a=commit;h=66637ea35cceb4aed9e276e14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 12 19:51:17 2011 +0200 wined3d: Don't print the context recreation FIXME for FBO ORM. With FBOs we can just render offscreen to an appropriate depth/stencil buffer. --- dlls/wined3d/swapchain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index d8cc0c9..126a991 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1023,8 +1023,9 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, WINED3DSURFTY goto err; } - if (!present_parameters->EnableAutoDepthStencil - || swapchain->presentParms.AutoDepthStencilFormat != swapchain->ds_format->id) + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && (!present_parameters->EnableAutoDepthStencil + || swapchain->presentParms.AutoDepthStencilFormat != swapchain->ds_format->id)) { FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); }

1 0

Henri Verbeet : wined3d: Rename markTextureStagesDirty() to device_invalidate_texture_stage().
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 4ba464bd4cad9f04b72e81551a909059303f73a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba464bd4cad9f04b72e81551… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 12 19:51:18 2011 +0200 wined3d: Rename markTextureStagesDirty() to device_invalidate_texture_stage(). --- dlls/wined3d/device.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fe0d5fe..ee556c6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2833,7 +2833,7 @@ HRESULT CDECL wined3d_device_get_vs_consts_f(struct wined3d_device *device, return WINED3D_OK; } -static inline void markTextureStagesDirty(struct wined3d_device *device, DWORD stage) +static void device_invalidate_texture_stage(const struct wined3d_device *device, DWORD stage) { DWORD i; @@ -2913,7 +2913,7 @@ static void device_map_fixed_function_samplers(struct wined3d_device *device, co { device_map_stage(device, i, i); device_invalidate_state(device, STATE_SAMPLER(i)); - markTextureStagesDirty(device, i); + device_invalidate_texture_stage(device, i); } } return; @@ -2929,7 +2929,7 @@ static void device_map_fixed_function_samplers(struct wined3d_device *device, co { device_map_stage(device, i, tex); device_invalidate_state(device, STATE_SAMPLER(i)); - markTextureStagesDirty(device, i); + device_invalidate_texture_stage(device, i); } ++tex; @@ -2949,9 +2949,7 @@ static void device_map_psamplers(struct wined3d_device *device, const struct win device_map_stage(device, i, i); device_invalidate_state(device, STATE_SAMPLER(i)); if (i < gl_info->limits.texture_stages) - { - markTextureStagesDirty(device, i); - } + device_invalidate_texture_stage(device, i); } } }

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_vs_consts_f() const.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: c67ca538bb3e15bd58d2be4a6a29cef4b1945b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c67ca538bb3e15bd58d2be4a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 12 19:51:19 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_vs_consts_f() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ee556c6..1dc6cbc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2817,7 +2817,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_vs_consts_f(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_vs_consts_f(const struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count) { int count = min(vector4f_count, device->d3d_vshader_constantF - start_register); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5327beb..26edff1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2268,7 +2268,7 @@ struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wi HRESULT __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, WINED3DVIEWPORT *viewport); HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); -HRESULT __cdecl wined3d_device_get_vs_consts_f(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count);

1 0

Vincent Povirk : ole32/tests: Test creation of a storage on an ILockBytes containing data.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 7df35e9b0ff656362600c07768c38a92c69b87ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df35e9b0ff656362600c0776… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 12 11:46:46 2011 -0500 ole32/tests: Test creation of a storage on an ILockBytes containing data. --- dlls/ole32/tests/storage32.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 233ebcc..d0e5236 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2943,6 +2943,52 @@ static void test_copyto_recursive(void) ok( r == TRUE, "deleted file\n"); } +static void test_hglobal_storage_creation(void) +{ + ILockBytes *ilb = NULL; + IStorage *stg = NULL; + HRESULT r; + STATSTG stat; + char junk[512]; + ULARGE_INTEGER offset; + + r = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(r == S_OK, "CreateILockBytesOnHGlobal failed, hr=%x\n", r); + + offset.QuadPart = 0; + memset(junk, 0xaa, 512); + r = ILockBytes_WriteAt(ilb, offset, junk, 512, NULL); + ok(r == S_OK, "ILockBytes_WriteAt failed, hr=%x\n", r); + + offset.QuadPart = 2000; + r = ILockBytes_WriteAt(ilb, offset, junk, 512, NULL); + ok(r == S_OK, "ILockBytes_WriteAt failed, hr=%x\n", r); + + r = StgCreateDocfileOnILockBytes(ilb, STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stg); + ok(r == S_OK, "StgCreateDocfileOnILockBytes failed, hr=%x\n", r); + + IStorage_Release(stg); + + r = StgOpenStorageOnILockBytes(ilb, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, + NULL, 0, &stg); + todo_wine ok(r == S_OK, "StgOpenStorageOnILockBytes failed, hr=%x\n", r); + + if (SUCCEEDED(r)) + { + r = IStorage_Stat(stg, &stat, STATFLAG_NONAME); + ok(r == S_OK, "StgOpenStorageOnILockBytes failed, hr=%x\n", r); + ok(IsEqualCLSID(&stat.clsid, &GUID_NULL), "unexpected CLSID value\n"); + + IStorage_Release(stg); + } + + r = ILockBytes_Stat(ilb, &stat, STATFLAG_NONAME); + ok(r == S_OK, "ILockBytes_Stat failed, hr=%x\n", r); + ok(stat.cbSize.LowPart < 2512, "expected truncated size, got %d\n", stat.cbSize.LowPart); + + ILockBytes_Release(ilb); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -2985,4 +3031,5 @@ START_TEST(storage32) test_substorage_enum(); test_copyto_locking(); test_copyto_recursive(); + test_hglobal_storage_creation(); }

1 0

Vincent Povirk : ole32: Discard existing data when creating a new storage on an ILockBytes.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: cb9e572611a4f046f1f538239824fe623947ad81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9e572611a4f046f1f538239… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 12 12:50:18 2011 -0500 ole32: Discard existing data when creating a new storage on an ILockBytes. --- dlls/ole32/storage32.c | 4 ++++ dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index e983bf3..69a00cd 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2740,6 +2740,10 @@ static HRESULT StorageImpl_Construct( ULARGE_INTEGER size; BYTE bigBlockBuffer[MAX_BIG_BLOCK_SIZE]; + /* Discard any existing data. */ + size.QuadPart = 0; + ILockBytes_SetSize(This->lockBytes, size); + /* * Initialize all header variables: * - The big block depot consists of one block and it is at block 0 diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index d0e5236..b8c6ada 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2971,7 +2971,7 @@ static void test_hglobal_storage_creation(void) r = StgOpenStorageOnILockBytes(ilb, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); - todo_wine ok(r == S_OK, "StgOpenStorageOnILockBytes failed, hr=%x\n", r); + ok(r == S_OK, "StgOpenStorageOnILockBytes failed, hr=%x\n", r); if (SUCCEEDED(r)) {

1 0

Dan Kegel : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: c5d45e8b88c490feaaf5b066b1e2ec8cf17e07cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d45e8b88c490feaaf5b066b… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Sep 12 14:16:27 2011 -0700 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 7a39054..3cb698f 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -58,7 +58,7 @@ static HRESULT WINAPI enum_z_fmt(DDPIXELFORMAT *fmt, void *ctx) { DDPIXELFORMAT *zfmt = ctx; - if(U1(fmt)->dwZBufferBitDepth > U1(zfmt)->dwZBufferBitDepth) + if(U1(*fmt).dwZBufferBitDepth > U1(*zfmt).dwZBufferBitDepth) { *zfmt = *fmt; }

1 0

Lucas Fialho Zawacki : dinput: Initialize device count to 0 in config.c.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 03fa9f627b81c7129d9a7c1591e93f8aa3dd1b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fa9f627b81c7129d9a7c159… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Sep 13 02:54:58 2011 -0300 dinput: Initialize device count to 0 in config.c. --- dlls/dinput/config.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index dee76a3..98a542c 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -191,6 +191,7 @@ static void init_devices(HWND dialog, IDirectInput8W *lpDI, DIDevicesData *data, int i; /* Count devices */ + data->ndevices = 0; IDirectInput8_EnumDevicesBySemantics(lpDI, NULL, lpdiaf, count_devices, (LPVOID) data, 0); /* Allocate devices */

1 0

Lucas Fialho Zawacki : dinput: Fill dialog with info about the first device by default in config.c.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 32800de137a8e5f230486e7e93a0736862725aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=32800de137a8e5f230486e7e9… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Sep 13 02:55:00 2011 -0300 dinput: Fill dialog with info about the first device by default in config.c. --- dlls/dinput/config.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 98a542c..1098259 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -374,6 +374,10 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w data->original_lpdiaf->rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*data->lpdiaf->dwNumActions); copy_actions(data->original_lpdiaf, data->lpdiaf); + /* Select the first device and show its actions */ + SendDlgItemMessageW(dialog, IDC_CONTROLLERCOMBO, CB_SETCURSEL, 0, 0); + fill_device_object_list(dialog); + break; }

1 0

Francois Gouget : attrib: Escape the start-of-line spaces to fix the usage message indentation.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 1a75268d72b222543a9d40463cf2c6c09aee700c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a75268d72b222543a9d40463… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 12 23:10:32 2011 +0200 attrib: Escape the start-of-line spaces to fix the usage message indentation. --- po/ar.po | 25 +++++++++++------------ po/bg.po | 25 +++++++++++------------ po/ca.po | 25 +++++++++++------------ po/cs.po | 25 +++++++++++------------ po/da.po | 25 +++++++++++------------ po/de.po | 25 +++++++++++------------ po/el.po | 25 +++++++++++------------ po/en.po | 25 +++++++++++------------ po/en_US.po | 48 +++++++++++++++++++++----------------------- po/eo.po | 25 +++++++++++------------ po/es.po | 25 +++++++++++------------ po/fa.po | 25 +++++++++++------------ po/fi.po | 25 +++++++++++------------ po/fr.po | 26 ++++++++++++------------ po/he.po | 25 +++++++++++------------ po/hi.po | 25 +++++++++++------------ po/hu.po | 25 +++++++++++------------ po/it.po | 25 +++++++++++------------ po/ja.po | 26 ++++++++++++------------ po/ko.po | 26 ++++++++++++------------ po/lt.po | 26 ++++++++++++------------ po/ml.po | 25 +++++++++++------------ po/nb_NO.po | 25 +++++++++++------------ po/nl.po | 25 +++++++++++------------ po/or.po | 25 +++++++++++------------ po/pa.po | 25 +++++++++++------------ po/pl.po | 25 +++++++++++------------ po/pt_BR.po | 25 +++++++++++------------ po/pt_PT.po | 25 +++++++++++------------ po/rm.po | 25 +++++++++++------------ po/ro.po | 25 +++++++++++------------ po/ru.po | 25 +++++++++++------------ po/sk.po | 25 +++++++++++------------ po/sl.po | 25 +++++++++++------------ po/sr_RS(a)cyrillic.po | 25 +++++++++++------------ po/sr_RS(a)latin.po | 25 +++++++++++------------ po/sv.po | 25 +++++++++++------------ po/te.po | 25 +++++++++++------------ po/th.po | 25 +++++++++++------------ po/tr.po | 25 +++++++++++------------ po/uk.po | 25 +++++++++++------------ po/wa.po | 25 +++++++++++------------ po/wine.pot | 25 +++++++++++------------ po/zh_CN.po | 25 +++++++++++------------ po/zh_TW.po | 25 +++++++++++------------ programs/attrib/attrib.rc | 25 +++++++++++------------ 46 files changed, 567 insertions(+), 610 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a75268d72b222543a9d4…

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: 8973c20f7dda16fb7e650145b6c09b2f13a8d4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8973c20f7dda16fb7e650145b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 12 23:14:33 2011 +0200 Assorted spelling fixes. --- dlls/ddraw/ddraw.c | 2 +- dlls/shlwapi/tests/string.c | 4 ++-- dlls/urlmon/tests/sec_mgr.c | 2 +- po/pt_BR.po | 2 +- po/sl.po | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d48aa01..faa4125 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5748,7 +5748,7 @@ static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_pa UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, struct wined3d_surface **surface) { - ERR("DirectDraw doesn't have and shoudn't try creating implicit depth buffers.\n"); + ERR("DirectDraw doesn't have and shouldn't try creating implicit depth buffers.\n"); return E_NOTIMPL; } diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 1488e58..64e5b59 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -953,7 +953,7 @@ if (0) { memset(buf, 0xbf, sizeof(buf)); ret = pwnsprintfA(buf, 10, "%s", str1); - ok(broken(ret == 9) || ret == -1 /* Vista */, "Unexpected wsnprintfA return %d, expected 9 or -1\n", ret); + ok(broken(ret == 9) || ret == -1 /* Vista */, "Unexpected wnsprintfA return %d, expected 9 or -1\n", ret); expect_eq(buf[9], 0, CHAR, "%x"); expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); } @@ -964,7 +964,7 @@ if (0) { memset(wbuf, 0xbf, sizeof(wbuf)); ret = pwnsprintfW(wbuf, 10, fmt, wstr1); - ok(broken(ret == 9) || ret == -1 /* Vista */, "Unexpected wsnprintfW return %d, expected 9 or -1\n", ret); + ok(broken(ret == 9) || ret == -1 /* Vista */, "Unexpected wnsprintfW return %d, expected 9 or -1\n", ret); expect_eq(wbuf[9], 0, WCHAR, "%x"); expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); } diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index f94e791..fd74fbd 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1561,7 +1561,7 @@ static void test_InternetGetSecurityUrlEx_Pluggable(void) HRESULT hr; IUri *uri = NULL, *result; - trace("testing CoInternetGetSecurityUrlEx for plugable protocols...\n"); + trace("testing CoInternetGetSecurityUrlEx for pluggable protocols...\n"); hr = pCreateUri(security_urlW, 0, 0, &uri); ok(hr == S_OK, "CreateUri returned 0x%08x\n", hr); diff --git a/po/pt_BR.po b/po/pt_BR.po index 7c286a9..8ea9fc2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5644,7 +5644,7 @@ msgstr "" "Windows Installer %s\n" "\n" "Modo de usar:\n" -"msiexec command {required parameter} [optional parammeter]\n" +"msiexec command {required parameter} [optional parameter]\n" "\n" "Instalar um produto:\n" "\t/i {package|productcode} [property]\n" diff --git a/po/sl.po b/po/sl.po index 1f469a1..018d919 100644 --- a/po/sl.po +++ b/po/sl.po @@ -5449,7 +5449,7 @@ msgstr "" "Windows namestilnik %s\n" "\n" "Uporaba:\n" -"msiexec ukaz {zahtevan parameter} [izbirni parammeter]\n" +"msiexec ukaz {zahtevan parameter} [izbirni parameter]\n" "\n" "Namesti product:\n" "\t/i {paket|koda_produkta} [lastnost]\n"

1 0