September 2008 - Wine-commits

Stefan Dösinger : wined3d: Fix the pixelformat selection logic.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: c36e033856b811d19a2abb1024b0ffe1b71cc1eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36e033856b811d19a2abb102… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 3 13:56:17 2008 -0500 wined3d: Fix the pixelformat selection logic. --- dlls/wined3d/context.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2f30aff..088142e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -136,12 +136,12 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF * only offer 32 bit ARB pixel formats. First try without an exact alpha * match, then try without an exact alpha and color match. */ - { FALSE, TRUE, TRUE }, { TRUE, TRUE, TRUE }, - { FALSE, FALSE, TRUE }, - { FALSE, FALSE, FALSE }, { TRUE, FALSE, TRUE }, + { FALSE, TRUE, TRUE }, + { FALSE, FALSE, TRUE }, { TRUE, FALSE, FALSE }, + { FALSE, FALSE, FALSE }, }; int i = 0;

1 0

Michael Stefaniuc : jscript: Move 'inline' right after the storage specifier in a declaration.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 4d1d16836b1201be7b347194b98df48eb2ce96a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1d16836b1201be7b347194b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 4 23:31:09 2008 +0200 jscript: Move 'inline' right after the storage specifier in a declaration. --- dlls/jscript/jscript.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ffb3f2b..1f55604 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -56,7 +56,7 @@ struct _script_ctx_t { void script_release(script_ctx_t*); -static void inline script_addref(script_ctx_t *ctx) +static inline void script_addref(script_ctx_t *ctx) { ctx->ref++; }

1 0

Marcus Meissner : Annotate with allocation size attribute.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 96412ee5649ce1234bf433750f679e36e6717d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96412ee5649ce1234bf433750… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Sep 4 13:39:58 2008 +0200 Annotate with allocation size attribute. --- dlls/comctl32/comctl32.h | 4 ++-- dlls/comdlg32/cdlg.h | 2 +- dlls/hhctrl.ocx/hhctrl.h | 8 ++++---- dlls/localspl/localspl_private.h | 2 +- dlls/mshtml/mshtml_private.h | 8 ++++---- dlls/msi/msipriv.h | 4 ++++ dlls/oleaut32/typelib.c | 2 ++ dlls/riched20/editor.h | 4 ++-- include/objbase.h | 2 +- include/rpcndr.h | 2 +- include/shlobj.h | 2 +- include/winbase.h | 12 ++++++------ include/wincrypt.h | 4 ++-- include/winnt.h | 6 ++++++ include/winternl.h | 2 +- 15 files changed, 38 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96412ee5649ce1234bf43…

1 0

Paul Vriens : kernel32/tests: Split the test for ret and last error.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 94b73a6d0408354b0344d8adea511e18dc21c558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b73a6d0408354b0344d8ade… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Sep 4 19:51:37 2008 +0200 kernel32/tests: Split the test for ret and last error. --- dlls/kernel32/tests/version.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 94b4311..1a9a40c 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -164,8 +164,11 @@ static void test_VerifyVersionInfo(void) pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL), VER_MAJORVERSION, VER_GREATER_EQUAL)); if (servicepack == 0) - ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION), - "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError()); + { + ok(!ret, "VerifyVersionInfoA should have failed\n"); + ok(GetLastError() == ERROR_OLD_WIN_VERSION, + "Expected ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError()); + } else ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());

1 0

Muneyuki Noguchi : regedit: Update Japanese translation.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 131996ae4568bb3c543b058f14e61f7a33f4b2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=131996ae4568bb3c543b058f1… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Fri Sep 5 00:47:28 2008 +0900 regedit: Update Japanese translation. --- programs/regedit/Ja.rc | 105 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 99 insertions(+), 6 deletions(-) diff --git a/programs/regedit/Ja.rc b/programs/regedit/Ja.rc index c895ed4..437f02a 100644 --- a/programs/regedit/Ja.rc +++ b/programs/regedit/Ja.rc @@ -46,8 +46,8 @@ BEGIN BEGIN MENUITEM "�L�[(&K)", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "��(&S)", ID_EDIT_NEW_STRINGVALUE - MENUITEM "�o�C�i��(&B)", ID_EDIT_NEW_BINARYVALUE + MENUITEM "��l(&S)", ID_EDIT_NEW_STRINGVALUE + MENUITEM "�o�C�i��l(&B)", ID_EDIT_NEW_BINARYVALUE MENUITEM "DWORD�l(&D)", ID_EDIT_NEW_DWORDVALUE MENUITEM "��s��l(&M)", ID_EDIT_NEW_MULTI_STRINGVALUE END @@ -97,8 +97,8 @@ BEGIN BEGIN MENUITEM "�L�[(&K)", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "��(&S)", ID_EDIT_NEW_STRINGVALUE - MENUITEM "�o�C�i��(&B)", ID_EDIT_NEW_BINARYVALUE + MENUITEM "��l(&S)", ID_EDIT_NEW_STRINGVALUE + MENUITEM "�o�C�i��l(&B)", ID_EDIT_NEW_BINARYVALUE MENUITEM "DWORD�l(&D)", ID_EDIT_NEW_DWORDVALUE MENUITEM "��s��l(&M)", ID_EDIT_NEW_MULTI_STRINGVALUE END @@ -118,6 +118,55 @@ END * Dialog */ +IDD_EXPORT_TEMPLATE DIALOG DISCARDABLE 50, 50, 278, 54 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "��W�X�g��̃G�N�X�|�[�g", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP + AUTORADIOBUTTON "��ׂ�(&A)", IDC_EXPORT_ALL, 12, 15, 244, 12 + AUTORADIOBUTTON "�I��ꂽ��(&E):", IDC_EXPORT_SELECTED, 12, 30, 70, 12 + EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 +END + +IDD_FIND DIALOG DISCARDABLE 22, 17, 220, 85 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "��" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "��:",IDC_STATIC,5,7,119,8 + EDITTEXT IDC_VALUE_NAME,40,5,125,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "��Ώ�:",IDC_STATIC,5, 22, 119, 8 + CHECKBOX "�L�[", IDC_FIND_KEYS, 5, 34, 90, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "�l�̖��O", IDC_FIND_VALUES, 5, 46, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "�l�̒��g", IDC_FIND_CONTENT, 5, 58, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + CHECKBOX "��S�Ɉ�v��̂��", IDC_FIND_WHOLE, 5, 70, 90, 10, WS_TABSTOP | BS_AUTOCHECKBOX + DEFPUSHBUTTON "��",IDOK,175,5,40,15,WS_GROUP + PUSHBUTTON "��",IDCANCEL,175,24,40,15, WS_GROUP +END + +IDD_ADDFAVORITE DIALOG DISCARDABLE 22, 17, 210, 55 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "��C�ɓ��ɒǉ�" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "��O:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,120,36,40,15,WS_GROUP + PUSHBUTTON "�L��Z��",IDCANCEL,165,36,40,15,WS_GROUP +END + +IDD_DELFAVORITE DIALOG DISCARDABLE 22, 17, 210, 90 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "��C�ɓ��̍폜" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "��O:",IDC_STATIC,5,5,119,8 + LISTBOX IDC_NAME_LIST,5,15,200,52, WS_BORDER | WS_TABSTOP | LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,120,72,40,15,WS_GROUP + PUSHBUTTON "�L��Z��",IDCANCEL,165,72,40,15,WS_GROUP +END + IDD_EDIT_STRING DIALOG DISCARDABLE 22, 17, 210, 75 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "��̕ҏW" @@ -147,6 +196,32 @@ BEGIN PUSHBUTTON "�L��Z��",IDCANCEL,175,80,30,11,WS_GROUP END +IDD_EDIT_BINARY DIALOG DISCARDABLE 22, 17, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +CAPTION "�o�C�i��l�̕ҏW" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "�l�̖��O:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,160,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "�l�̃f�[�^:",IDC_STATIC,5,30,90,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit",WS_TABSTOP,5,40,160,40 + DEFPUSHBUTTON "OK",IDOK,80,83,40,15,WS_GROUP + PUSHBUTTON "�L��Z��",IDCANCEL,125,83,40,15,WS_GROUP +END + +IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "��s��̕ҏW" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "�l�̖��O:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "�l�̃f�[�^:",IDC_STATIC,5,30,119,8 + EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + DEFPUSHBUTTON "OK",IDOK,120,156,40,15,WS_GROUP + PUSHBUTTON "�L��Z��",IDCANCEL,165,156,40,15,WS_GROUP +END + /* * String Table */ @@ -177,9 +252,10 @@ STRINGTABLE DISCARDABLE BEGIN ID_EDIT_MODIFY "�l�̃f�[�^��ύX" ID_EDIT_NEW_KEY "�V��L�[��ǉ�" - ID_EDIT_NEW_STRINGVALUE "�V��ǉ�" + ID_EDIT_NEW_STRINGVALUE "�V��l��ǉ�" ID_EDIT_NEW_BINARYVALUE "�V��o�C�i��ǉ�" ID_EDIT_NEW_DWORDVALUE "�V��DWORD�l��ǉ�" + ID_EDIT_NEW_MULTI_STRINGVALUE "�V��s��l��ǉ�" ID_REGISTRY_IMPORTREGISTRYFILE "�e�L�X�g�t�@�C��W�X�g��ɃC��|�[�g" ID_REGISTRY_EXPORTREGISTRYFILE "��W�X�g��̈ꕔ�܂��͑S��e�L�X�g�t�@�C��ɃG�N�X�|�[�g" @@ -216,9 +292,26 @@ BEGIN IDS_TOO_BIG_VALUE "�l��傫��܂� (%ld)" IDS_DELETE_BOX_TITLE "�l�̍폜�m�F" IDS_DELETE_BOX_TEXT "�{�� '%s'��폜��܂��?" + IDS_DELETE_BOX_TEXT_MULTIPLE "��̒l��폜��܂��?" IDS_NEWKEY "�V��L�[ #%d" IDS_NEWVALUE "�V��l #%d" - IDS_NOTFOUND "�� '%s'��t��܂��" + IDS_NOTFOUND "�� '%s'��܂��" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FILEDIALOG_IMPORT_TITLE "��W�X�g�� t�@�C��̃C��|�[�g" + IDS_FILEDIALOG_EXPORT_TITLE "��W�X�g�� t�@�C��̃G�N�X�|�[�g" + IDS_FILEDIALOG_FILTER "�o�^�t�@�C��\0*.reg\0Win9x/NT4 �o�^�t�@�C�� (REGEDIT4)\0*.reg\0��ׂẴt�@�C�� (*.*)\0*.*\0\0" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_REGISTRY_ROOT_NAME "�}�C �R��s��[�^" + IDS_REGISTRY_DEFAULT_VALUE "(��)" + IDS_REGISTRY_VALUE_NOT_SET "(�l�̐ݒ�Ȃ�)" + IDS_REGISTRY_VALUE_CANT_DISPLAY "(cannot display value)" + IDS_REGISTRY_UNKNOWN_TYPE "(unknown %d)" END /*****************************************************************/

1 0

Huw Davies : include: Add a few more things to mimeole.idl.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 906dc5881e78fe1bed66b822f8248d09ed53f2a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=906dc5881e78fe1bed66b822f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 4 17:14:44 2008 +0100 include: Add a few more things to mimeole.idl. --- include/mimeole.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/include/mimeole.idl b/include/mimeole.idl index 9d4f45b..508ca26 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -43,6 +43,9 @@ cpp_quote("#define MIME_E_BUFFER_TOO_SMALL 0x800cce06") cpp_quote("#define MIME_E_INVALID_TEXT_TYPE 0x800cce38") +cpp_quote("#define MIME_E_SECURITY_NOOP 0x800cceb1") +cpp_quote("#define MIME_S_SECURITY_NOOP 0x000cceb1") + cpp_quote("typedef enum tagMIMEPROPID {") cpp_quote(" PID_HDR_NEWSGROUP = 2,") cpp_quote(" PID_HDR_NEWSGROUPS = 3,") @@ -78,7 +81,14 @@ cpp_quote(" PID_HDR_SENDER = 61,") cpp_quote(" PID_HDR_INREPLYTO = 77,") cpp_quote("} MIMEPROPID;") +cpp_quote("#define TYPEDID_MASK ((ULONG)0xffff)") +cpp_quote("#define TYPEDID_TYPE(t) ((VARTYPE)((t) & TYPEDID_MASK))") + +cpp_quote("#define OID_HIDE_TNEF_ATTACHMENTS (0x000e0000 | VT_BOOL)") +cpp_quote("#define OID_SECURITY_TYPE (0x00180000 | VT_UI4)") +cpp_quote("#define OID_SECURITY_HWND_OWNER (0x00320000 | VT_UI4)") cpp_quote("#define OID_HEADER_RELOAD_TYPE (0x00370000 | VT_UI4)") +cpp_quote("#define OID_SHOW_MACBINARY (0x00390000 | VT_BOOL)") [ @@ -293,6 +303,19 @@ library MIMEOLE typedef BLOB THUMBBLOB; typedef void *HCAPICERTSTORE; + cpp_quote("#define MST_NONE 0x00000000") + cpp_quote("#define MST_THIS_SIGN 0x00000001") + cpp_quote("#define MST_THIS_ENCRYPT 0x00000002") + cpp_quote("#define MST_BLOB_FLAG 0x00000004") + cpp_quote("#define MST_THIS_BLOBSIGN (MST_BLOB_FLAG | MST_THIS_SIGN)") + cpp_quote("#define MST_CHILD_SIGN 0x00000100") + cpp_quote("#define MST_CHILD_ENCRYPT 0x00000200") + cpp_quote("#define MST_SUBMSG_SIGN 0x00001000") + cpp_quote("#define MST_SUBMSG_ENCRYPT 0x00002000") + cpp_quote("#define MST_RECEIPT_REQUEST 0x00010000") + cpp_quote("#define MST_CLASS_SMIME_V1 0x00000000") + cpp_quote("#define MST_CLASS_PGP 0x01000000") + typedef enum tagCERTSTATE { CERTIFICATE_OK, @@ -1164,6 +1187,31 @@ cpp_quote("#endif") { /* FIXME: fill this in */ } + + [ + uuid(ba715ae0-a740-11d2-8b22-0080c76b34c6), + local + ] + interface IMimeSecurityCallback : IUnknown + { + /* FIXME: fill this in */ + + cpp_quote("#define CMS_RECIPIENT_INFO_TYPE_UNKNOWN 0") + cpp_quote("#define CMS_RECIPIENT_INFO_TYPE_KEYTRANS 1") + cpp_quote("#define CMS_RECIPIENT_INFO_TYPE_KEYAGREE 2") + cpp_quote("#define CMS_RECIPIENT_INFO_TYPE_MAIL_LIST 3") + + cpp_quote("#define CMS_RECIPIENT_INFO_PUBKEY_CERTIFICATE 0") + cpp_quote("#define CMS_RECIPIENT_INFO_PUBKEY_KEYTRANS 1") + cpp_quote("#define CMS_RECIPIENT_INFO_PUBKEY_PROVIDER 2") + cpp_quote("#define CMS_RECIPIENT_INFO_PUBKEY_EPHEMERAL_KEYAGREE 3") + cpp_quote("#define CMS_RECIPIENT_INFO_PUBKEY_STATIC_KEYAGREE 4") + + cpp_quote("#define CMS_RECIPIENT_INFO_KEYID_CERTIFICATE 0") + cpp_quote("#define CMS_RECIPIENT_INFO_KEYID_ISSUERSERIAL 1") + cpp_quote("#define CMS_RECIPIENT_INFO_KEYID_KEY_ID 2") + + } } cpp_quote("#ifdef __cplusplus")

1 0

Marcus Meissner : msxml3: Fixed incorrect MultiByteToWideChar.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 980ffb8eb4b850b74a2cb899a7464eef20c9d965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=980ffb8eb4b850b74a2cb899a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Sep 4 19:32:01 2008 +0200 msxml3: Fixed incorrect MultiByteToWideChar. --- dlls/msxml3/tests/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 88cd89f..2865f53 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -140,7 +140,7 @@ static void test_saxstr(unsigned line, const WCHAR *szStr, int nStr, const char if(len != nStr) return; - MultiByteToWideChar(CP_ACP, 0, szTest, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, szTest, -1, buf, sizeof(buf)/sizeof(WCHAR)); ok_(__FILE__,line) (!memcmp(szStr, buf, len*sizeof(WCHAR)), "unexpected szStr %s, expected %s\n", debugstr_wn(szStr, nStr), szTest); }

1 0

Henri Verbeet : wined3d: Set the viewport to the texture size in depth_blt( ).
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 81effcf30db0a7e5726f04ac4a4cf10d00124277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81effcf30db0a7e5726f04ac4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 4 15:32:36 2008 +0200 wined3d: Set the viewport to the texture size in depth_blt(). --- dlls/wined3d/drawprim.c | 5 +++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 8 ++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 60eb721..068e082 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -708,11 +708,11 @@ static void drawStridedSlowVs(IWineD3DDevice *iface, WineDirect3DVertexStridedDa glEnd(); } -void depth_blt(IWineD3DDevice *iface, GLuint texture) { +void depth_blt(IWineD3DDevice *iface, GLuint texture, GLsizei w, GLsizei h) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; GLint old_binding = 0; - glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT); + glPushAttrib(GL_ENABLE_BIT | GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_VIEWPORT_BIT); glDisable(GL_CULL_FACE); glEnable(GL_BLEND); @@ -723,6 +723,7 @@ void depth_blt(IWineD3DDevice *iface, GLuint texture) { glDepthFunc(GL_ALWAYS); glDepthMask(GL_TRUE); glBlendFunc(GL_ZERO, GL_ONE); + glViewport(0, 0, w, h); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8b50cf3..4e7626c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3995,7 +3995,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { attach_depth_stencil_fbo(device, GL_FRAMEBUFFER_EXT, iface, FALSE); /* Do the actual blit */ - depth_blt((IWineD3DDevice *)device, device->depth_blt_texture); + depth_blt((IWineD3DDevice *)device, device->depth_blt_texture, This->currentDesc.Width, This->currentDesc.Height); checkGLcall("depth_blt"); if (device->render_offscreen) { @@ -4017,7 +4017,7 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); checkGLcall("glBindFramebuffer()"); - depth_blt((IWineD3DDevice *)device, This->glDescription.textureName); + depth_blt((IWineD3DDevice *)device, This->glDescription.textureName, This->currentDesc.Width, This->currentDesc.Height); checkGLcall("depth_blt"); if (device->render_offscreen) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ebe0f7f..794293a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -785,7 +785,11 @@ struct ffp_settings { FOG_EXP, FOG_EXP2 } fog; - unsigned char sRGB_write; + /* Use an int instead of a char to get dword alignment. gcc tends to align the + * size of the whole structure, so there are 3 padding bytes. These remain + * uninitialized in the construction function and cause confusion in the hashmap + */ + unsigned int sRGB_write; }; struct ffp_desc @@ -2516,6 +2520,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo); void attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer); void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface); -void depth_blt(IWineD3DDevice *iface, GLuint texture); +void depth_blt(IWineD3DDevice *iface, GLuint texture, GLsizei w, GLsizei h); #endif

1 0

Paul Vriens : ws2_32/tests: Use CreateEventA for win9x.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: ea17a9192c2de79b81f5d246c9c367ebe247bc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea17a9192c2de79b81f5d246c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Sep 4 17:49:13 2008 +0200 ws2_32/tests: Use CreateEventA for win9x. --- dlls/ws2_32/tests/sock.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e2d2162..3a8d42a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -887,9 +887,9 @@ static void do_test( test_setup *test ) DWORD i, n = min (test->general.n_clients, MAX_CLIENTS); DWORD wait; - server_ready = CreateEventW ( NULL, TRUE, FALSE, NULL ); + server_ready = CreateEventA ( NULL, TRUE, FALSE, NULL ); for (i = 0; i <= n; i++) - client_ready[i] = CreateEventW ( NULL, TRUE, FALSE, NULL ); + client_ready[i] = CreateEventA ( NULL, TRUE, FALSE, NULL ); StartServer ( test->srv, &test->general, &test->srv_params ); StartClients ( test->clt, &test->general, &test->clt_params ); @@ -1675,7 +1675,7 @@ static void test_select(void) thread_params.s = fdRead; thread_params.ReadKilled = FALSE; - server_ready = CreateEventW(NULL, TRUE, FALSE, NULL); + server_ready = CreateEventA(NULL, TRUE, FALSE, NULL); thread_handle = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) &SelectReadThread, &thread_params, 0, &id ); ok ( (thread_handle != NULL), "CreateThread failed unexpectedly: %d\n", GetLastError()); @@ -1735,7 +1735,7 @@ static void test_accept(void) goto done; } - server_ready = CreateEventW(NULL, TRUE, FALSE, NULL); + server_ready = CreateEventA(NULL, TRUE, FALSE, NULL); if (server_ready == INVALID_HANDLE_VALUE) { trace("error creating event: %d\n", GetLastError()); @@ -2069,10 +2069,10 @@ static void test_write_events(void) goto end; } - hEvent = CreateEventW(NULL, FALSE, TRUE, NULL); + hEvent = CreateEventA(NULL, FALSE, TRUE, NULL); if (hEvent == INVALID_HANDLE_VALUE) { - ok(0, "CreateEventW failed, error %d\n", GetLastError()); + ok(0, "CreateEventA failed, error %d\n", GetLastError()); goto end; }

1 0

Jeff Latimer : user32/tests: Tests for a W interface connection adding some todo_wine tests.
by Alexandre Julliard 05 Sep '08

05 Sep '08

Module: wine Branch: master Commit: 0c5fff5ea8e72705ab5bdaa45bc76463234a7f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c5fff5ea8e72705ab5bdaa45… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Sep 4 21:08:46 2008 +1000 user32/tests: Tests for a W interface connection adding some todo_wine tests. --- dlls/user32/tests/dde.c | 61 ++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 52 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index e06f72c..91712d2 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2141,14 +2141,14 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV { case XTYP_REGISTER: { - ok(msg_index == 1 || msg_index == 6, "Expected 1 or 6, got %d\n", msg_index); + ok(msg_index == 1 || msg_index == 7, "Expected 1 or 7, got %d\n", msg_index); return (HDDEDATA)TRUE; break; } case XTYP_CONNECT: { - ok(msg_index == 2 || msg_index == 7, "Expected 2 or 7, got %d\n", msg_index); + ok(msg_index == 2 || msg_index == 8, "Expected 2 or 8, got %d\n", msg_index); ok(uFmt == 0, "Expected 0, got %d, msg_index=%d\n", uFmt, msg_index); ok(hconv == 0, "Expected 0, got %p, msg_index=%d\n", hconv, msg_index); ok(hdata == 0, "Expected 0, got %p, msg_index=%d\n", hdata, msg_index); @@ -2170,7 +2170,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV } case XTYP_CONNECT_CONFIRM: { - ok(msg_index == 3 || msg_index == 8, "Expected 3 or 8, got %d\n", msg_index); + ok(msg_index == 3 || msg_index == 9, "Expected 3 or 9, got %d\n", msg_index); conversation = hconv; return (HDDEDATA) TRUE; } @@ -2178,7 +2178,8 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV { BYTE *buffer = NULL; - ok(msg_index == 4 || msg_index == 9, "Expected 4 or 9, got %d\n", msg_index); + ok(msg_index == 4 || msg_index == 5 || msg_index == 10 || msg_index == 11, + "Expected 4, 5 10 or 11, got %d\n", msg_index); ok(uFmt == 0, "Expected 0, got %d\n", uFmt); ok(hconv == conversation, "Expected conversation handle, got %p, msg_index=%d\n", hconv, msg_index); @@ -2192,32 +2193,57 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV ok(size == 12, "Expected 12, got %d, msg_index=%d\n", size, msg_index); size = DdeGetData(hdata, NULL, 0, 0); - if (msg_index == 9) + if (msg_index == 10 || msg_index == 11) + if (msg_index == 10) todo_wine - ok(size == 34, "Expected that size should 34 not %d, msg_index=%d\n", + ok(size == 34, "Expected that size should be 34 not %d, msg_index=%d\n", + size, msg_index); + else + ok(size == 34, "Expected that size should be 34 not %d, msg_index=%d\n", size, msg_index); else - ok(size == 17, "Expected that size should 17 not %d, msg_index=%d\n", + if (msg_index == 5) + todo_wine + ok(size == 17, "Expected that size should be 17 not %d, msg_index=%d\n", + size, msg_index); + else + ok(size == 17, "Expected that size should be 17 not %d, msg_index=%d\n", size, msg_index); ok((buffer = HeapAlloc(GetProcessHeap(), 0, size)) != NULL, "should not be null\n"); rsize = DdeGetData(hdata, buffer, size, 0); - if (msg_index == 9) + if (msg_index == 10 || msg_index == 11) { ok(rsize == size, "Incorrect size returned, expected %d got %d, msg_index=%d\n", size, rsize, msg_index); + if (msg_index == 10) todo_wine { ok(!lstrcmpW((WCHAR*)buffer, test_cmd_w), "Expected \"Test dde command\", msg_index=%d\n", msg_index); ok(size == 34, "Expected 34, got %d, msg_index=%d\n", size, msg_index); + } else + { + ok(!lstrcmpW((WCHAR*)buffer, test_cmd_w), + "Expected \"Test dde command\", msg_index=%d\n", + msg_index); + ok(size == 34, "Expected 34, got %d, msg_index=%d\n", size, msg_index); } } else { ok(rsize == size, "Incorrect size returned, expected %d got %d, msg_index=%d\n", size, rsize, msg_index); + if (msg_index == 5) + todo_wine { + ok(!lstrcmpA((CHAR*)buffer, test_cmd), "Expected %s, got %s, msg_index=%d\n", + test_cmd, buffer, msg_index); + ok(size == 17, "Expected size should be 17, got %d, msg_index=%d\n", size, msg_index); + } + else + { ok(!lstrcmpA((CHAR*)buffer, test_cmd), "Expected %s, got %s, msg_index=%d\n", test_cmd, buffer, msg_index); - ok(size == 17, "Expected 17, got %d, msg_index=%d\n", size, msg_index); + ok(size == 17, "Expected size should be 17, got %d, msg_index=%d\n", size, msg_index); + } } return (HDDEDATA) DDE_FACK; @@ -2262,6 +2288,7 @@ static void test_end_to_end_client(BOOL type_a) HCONV hconv; HDDEDATA hdata; static char test_cmd[] = "test dde command"; + static WCHAR test_cmd_w[] = {'t','e','s','t',' ','d','d','e',' ','c','o','m','m','a','n','d',0,}; static char test_service[] = "TestDDEService"; static WCHAR test_service_w[] = {'T','e','s','t','D','D','E','S','e','r','v','i','c','e',0}; static char test_topic[] = "TestDDETopic"; @@ -2292,6 +2319,7 @@ static void test_end_to_end_client(BOOL type_a) ok(ret == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %x\n", ret); DdeFreeStringHandle(client_pid, server); + /* Test both A and W data being passed to DdeClientTransaction */ hdata = DdeClientTransaction((LPBYTE)test_cmd, strlen(test_cmd) + 1, hconv, (HSZ)0xdead, 0xbeef, XTYP_EXECUTE, 1000, &ret); ok(hdata != NULL, "DdeClientTransaction failed\n"); @@ -2299,6 +2327,13 @@ static void test_end_to_end_client(BOOL type_a) err = DdeGetLastError(client_pid); ok(err == DMLERR_NO_ERROR, "wrong dde error %x\n", err); + hdata = DdeClientTransaction((LPBYTE)test_cmd_w, lstrlenW(test_cmd_w) * sizeof(WCHAR) + 2, + hconv, (HSZ)0xdead, 0xbeef, XTYP_EXECUTE, 1000, &ret); + ok(hdata != NULL, "DdeClientTransaction failed\n"); + ok(ret == DDE_FACK, "wrong status code %x\n", ret); + err = DdeGetLastError(client_pid); + ok(err == DMLERR_NO_ERROR, "wrong dde error %x\n", err); + DdeFreeStringHandle(client_pid, topic); ret = DdeDisconnect(hconv); ok(ret == TRUE, "Expected TRUE, got %x\n", ret); @@ -2362,6 +2397,8 @@ START_TEST(dde) test_msg_client(); else if (!lstrcmpA(argv[2], "enda")) test_end_to_end_client(TRUE); + else if (!lstrcmpA(argv[2], "endw")) + test_end_to_end_client(FALSE); return; } @@ -2393,6 +2430,12 @@ START_TEST(dde) test_end_to_end_server(proc.hProcess, proc.hThread, TRUE); + sprintf(buffer, "%s dde endw", argv[0]); + CreateProcessA(NULL, buffer, NULL, NULL, FALSE, + CREATE_SUSPENDED, NULL, NULL, &startup, &proc); + + test_end_to_end_server(proc.hProcess, proc.hThread, FALSE); + test_dde_aw_transaction(); test_DdeCreateDataHandle();

1 0