July 2011 - Wine-Commits - list.winehq.org

Marcus Meissner : shell32: Check error return in get_known_folder_path ( Coverity).
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: a05ba2b9de7dcbc454f9d04cf1b3df4dffea57a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05ba2b9de7dcbc454f9d04cf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jul 14 08:45:00 2011 +0200 shell32: Check error return in get_known_folder_path (Coverity). --- dlls/shell32/shellpath.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 58e2006..4b14739 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3422,9 +3422,14 @@ static HRESULT get_known_folder_path( if(hr == S_OK) { /* get parent's known folder path (recursive) */ - get_known_folder_registry_path(NULL, parentGuid, &parentRegistryPath); + hr = get_known_folder_registry_path(NULL, parentGuid, &parentRegistryPath); + if(!SUCCEEDED(hr)) return hr; hr = get_known_folder_path(parentGuid, parentRegistryPath, &parentPath); + if(!SUCCEEDED(hr)) { + HeapFree(GetProcessHeap(), 0, parentRegistryPath); + return hr; + } lstrcatW(path, parentPath); lstrcatW(path, sBackslash);

1 0

Marcus Meissner : dinput: const REFIID is duplicate const (Coverity).
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: 3dc66a9d6dbeaa0b9a4bab26122ad562631412cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc66a9d6dbeaa0b9a4bab261… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jul 14 08:44:59 2011 +0200 dinput: const REFIID is duplicate const (Coverity). --- dlls/dinput/tests/dinput.c | 24 ++++++++++++------------ dlls/dinput8/tests/dinput.c | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 34f5a91..90a8266 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -201,16 +201,16 @@ static void test_DirectInputCreateEx(void) {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE, DIERR_OLDDIRECTINPUTVERSION, NULL}, }; - static const REFIID no_interface_list[] = {&IID_IUnknown, &IID_IDirectInput8A, - &IID_IDirectInput8W, &IID_IDirectInputDeviceA, - &IID_IDirectInputDeviceW, &IID_IDirectInputDevice2A, - &IID_IDirectInputDevice2W, &IID_IDirectInputDevice7A, - &IID_IDirectInputDevice7W, &IID_IDirectInputDevice8A, - &IID_IDirectInputDevice8W, &IID_IDirectInputEffect}; + static REFIID no_interface_list[] = {&IID_IUnknown, &IID_IDirectInput8A, + &IID_IDirectInput8W, &IID_IDirectInputDeviceA, + &IID_IDirectInputDeviceW, &IID_IDirectInputDevice2A, + &IID_IDirectInputDevice2W, &IID_IDirectInputDevice7A, + &IID_IDirectInputDevice7W, &IID_IDirectInputDevice8A, + &IID_IDirectInputDevice8W, &IID_IDirectInputEffect}; - static const REFIID iid_list[] = {&IID_IDirectInputA, &IID_IDirectInputW, - &IID_IDirectInput2A, &IID_IDirectInput2W, - &IID_IDirectInput7A, &IID_IDirectInput7W}; + static REFIID iid_list[] = {&IID_IDirectInputA, &IID_IDirectInputW, + &IID_IDirectInput2A, &IID_IDirectInput2W, + &IID_IDirectInput7A, &IID_IDirectInput7W}; int i, j; IUnknown *pUnk; @@ -270,9 +270,9 @@ static void test_DirectInputCreateEx(void) static void test_QueryInterface(void) { - static const REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInputA, &IID_IDirectInputW, - &IID_IDirectInput2A, &IID_IDirectInput2W, - &IID_IDirectInput7A, &IID_IDirectInput7W}; + static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInputA, &IID_IDirectInputW, + &IID_IDirectInput2A, &IID_IDirectInput2W, + &IID_IDirectInput7A, &IID_IDirectInput7W}; static const struct { diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index 5f61634..88c4c5a 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -176,16 +176,16 @@ static void test_DirectInput8Create(void) {TRUE, DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, TRUE, DIERR_OLDDIRECTINPUTVERSION}, }; - static const REFIID no_interface_list[] = {&IID_IDirectInputA, &IID_IDirectInputW, - &IID_IDirectInput2A, &IID_IDirectInput2W, - &IID_IDirectInput7A, &IID_IDirectInput7W, - &IID_IDirectInputDeviceA, &IID_IDirectInputDeviceW, - &IID_IDirectInputDevice2A, &IID_IDirectInputDevice2W, - &IID_IDirectInputDevice7A, &IID_IDirectInputDevice7W, - &IID_IDirectInputDevice8A, &IID_IDirectInputDevice8W, - &IID_IDirectInputEffect}; + static REFIID no_interface_list[] = {&IID_IDirectInputA, &IID_IDirectInputW, + &IID_IDirectInput2A, &IID_IDirectInput2W, + &IID_IDirectInput7A, &IID_IDirectInput7W, + &IID_IDirectInputDeviceA, &IID_IDirectInputDeviceW, + &IID_IDirectInputDevice2A, &IID_IDirectInputDevice2W, + &IID_IDirectInputDevice7A, &IID_IDirectInputDevice7W, + &IID_IDirectInputDevice8A, &IID_IDirectInputDevice8W, + &IID_IDirectInputEffect}; - static const REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W}; + static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W}; int i; IUnknown *pUnk; @@ -225,7 +225,7 @@ static void test_DirectInput8Create(void) static void test_QueryInterface(void) { - static const REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W}; + static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W}; static const struct {

1 0

Marcus Meissner : gdiplus: Check return values of GdipCreateMatrix(2) ( Coverity).
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: f0392c77bc0eb59f1e0212a1a160f625d70cd5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0392c77bc0eb59f1e0212a1a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jul 14 08:45:01 2011 +0200 gdiplus: Check return values of GdipCreateMatrix(2) (Coverity). --- dlls/gdiplus/tests/graphics.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 3df57f1..0d31365 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -546,8 +546,9 @@ static void test_BeginContainer2(void) status = GdipBeginContainer2(graphics, &cont1); expect(Ok, status); - GdipCreateMatrix2(defTrans[0], defTrans[1], defTrans[2], defTrans[3], + status = GdipCreateMatrix2(defTrans[0], defTrans[1], defTrans[2], defTrans[3], defTrans[4], defTrans[5], &transform); + expect(Ok, status); GdipSetWorldTransform(graphics, transform); GdipDeleteMatrix(transform); transform = NULL; @@ -555,7 +556,8 @@ static void test_BeginContainer2(void) status = GdipBeginContainer2(graphics, &cont2); expect(Ok, status); - GdipCreateMatrix2(10, 20, 30, 40, 50, 60, &transform); + status = GdipCreateMatrix2(10, 20, 30, 40, 50, 60, &transform); + expect(Ok, status); GdipSetWorldTransform(graphics, transform); GdipDeleteMatrix(transform); transform = NULL; @@ -563,7 +565,8 @@ static void test_BeginContainer2(void) status = GdipEndContainer(graphics, cont2); expect(Ok, status); - GdipCreateMatrix(&transform); + status = GdipCreateMatrix(&transform); + expect(Ok, status); GdipGetWorldTransform(graphics, transform); GdipGetMatrixElements(transform, elems); ok(fabs(defTrans[0] - elems[0]) < 0.0001 && @@ -1430,7 +1433,8 @@ static void test_Get_Release_DC(void) rectf[i].Width = (REAL)rect[i].Width; } - GdipCreateMatrix(&m); + status = GdipCreateMatrix(&m); + expect(Ok, status); GdipCreateRegion(&region); GdipCreateSolidFill((ARGB)0xdeadbeef, &brush); GdipCreatePath(FillModeAlternate, &path); @@ -3036,7 +3040,8 @@ static void test_string_functions(void) for (i=0; i<4; i++) GdipDeleteRegion(regions[i]); - GdipCreateMatrix(&identity); + status = GdipCreateMatrix(&identity); + expect(Ok, status); position.X = 0; position.Y = 0;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: d598445bf1467028bd3e5baab0120f08327961ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d598445bf1467028bd3e5baab… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jul 5 21:11:04 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 32 +++++++++++++------------------- 1 files changed, 13 insertions(+), 19 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2d22ae1..c6f4269 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-06-18 15:20+0300\n" +"PO-Revision-Date: 2011-07-13 22:17+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -6377,7 +6377,7 @@ msgstr "&Atkurti" #: shell32.rc:83 msgid "&Erase" -msgstr "" +msgstr "&Išvalyti" #: shell32.rc:95 msgid "E&xplore" @@ -6762,44 +6762,40 @@ msgid "There is no Windows program configured to open this type of file." msgstr "Jokia Windows programa nėra sukonfigūruota atidaryti šio tipo failų." #: shell32.rc:255 -#, fuzzy msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "Ar tikrai norite pašalinti „%1“?" +msgstr "Ar tikrai norite negrįžtamai pašalinti „%1“?" #: shell32.rc:256 -#, fuzzy msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "Ar tikrai norite pašalinti šiuos %1 elementus?" +msgstr "Ar tikrai norite negrįžtamai pašalinti šiuos %1 elementus?" #: shell32.rc:257 -#, fuzzy msgid "Confirm deletion" -msgstr "Patvirtinti failo šalinimą" +msgstr "Patvirtinti šalinimą" #: shell32.rc:258 -#, fuzzy msgid "" "A file already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"Failas jau egzistuoja.\n" +"Failas jau egzistuoja adresu %1.\n" +"\n" "Ar norite jį pakeisti?" #: shell32.rc:259 -#, fuzzy msgid "" "A folder already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"Failas jau egzistuoja.\n" +"Aplankas jau egzistuoja adresu %1.\n" +"\n" "Ar norite jį pakeisti?" #: shell32.rc:260 -#, fuzzy msgid "Confirm overwrite" -msgstr "Patvirtinti failo perrašymą" +msgstr "Patvirtinti perrašymą" #: shell32.rc:277 msgid "" @@ -8465,9 +8461,8 @@ msgid "Wine Explorer" msgstr "Wine naršyklė" #: explorer.rc:29 -#, fuzzy msgid "Location:" -msgstr "Vieta" +msgstr "Vieta:" #: hostname.rc:27 msgid "Usage: hostname\n" @@ -9565,7 +9560,6 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Eksportuoja pasirinktą registro šaką į tekstinį failą" #: start.rc:46 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9604,10 +9598,10 @@ msgstr "" "/Unix Naudoti Unix failo vardą ir paleisti failą kaip windows " "naršyklėje.\n" "/L Parodyti galutinio naudotojo licenciją.\n" +"/? Parodyti šį pranešimą ir išeiti.\n" "\n" "start.exe versija 0.2 (C) 2003, Dan Kegel\n" -"Start pateikiama BE JOKIŲ GARANTIJŲ; detales rasite paleidę su /L " -"parametru.\n" +"Start pateikiama BE JOKIŲ GARANTIJŲ; detales rasite paleidę su /L parametru.\n" "Ši programa yra laisva programinė įranga; galite ją platinti\n" "tam tikromis sąlygomis; paleiskite „start /L“ išsamiai informacijai gauti.\n"

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: 8c74dc708a5b21058370da8ba3351d567c7d0ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c74dc708a5b21058370da8ba… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 13 23:48:39 2011 +0900 po: Update Japanese translation. --- po/ja.po | 33 ++++++++++++++------------------- 1 files changed, 14 insertions(+), 19 deletions(-) diff --git a/po/ja.po b/po/ja.po index df81c05..88105c7 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-06-20 22:04+0900\n" +"PO-Revision-Date: 2011-07-13 21:47+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -6368,7 +6368,7 @@ msgstr "元のサイズに戻す(&R)" #: shell32.rc:83 msgid "&Erase" -msgstr "" +msgstr "消去(&E)" #: shell32.rc:95 msgid "E&xplore" @@ -6749,44 +6749,40 @@ msgid "There is no Windows program configured to open this type of file." msgstr "このファイルの種類に関連付けられた Windows プログラムはありません。" #: shell32.rc:255 -#, fuzzy msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "'%1' を削除しますか?" +msgstr "'%1' を完全に削除しますか?" #: shell32.rc:256 -#, fuzzy msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "これら %1 ファイルを削除しますか?" +msgstr "これら %1 項目を完全に削除しますか?" #: shell32.rc:257 -#, fuzzy msgid "Confirm deletion" -msgstr "ファイルの削除の確認" +msgstr "削除の確認" #: shell32.rc:258 -#, fuzzy msgid "" "A file already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"ファイルは既に存在します。\n" -"上書きしますか?" +"ファイルは %1 にすでに存在します。\n" +"\n" +"既存のファイルを置き換えますか?" #: shell32.rc:259 -#, fuzzy msgid "" "A folder already exists at the path %1.\n" "\n" "Do you want to replace it?" msgstr "" -"ファイルは既に存在します。\n" -"上書きしますか?" +"フォルダは %1 にすでに存在します。\n" +"\n" +"既存のフォルダを置き換えますか?" #: shell32.rc:260 -#, fuzzy msgid "Confirm overwrite" -msgstr "ファイルの上書きの確認" +msgstr "上書きの確認" #: shell32.rc:277 msgid "" @@ -8447,9 +8443,8 @@ msgid "Wine Explorer" msgstr "Wine エクスプローラ" #: explorer.rc:29 -#, fuzzy msgid "Location:" -msgstr "場所" +msgstr "場所:" #: hostname.rc:27 msgid "Usage: hostname\n" @@ -9546,7 +9541,6 @@ msgid "Exports selected branch of the registry to a text file" msgstr "選択したレジストリキー以下をテキストファイルに出力" #: start.rc:46 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9586,6 +9580,7 @@ msgstr "" "ルを開始します。\n" "/ProgIDOpen 直後に指定した progID を利用して文書を開きます。\n" "/L エンドユーザライセンスを表示します。\n" +"/? このヘルプを表示し、終了します。\n" "\n" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" "Start は完全に無保証です。詳細は /L オプションをつけて起動してください。\n"

1 0

Henri Verbeet : wined3d: Make the context and device parameters to find_draw_buffers_mask() const.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: 9375a87c86796ce9363b802a894e2386c196c142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9375a87c86796ce9363b802a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 14 01:02:47 2011 +0200 wined3d: Make the context and device parameters to find_draw_buffers_mask() const. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e1e0d87..306d2f7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2149,7 +2149,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d return TRUE; } -static DWORD find_draw_buffers_mask(struct wined3d_context *context, struct wined3d_device *device) +static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_device *device) { const struct wined3d_state *state = &device->stateBlock->state; struct wined3d_surface **rts = state->fb->render_targets;

1 0

Henri Verbeet : wined3d: Get rid of the clip status code.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: 565fcbdfb88971973a612e66408bfb2fdc031f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=565fcbdfb88971973a612e664… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 14 01:02:46 2011 +0200 wined3d: Get rid of the clip status code. I'm pretty sure this is just broken, and I'm not aware of any application using this. --- dlls/wined3d/device.c | 6 ------ dlls/wined3d/state.c | 12 ------------ dlls/wined3d/stateblock.c | 4 ---- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 0 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b2dd89a..4f7ab3b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2242,9 +2242,6 @@ HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, cons if (!clip_status) return WINED3DERR_INVALIDCALL; - device->updateStateBlock->state.clip_status.ClipUnion = clip_status->ClipUnion; - device->updateStateBlock->state.clip_status.ClipIntersection = clip_status->ClipIntersection; - return WINED3D_OK; } @@ -2255,9 +2252,6 @@ HRESULT CDECL wined3d_device_get_clip_status(struct wined3d_device *device, WINE if (!clip_status) return WINED3DERR_INVALIDCALL; - clip_status->ClipUnion = device->updateStateBlock->state.clip_status.ClipUnion; - clip_status->ClipIntersection = device->updateStateBlock->state.clip_status.ClipIntersection; - return WINED3D_OK; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ee521a4..42a7a31 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -573,18 +573,6 @@ static void state_clipping(DWORD state_id, struct wined3d_stateblock *stateblock if (disable & WINED3DCLIPPLANE3) { glDisable(GL_CLIP_PLANE3); checkGLcall("glDisable(clip plane 3)"); } if (disable & WINED3DCLIPPLANE4) { glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)"); } if (disable & WINED3DCLIPPLANE5) { glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); } - - /** update clipping status */ - if (enable) - { - stateblock->state.clip_status.ClipUnion = 0; - stateblock->state.clip_status.ClipIntersection = 0xFFFFFFFF; - } - else - { - stateblock->state.clip_status.ClipUnion = 0; - stateblock->state.clip_status.ClipIntersection = 0; - } } static void state_blendop_w(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index a9baa0e..6764b23 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1233,10 +1233,6 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3DRS_DESTBLENDALPHA] = WINED3DBLEND_ZERO; state->render_states[WINED3DRS_BLENDOPALPHA] = WINED3DBLENDOP_ADD; - /* clipping status */ - state->clip_status.ClipUnion = 0; - state->clip_status.ClipIntersection = 0xFFFFFFFF; - /* Texture Stage States - Put directly into state block, we will call function below */ for (i = 0; i < MAX_TEXTURES; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dc036fc..da01906 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2265,7 +2265,6 @@ struct wined3d_state WINED3DMATRIX transforms[HIGHEST_TRANSFORMSTATE + 1]; double clip_planes[MAX_CLIPPLANES][4]; - WINED3DCLIPSTATUS clip_status; WINED3DMATERIAL material; WINED3DVIEWPORT viewport; RECT scissor_rect;

1 0

Henri Verbeet : wined3d: Store a pointer to the framebuffer state in struct wined3d_state.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: fcf4303e1a4bfacc97aea184ca0a57c44a389e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf4303e1a4bfacc97aea184c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 14 01:02:44 2011 +0200 wined3d: Store a pointer to the framebuffer state in struct wined3d_state. --- dlls/wined3d/arb_program_shader.c | 18 +++--- dlls/wined3d/context.c | 17 ++++--- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 101 ++++++++++++++++++++----------------- dlls/wined3d/stateblock.c | 2 + dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 2 + 7 files changed, 79 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcf4303e1a4bfacc97aea…

1 0

Henri Verbeet : wined3d: Remove the unused untransformed field from struct wined3d_device.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: 5e83efa1b2217243b0e0a1d5698ee43b6950af96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e83efa1b2217243b0e0a1d56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 14 01:02:45 2011 +0200 wined3d: Remove the unused untransformed field from struct wined3d_device. --- dlls/wined3d/state.c | 12 ++---------- dlls/wined3d/wined3d_private.h | 3 +-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7115314..ee521a4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4544,7 +4544,7 @@ static void vertexdeclaration(DWORD state_id, struct wined3d_stateblock *statebl { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_state *state = &stateblock->state; - struct wined3d_device *device = stateblock->device; + const struct wined3d_device *device = stateblock->device; BOOL useVertexShaderFunction = use_vs(state); BOOL usePixelShaderFunction = use_ps(state); BOOL updateFog = FALSE; @@ -4556,15 +4556,7 @@ static void vertexdeclaration(DWORD state_id, struct wined3d_stateblock *statebl if (transformed != context->last_was_rhw && !useVertexShaderFunction) updateFog = TRUE; - if (transformed) { - context->last_was_rhw = TRUE; - } else { - - /* Untransformed, so relies on the view and projection matrices */ - context->last_was_rhw = FALSE; - /* This turns off the Z scale trick to 'disable' viewport frustum clipping in rhw mode*/ - device->untransformed = TRUE; - } + context->last_was_rhw = transformed; /* Don't have to apply the matrices when vertex shaders are used. When vshaders are turned * off this function will be called again anyway to make sure they're properly set diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 10a35b9..dc036fc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1654,7 +1654,6 @@ struct wined3d_device DWORD vs_clipping; WORD view_ident : 1; /* true iff view matrix is identity */ - WORD untransformed : 1; WORD vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ WORD isRecordingState : 1; WORD isInDraw : 1; @@ -1665,7 +1664,7 @@ struct wined3d_device WORD useDrawStridedSlow : 1; WORD instancedDraw : 1; WORD filter_messages : 1; - WORD padding : 4; + WORD padding : 5; BYTE fixed_function_usage_map; /* MAX_TEXTURES, 8 */

1 0

Alexandre Julliard : winex11: Add support for bottom-up format in PutImage.
by Alexandre Julliard July 14, 2011

July 14, 2011

Module: wine Branch: master Commit: eeb3625dce04836fb33dcaad32cb2d843e09c685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb3625dce04836fb33dcaad3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 14 13:09:38 2011 +0200 winex11: Add support for bottom-up format in PutImage. --- dlls/winex11.drv/bitblt.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index d76ceba..f252e42 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1641,8 +1641,8 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits ) { BOOL need_byteswap; - int x, y, height = -info->bmiHeader.biHeight; - unsigned int width_bytes = image->bytes_per_line; + int x, y, height = abs(info->bmiHeader.biHeight); + int width_bytes = image->bytes_per_line; unsigned char *src, *dst; switch (info->bmiHeader.biBitCount) @@ -1666,7 +1666,7 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, break; } - if ((need_byteswap && !src_bits->is_copy) || (width_bytes & 3)) + if ((need_byteswap && !src_bits->is_copy) || (width_bytes & 3) || (info->bmiHeader.biHeight > 0)) { width_bytes = (width_bytes + 3) & ~3; info->bmiHeader.biSizeImage = height * width_bytes; @@ -1689,6 +1689,12 @@ static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, src = src_bits->ptr; dst = dst_bits->ptr; + if (info->bmiHeader.biHeight > 0) + { + dst += (height - 1) * width_bytes; + width_bytes = -width_bytes; + } + if (need_byteswap) { switch (info->bmiHeader.biBitCount) @@ -1768,7 +1774,6 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str if (info->bmiHeader.biPlanes != 1) goto update_format; if (info->bmiHeader.biBitCount != format->bits_per_pixel) goto update_format; - if (info->bmiHeader.biHeight > 0) goto update_format; /* bottom-up not supported */ /* FIXME: could try to handle 1-bpp using XCopyPlane */ if (info->bmiHeader.biCompression == BI_BITFIELDS) @@ -1804,7 +1809,7 @@ DWORD X11DRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, const str wine_tsx11_lock(); image = XCreateImage( gdi_display, visual, depth, ZPixmap, 0, NULL, - info->bmiHeader.biWidth, -info->bmiHeader.biHeight, 32, 0 ); + info->bmiHeader.biWidth, abs(info->bmiHeader.biHeight), 32, 0 ); wine_tsx11_unlock(); if (!image) return ERROR_OUTOFMEMORY;

1 0