June 2009 - Wine-Commits - list.winehq.org

Hwang YunSong : start: Updated Korean resource.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 75b89c931b8ad14557e1068210b37ad050fc7870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b89c931b8ad14557e106821… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Jun 22 09:46:15 2009 +0900 start: Updated Korean resource. --- programs/start/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index bc58ebc..871aadc 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -35,7 +35,7 @@ Options:\n\ /R[estored] Ǯ�׸�� ·� ��۽�Ű�� (�ּ�ȭ�� ƴϰ� �ִ�ȭ�� ƴ�).\n\ /W[ait] ��۵� Ǯ�׸�� ٸ�, �� ڵ带 ��.\n\ /Unix �� ͽ��÷ξ�� н� ��̸�� ؼ� ��.\n\ -/ProgIDOpen Open a document using the following progID.\n\ +/ProgIDOpen �� progID�� ؼ� �� .\n\ /L �� ̼�� \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\

1 0

Henri Verbeet : wined3d: Move the num_untracked_materials lookup out of the main drawing loop.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 9a58f37cd39d5dc8c1526eeb0b5d0c63cb43bcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a58f37cd39d5dc8c1526eeb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 22 10:15:58 2009 +0200 wined3d: Move the num_untracked_materials lookup out of the main drawing loop. --- dlls/wined3d/drawprim.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c644aa2..dcdf21a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -86,6 +86,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_stream_i const BYTE *texCoords[WINED3DDP_MAXTEXCOORD]; const BYTE *diffuse = NULL, *specular = NULL, *normal = NULL, *position = NULL; const struct wined3d_stream_info_element *element; + UINT num_untracked_materials; DWORD tex_mask = 0; TRACE("Using slow vertex array code\n"); @@ -121,7 +122,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_stream_i element = &si->elements[WINED3D_FFP_DIFFUSE]; if (element->data) diffuse = element->data + streamOffset[element->stream_idx]; else glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - if (This->activeContext->num_untracked_materials && element->format_desc->format != WINED3DFMT_A8R8G8B8) + num_untracked_materials = This->activeContext->num_untracked_materials; + if (num_untracked_materials && element->format_desc->format != WINED3DFMT_A8R8G8B8) FIXME("Implement diffuse color tracking from %s\n", debug_d3dformat(element->format_desc->format)); element = &si->elements[WINED3D_FFP_SPECULAR]; @@ -246,7 +248,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_stream_i const void *ptrToCoords = diffuse + SkipnStrides * si->elements[WINED3D_FFP_DIFFUSE].stride; diffuse_funcs[si->elements[WINED3D_FFP_DIFFUSE].format_desc->emit_idx](ptrToCoords); - if(This->activeContext->num_untracked_materials) { + if (num_untracked_materials) + { DWORD diffuseColor = ((const DWORD *)ptrToCoords)[0]; unsigned char i; float color[4]; @@ -256,7 +259,8 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_stream_i color[2] = D3DCOLOR_B_B(diffuseColor) / 255.0; color[3] = D3DCOLOR_B_A(diffuseColor) / 255.0; - for(i = 0; i < This->activeContext->num_untracked_materials; i++) { + for (i = 0; i < num_untracked_materials; ++i) + { glMaterialfv(GL_FRONT_AND_BACK, This->activeContext->untracked_materials[i], color); } }

1 0

Nikolay Sivov : comctl32/listview: Implement LVM_CANCELEDITLABEL with tests .
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 9c565342d02f8df86c6b474bd5b410ca3276bcd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c565342d02f8df86c6b474bd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jun 20 00:39:50 2009 +0400 comctl32/listview: Implement LVM_CANCELEDITLABEL with tests. --- dlls/comctl32/listview.c | 31 +++++++++++++++++++----- dlls/comctl32/tests/listview.c | 50 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ebf49c6..f9608c6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -106,7 +106,6 @@ * -- LVN_BEGINRDRAG * * Messages: - * -- LVM_CANCELEDITLABEL * -- LVM_ENABLEGROUPVIEW * -- LVM_GETBKIMAGE, LVM_SETBKIMAGE * -- LVM_GETGROUPINFO, LVM_SETGROUPINFO @@ -419,6 +418,7 @@ static BOOL LISTVIEW_EnsureVisible(LISTVIEW_INFO *, INT, BOOL); static HWND CreateEditLabelT(LISTVIEW_INFO *, LPCWSTR, DWORD, BOOL); static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *, INT, HIMAGELIST); static INT LISTVIEW_HitTest(const LISTVIEW_INFO *, LPLVHITTESTINFO, BOOL, BOOL); +static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *, BOOL, BOOL); /******** Text handling functions *************************************/ @@ -4591,6 +4591,26 @@ static DWORD LISTVIEW_ApproximateViewRect(const LISTVIEW_INFO *infoPtr, INT nIte return dwViewRect; } +/*** + * DESCRIPTION: + * Cancel edit label with saving item text. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * + * RETURN: + * Always returns TRUE. + */ +static LRESULT LISTVIEW_CancelEditLabel(LISTVIEW_INFO *infoPtr) +{ + /* handle value will be lost after LISTVIEW_EndEditLabelT */ + HWND edit = infoPtr->hwndEdit; + + LISTVIEW_EndEditLabelT(infoPtr, TRUE, IsWindowUnicode(infoPtr->hwndEdit)); + SendMessageW(edit, WM_CLOSE, 0, 0); + + return TRUE; +} /*** * DESCRIPTION: @@ -10113,7 +10133,8 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_ARRANGE: return LISTVIEW_Arrange(infoPtr, (INT)wParam); -/* case LVM_CANCELEDITLABEL: */ + case LVM_CANCELEDITLABEL: + return LISTVIEW_CancelEditLabel(infoPtr); case LVM_CREATEDRAGIMAGE: return (LRESULT)LISTVIEW_CreateDragImage(infoPtr, (INT)wParam, (LPPOINT)lParam); @@ -10734,11 +10755,7 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP } case EN_KILLFOCUS: { - /* handle value will be lost after LISTVIEW_EndEditLabelT */ - HWND edit = infoPtr->hwndEdit; - - LISTVIEW_EndEditLabelT(infoPtr, TRUE, IsWindowUnicode(infoPtr->hwndEdit)); - SendMessageW(edit, WM_CLOSE, 0, 0); + LISTVIEW_CancelEditLabel(infoPtr); } default: diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2c3ab64..7d14294 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3534,6 +3534,55 @@ static void test_get_set_view(void) DestroyWindow(hwnd); } +static void test_canceleditlabel(void) +{ + HWND hwnd, hwndedit; + DWORD ret; + CHAR buff[10]; + LVITEMA itema; + static CHAR test[] = "test"; + static const CHAR test1[] = "test1"; + + hwnd = create_listview_control(LVS_EDITLABELS); + ok(hwnd != NULL, "failed to create a listview window\n"); + + insert_item(hwnd, 0); + + /* try without edit created */ + ret = SendMessage(hwnd, LVM_CANCELEDITLABEL, 0, 0); + expect(TRUE, ret); + + /* cancel without data change */ + SetFocus(hwnd); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected edit control to be created\n"); + ret = SendMessage(hwnd, LVM_CANCELEDITLABEL, 0, 0); + expect(TRUE, ret); + ok(!IsWindow(hwndedit), "Expected edit control to be destroyed\n"); + + /* cancel after data change */ + memset(&itema, 0, sizeof(itema)); + itema.pszText = test; + ret = SendMessage(hwnd, LVM_SETITEMTEXT, 0, (LPARAM)&itema); + expect(TRUE, ret); + SetFocus(hwnd); + hwndedit = (HWND)SendMessage(hwnd, LVM_EDITLABEL, 0, 0); + ok(IsWindow(hwndedit), "Expected edit control to be created\n"); + ret = SetWindowText(hwndedit, test1); + ok(ret != 0, "Expected edit text to change\n"); + ret = SendMessage(hwnd, LVM_CANCELEDITLABEL, 0, 0); + expect(TRUE, ret); + ok(!IsWindow(hwndedit), "Expected edit control to be destroyed\n"); + memset(&itema, 0, sizeof(itema)); + itema.pszText = buff; + itema.cchTextMax = sizeof(buff)/sizeof(CHAR); + ret = SendMessage(hwnd, LVM_GETITEMTEXT, 0, (LPARAM)&itema); + expect(5, ret); + ok(strcmp(buff, test1) == 0, "Expected label text not to change\n"); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -3598,6 +3647,7 @@ START_TEST(listview) /* comctl32 version 6 tests start here */ test_get_set_view(); + test_canceleditlabel(); unload_v6_module(ctx_cookie);

1 0

Aric Stewart : mshtml: Update Japanese resources.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 2f0546a3249ec8de8818c8399120b52329bc9cbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0546a3249ec8de8818c8399… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Jun 21 16:55:11 2009 +0900 mshtml: Update Japanese resources. --- dlls/mshtml/Ja.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Ja.rc b/dlls/mshtml/Ja.rc index 81bf8f8..4e060d7 100644 --- a/dlls/mshtml/Ja.rc +++ b/dlls/mshtml/Ja.rc @@ -56,4 +56,14 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "キャンセル", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "キャンセル", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +} #pragma code_page(default)

1 0

Aurimas Fišeras : sane.ds: Add Lithuanian translation.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: e057672b1689952157a5c3e936629bbad84817bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e057672b1689952157a5c3e93… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 13:47:02 2009 +0300 sane.ds: Add Lithuanian translation. --- dlls/sane.ds/rsrc.rc | 1 + dlls/sane.ds/sane_Lt.rc | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc index 53d099f..ac80eb9 100644 --- a/dlls/sane.ds/rsrc.rc +++ b/dlls/sane.ds/rsrc.rc @@ -32,6 +32,7 @@ #include "sane_Fi.rc" #include "sane_Fr.rc" #include "sane_Ko.rc" +#include "sane_Lt.rc" #include "sane_Nl.rc" #include "sane_No.rc" #include "sane_Pl.rc" diff --git a/dlls/sane.ds/sane_Lt.rc b/dlls/sane.ds/sane_Lt.rc new file mode 100644 index 0000000..c96eceb --- /dev/null +++ b/dlls/sane.ds/sane_Lt.rc @@ -0,0 +1,45 @@ +/* + * Lithuanian resources for Twain + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Skaitoma" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "SKAITOMA... Prašome palaukti",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "piks" + 2 "b" + 3 "mm" + 4 "tašk./col." + 5 "%" + 6 "ns" +} + +#pragma code_page(default)

1 0

Gerald Pfeifer : ddraw: Fix two bounds checks.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: d1e5b3bf62b0a0baa0d842e109ad1c136625280b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e5b3bf62b0a0baa0d842e10… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jun 19 19:07:42 2009 +0200 ddraw: Fix two bounds checks. --- dlls/ddraw/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 261d6e3..439e99f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2956,7 +2956,7 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface, TRACE("(%p)->(%08x,%08x)\n", This, LightStateType, Value); - if (!LightStateType && (LightStateType > D3DLIGHTSTATE_COLORVERTEX)) + if (!LightStateType || (LightStateType > D3DLIGHTSTATE_COLORVERTEX)) { TRACE("Unexpected Light State Type\n"); return DDERR_INVALIDPARAMS; @@ -3089,7 +3089,7 @@ IDirect3DDeviceImpl_3_GetLightState(IDirect3DDevice3 *iface, TRACE("(%p)->(%08x,%p)\n", This, LightStateType, Value); - if (!LightStateType && (LightStateType > D3DLIGHTSTATE_COLORVERTEX)) + if (!LightStateType || (LightStateType > D3DLIGHTSTATE_COLORVERTEX)) { TRACE("Unexpected Light State Type\n"); return DDERR_INVALIDPARAMS;

1 0

Alexandre Julliard : winebuild: Add possibility to generate a global resource file without running it through windres .
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 6cf96bf9400c320a77581066abb698b32f683d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf96bf9400c320a77581066a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 11:46:33 2009 +0200 winebuild: Add possibility to generate a global resource file without running it through windres. --- tools/winebuild/main.c | 2 +- tools/winebuild/res32.c | 35 +++++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 9419231..77cfc45 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -244,7 +244,7 @@ static const char usage_str[] = " --def Build a .def file from a .spec file\n" " --exe Build a .c file for an executable\n" " --relay16 Build the 16-bit relay assembly routines\n" -" --relay32 Build the 32-bit relay assembly routines\n\n" +" --relay32 Build the 32-bit relay assembly routines\n" " --resources Build a .o file for the resource files\n\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index ed902bb..93d9c3c 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -541,8 +541,7 @@ void output_res_o_file( DLLSPEC *spec ) { unsigned int i, total_size; unsigned char *data; - char *res_file, *cmd; - const char *prog; + char *res_file = NULL; int fd, err; if (!spec->nb_resources) fatal_error( "--resources mode needs at least one resource file as input\n" ); @@ -593,20 +592,32 @@ void output_res_o_file( DLLSPEC *spec ) } assert( file_out_pos == file_out_end ); - res_file = get_temp_file_name( output_file_name, ".res" ); - if ((fd = open( res_file, O_WRONLY|O_CREAT|O_TRUNC, 0600 )) == -1) - fatal_error( "Cannot create %s\n", res_file ); + /* if the output file name is a .res too, don't run the results through windres */ + if (strendswith( output_file_name, ".res")) + { + if ((fd = open( output_file_name, O_WRONLY|O_CREAT|O_TRUNC, 0666 )) == -1) + fatal_error( "Cannot create %s\n", output_file_name ); + } + else + { + res_file = get_temp_file_name( output_file_name, ".res" ); + if ((fd = open( res_file, O_WRONLY|O_CREAT|O_TRUNC, 0600 )) == -1) + fatal_error( "Cannot create %s\n", res_file ); + } if (write( fd, data, total_size ) != total_size) fatal_error( "Error writing to %s\n", res_file ); close( fd ); free( data ); - prog = get_windres_command(); - cmd = xmalloc( strlen(prog) + strlen(res_file) + strlen(output_file_name) + 9 ); - sprintf( cmd, "%s -i %s -o %s", prog, res_file, output_file_name ); - if (verbose) fprintf( stderr, "%s\n", cmd ); - err = system( cmd ); - if (err) fatal_error( "%s failed with status %d\n", prog, err ); - free( cmd ); + if (res_file) + { + const char *prog = get_windres_command(); + char *cmd = xmalloc( strlen(prog) + strlen(res_file) + strlen(output_file_name) + 9 ); + sprintf( cmd, "%s -i %s -o %s", prog, res_file, output_file_name ); + if (verbose) fprintf( stderr, "%s\n", cmd ); + err = system( cmd ); + if (err) fatal_error( "%s failed with status %d\n", prog, err ); + free( cmd ); + } output_file_name = NULL; /* so we don't try to assemble it */ }

1 0

Gerald Pfeifer : d3d9/tests: Fix three incorrect logic conditions.
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 9b043744cd468752666a761e8c079e3d159d7dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b043744cd468752666a761e8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jun 19 19:22:48 2009 +0200 d3d9/tests: Fix three incorrect logic conditions. --- dlls/d3d9/tests/query.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/query.c b/dlls/d3d9/tests/query.c index 51a8668..8fc66e9 100644 --- a/dlls/d3d9/tests/query.c +++ b/dlls/d3d9/tests/query.c @@ -105,7 +105,7 @@ static void test_query_support(IDirect3D9 *pD3d, HWND hwnd) for(i = 0; i < sizeof(queries) / sizeof(queries[0]); i++) { hr = IDirect3DDevice9_CreateQuery(pDevice, queries[i].type, NULL); - ok(hr == D3D_OK || D3DERR_NOTAVAILABLE, + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3DDevice9_CreateQuery returned unexpected return value %08x for query %s\n", hr, queryName(queries[i].type)); supported = (hr == D3D_OK ? TRUE : FALSE); @@ -119,7 +119,7 @@ static void test_query_support(IDirect3D9 *pD3d, HWND hwnd) queryName(queries[i].type)); hr = IDirect3DDevice9_CreateQuery(pDevice, queries[i].type, &pQuery); - ok(hr == D3D_OK || D3DERR_NOTAVAILABLE, + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3DDevice9_CreateQuery returned unexpected return value %08x for query %s\n", hr, queryName(queries[i].type)); ok(!(supported && !pQuery), "Query %s was claimed to be supported, but can't be created\n", queryName(queries[i].type)); ok(!(!supported && pQuery), "Query %s was claimed not to be supported, but can be created\n", queryName(queries[i].type)); @@ -163,7 +163,7 @@ static void test_occlusion_query_states(IDirect3D9 *pD3d, HWND hwnd) } hr = IDirect3DDevice9_CreateQuery(pDevice, D3DQUERYTYPE_OCCLUSION, &pQuery); - ok(hr == D3D_OK || D3DERR_NOTAVAILABLE, + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3DDevice9_CreateQuery returned unexpected return value %08x\n", hr); if(!pQuery) { skip("Occlusion queries not supported\n");

1 0

Gerald Pfeifer : ddraw: Fix error checking in IDirect3DExecuteBufferImpl_Execute().
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 3176d936f988d54d8f170cd47bc2fa1f9df4fa66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3176d936f988d54d8f170cd47… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jun 19 19:01:21 2009 +0200 ddraw: Fix error checking in IDirect3DExecuteBufferImpl_Execute(). --- dlls/ddraw/executebuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 73e0657..6d6d304 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -249,7 +249,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, TRACE("(%08x,%08x)\n", ci->u1.dlstLightStateType, ci->u2.dwArg[0]); - if (!ci->u1.dlstLightStateType && (ci->u1.dlstLightStateType > D3DLIGHTSTATE_COLORVERTEX)) + if (!ci->u1.dlstLightStateType || (ci->u1.dlstLightStateType > D3DLIGHTSTATE_COLORVERTEX)) ERR("Unexpected Light State Type\n"); else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */) { DWORD matHandle = ci->u2.dwArg[0];

1 0

Aurimas Fišeras : serialui: Add Lithuanian translation .
by Alexandre Julliard June 22, 2009

June 22, 2009

Module: wine Branch: master Commit: 77b457421b6192bb653d7e5c94cb4761fa5797d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b457421b6192bb653d7e5c9… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 14:00:17 2009 +0300 serialui: Add Lithuanian translation. --- dlls/serialui/Lt.rc | 46 ++++++++++++++++++++++++++++++++++++++++++ dlls/serialui/serialui_rc.rc | 1 + 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/serialui/Lt.rc b/dlls/serialui/Lt.rc new file mode 100644 index 0000000..31e2a95 --- /dev/null +++ b/dlls/serialui/Lt.rc @@ -0,0 +1,46 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Savybės: " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bodų sparta", -1,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Lyginumas", -1,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Srauto valdymas", -1,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Duomenų bitai", -1,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Pabaigos bitai", -1,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Gerai", IDOK,30,138,50,14 + PUSHBUTTON "Atsisakyti", IDCANCEL,85,138,50,14 + /* these two buttons are for testing Get/SetDefaultCommConfig */ + /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ + /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */ +END + +#pragma code_page(default) diff --git a/dlls/serialui/serialui_rc.rc b/dlls/serialui/serialui_rc.rc index b732435..11b3e6c 100644 --- a/dlls/serialui/serialui_rc.rc +++ b/dlls/serialui/serialui_rc.rc @@ -34,6 +34,7 @@ #include "It.rc" #include "Ja.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pt.rc"

1 0