wine-commits March 2007

wine-commits@winehq.org

3 participants
844 discussions

Stefan Dösinger : wined3d: Store the pixel format in the texture.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 2cdbd9a53d378e7253fbb54002ed056c59e171e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cdbd9a53d378e7253fbb5400… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 20 23:01:15 2007 +0100 wined3d: Store the pixel format in the texture. --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index da1b8c9..7863714 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -823,6 +823,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U object->pow2scalingFactorY = (((float)Height) / ((float)pow2Height)); TRACE(" xf(%f) yf(%f)\n", object->pow2scalingFactorX, object->pow2scalingFactorY); + object->baseTexture.format = Format; + /* Calculate levels for mip mapping */ if (Levels == 0) { TRACE("calculating levels %d\n", object->baseTexture.levels); @@ -896,6 +898,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa object->width = Width; object->height = Height; object->depth = Depth; + object->baseTexture.format = Format; /* Calculate levels for mip mapping */ if (Levels == 0) { @@ -1011,6 +1014,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface /* TODO: support for native non-power 2 */ /* Precalculated scaling for 'faked' non power of two texture coords */ object->pow2scalingFactor = ((float)EdgeLength) / ((float)pow2EdgeLength); + object->baseTexture.format = Format; /* Calculate levels for mip mapping */ if (Levels == 0) {

1 0

Stefan Dösinger : wined3d: Support GL_ATI_envmap_bumpmap for D3DFMT_V8U8.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: ede01abee2966b2bafa7a121b5fb8eb92797a6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede01abee2966b2bafa7a121b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 20 23:42:37 2007 +0100 wined3d: Support GL_ATI_envmap_bumpmap for D3DFMT_V8U8. --- dlls/wined3d/arb_program_shader.c | 9 +++++---- dlls/wined3d/surface.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f5fcbd7..56ef5fb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -715,11 +715,12 @@ void pshader_hw_texbem(SHADER_OPCODE_ARG* arg) { * So the surface loading code converts the -128 ... 127 signed integers to * 0 ... 255 unsigned ones. The following line undoes that. * - * TODO: GL_ATI_envmap_bumpmap provides pixel formats - * suitable for loading the Direct3D perturbation data. If it is used, do - * not correct the signedness + * TODO: GL_ATI_envmap_bumpmap supports D3DFMT_DU8DV8 only. If conversion for other formats + * is implemented check the texture format. + * + * TODO: Move that to the common sampling function */ - if(!GL_SUPPORT(NV_TEXTURE_SHADER3)) + if(!GL_SUPPORT(NV_TEXTURE_SHADER3) && !GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) shader_addline(buffer, "MAD T%u, T%u, coefmul.x, -one;\n", src, src); shader_addline(buffer, "SWZ TMP2, bumpenvmat, x, z, 0, 0;\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c1b1465..e1c754e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1464,11 +1464,14 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO break; case WINED3DFMT_V8U8: - /* TODO: GL_ATI_envmap_bumpmap provides suitable formats. - * use it instead of converting - * Remember to adjust the texbem instruction in the shader - */ if(GL_SUPPORT(NV_TEXTURE_SHADER3)) break; + else if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + *format = GL_DUDV_ATI; + *internal = GL_DU8DV8_ATI; + *type = GL_BYTE; + /* No conversion - Just change the gl type */ + break; + } *convert = CONVERT_V8U8; *format = GL_BGR; *internal = GL_RGB8; @@ -1483,6 +1486,7 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO *internal = GL_RGBA8; *type = GL_BYTE; *target_bpp = 4; + /* Not supported by GL_ATI_envmap_bumpmap */ break; case WINED3DFMT_Q8W8V8U8: @@ -1492,6 +1496,7 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO *internal = GL_RGBA8; *type = GL_BYTE; *target_bpp = 4; + /* Not supported by GL_ATI_envmap_bumpmap */ break; case WINED3DFMT_V16U16: @@ -1501,6 +1506,9 @@ static HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BO *internal = GL_COLOR_INDEX; *type = GL_SHORT; *target_bpp = 4; + /* What should I do here about GL_ATI_envmap_bumpmap? + * Convert it or allow data loss by loading it into a 8 bit / channel texture? + */ break; default:

1 0

Stefan Dösinger : wined3d: Add GL_ATI_envmap_bumpmap to our gl extension header.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: e213d7eff596424b894e9278178c9d5c35cda00e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e213d7eff596424b894e92781… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 21 00:13:47 2007 +0100 wined3d: Add GL_ATI_envmap_bumpmap to our gl extension header. --- dlls/wined3d/directx.c | 3 +++ include/wine/wined3d_gl.h | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6a1b9e8..915d938 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -798,6 +798,9 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { gl_info->vs_ati_version = VS_VERSION_11; TRACE_(d3d_caps)(" FOUND: ATI (EXT) Vertex Shader support - version=%02x\n", gl_info->vs_ati_version); gl_info->supported[EXT_VERTEX_SHADER] = TRUE; + } else if (strcmp(ThisExtn, "GL_ATI_envmap_bumpmap") == 0) { + TRACE_(d3d_caps)(" FOUND: ATI Environment Bump Mapping support\n"); + gl_info->supported[ATI_ENVMAP_BUMPMAP] = TRUE; /** * Apple */ diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 4f85461..dbb76a1 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1159,6 +1159,21 @@ typedef void (APIENTRY * PGLFNFINISHFENCEAPPLEPROC) (GLuint); typedef GLboolean (APIENTRY * PGLFNISFENCEAPPLEPROC) (GLuint); typedef GLboolean (APIENTRY * PGLFNTESTOBJECTAPPLEPROC) (GLenum, GLuint); typedef void (APIENTRY * PGLFNFINISHOBJECTAPPLEPROC) (GLenum, GLuint); +/* GL_ATI_envmap_bumpmap */ +#ifndef GL_ATI_envmap_bumpmap +#define GL_BUMP_ROT_MATRIX_ATI 0x8775 +#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 +#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 +#define GL_BUMP_TEX_UNITS_ATI 0x8778 +#define GL_DUDV_ATI 0x8779 +#define GL_DU8DV8_ATI 0x877A +#define GL_BUMP_ENVMAP_ATI 0x877B +#define GL_BUMP_TARGET_ATI 0x877C +#endif +typedef void (APIENTRY * PGLFNTEXBUMPPARAMETERIVATIPROC) (GLenum, GLuint); +typedef void (APIENTRY * PGLFNTEXBUMPPARAMETERFVATIPROC) (GLenum, GLuint); +typedef void (APIENTRY * PGLFNGETTEXBUMPPARAMETERIVATIPROC) (GLenum, GLuint); +typedef void (APIENTRY * PGLFNGETTEXBUMPPARAMETERFVATIPROC) (GLenum, GLuint); /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 @@ -1522,6 +1537,7 @@ typedef enum _GL_SupportedExt { ATI_TEXTURE_ENV_COMBINE3, ATI_TEXTURE_MIRROR_ONCE, EXT_VERTEX_SHADER, + ATI_ENVMAP_BUMPMAP, /* APPLE */ APPLE_FENCE, @@ -1732,6 +1748,11 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNISFENCEAPPLEPROC, glIsFenceAPPLE); \ USE_GL_FUNC(PGLFNTESTOBJECTAPPLEPROC, glTestObjectAPPLE); \ USE_GL_FUNC(PGLFNFINISHOBJECTAPPLEPROC, glFinishObjectAPPLE); \ + /* GL_ATI_envmap_bumpmap */ \ + USE_GL_FUNC(PGLFNTEXBUMPPARAMETERIVATIPROC, glTexBumpParameterivATI); \ + USE_GL_FUNC(PGLFNTEXBUMPPARAMETERFVATIPROC, glTexBumpParameterfvATI); \ + USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERIVATIPROC, glGetTexBumpParameterivATI); \ + USE_GL_FUNC(PGLFNGETTEXBUMPPARAMETERFVATIPROC, glGetTexBumpParameterfvATI); \ /* OpenGL 2.0 functions */ #define GL2_FUNCS_GEN \

1 0

Andrew Talbot : dbghelp: Replace inline static with static inline.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 6a23efdaa27092b4512784200b901ed944bce83a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a23efdaa27092b4512784200… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 19 19:44:25 2007 +0000 dbghelp: Replace inline static with static inline. --- dlls/dbghelp/symbol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index d298b50..2907bf3 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -41,14 +41,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); WINE_DECLARE_DEBUG_CHANNEL(dbghelp_symt); -inline static int cmp_addr(ULONG64 a1, ULONG64 a2) +static inline int cmp_addr(ULONG64 a1, ULONG64 a2) { if (a1 > a2) return 1; if (a1 < a2) return -1; return 0; } -inline static int cmp_sorttab_addr(const struct module* module, int idx, ULONG64 addr) +static inline int cmp_sorttab_addr(const struct module* module, int idx, ULONG64 addr) { ULONG64 ref;

1 0

Alessandro Pignotti : dplayx: Check for null pointer dereference in DP_FindPlayer.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: d8b24e36645d11f89e0260c87f5c9270d6b0c90f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b24e36645d11f89e0260c87… Author: Alessandro Pignotti <alex.pigna(a)inventati.org> Date: Wed Mar 21 12:14:47 2007 +0100 dplayx: Check for null pointer dereference in DP_FindPlayer. --- dlls/dplayx/dplay.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 9889283..ed58ddf 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1280,6 +1280,9 @@ static lpPlayerList DP_FindPlayer( IDirectPlay2AImpl* This, DPID dpid ) TRACE( "(%p)->(0x%08x)\n", This, dpid ); + if(This->dp2->lpSysGroup == NULL) + return NULL; + DPQ_FIND_ENTRY( This->dp2->lpSysGroup->players, players, lpPData->dpid, ==, dpid, lpPlayers ); return lpPlayers;

1 0

Alexandre Julliard : winex11.drv: Relax the bitmap depth check in CreateBitmap to accept some compatible formats .
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: f14301003854352b9c67714d9e878ea862d5f9cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f14301003854352b9c67714d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 21 15:56:10 2007 +0100 winex11.drv: Relax the bitmap depth check in CreateBitmap to accept some compatible formats. --- dlls/winex11.drv/bitmap.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 75623e4..053c959 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -121,7 +121,13 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBit /* Check parameters */ if (bitmap.bmPlanes != 1) return FALSE; - if ((bitmap.bmBitsPixel != 1) && (bitmap.bmBitsPixel != screen_depth)) + /* check if bpp is compatible with screen depth */ + if (!((bitmap.bmBitsPixel == 1) || + (bitmap.bmBitsPixel == screen_depth) || + (bitmap.bmBitsPixel == 24 && screen_depth == 32) || + (bitmap.bmBitsPixel == 32 && screen_depth == 24) || + (bitmap.bmBitsPixel == 15 && screen_depth == 16) || + (bitmap.bmBitsPixel == 16 && screen_depth == 15))) { ERR("Trying to make bitmap with planes=%d, bpp=%d\n", bitmap.bmPlanes, bitmap.bmBitsPixel); @@ -139,9 +145,9 @@ BOOL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBit /* Create the pixmap */ wine_tsx11_lock(); - physBitmap->pixmap_depth = bitmap.bmBitsPixel; + physBitmap->pixmap_depth = (bitmap.bmBitsPixel == 1) ? 1 : screen_depth; physBitmap->pixmap = XCreatePixmap(gdi_display, root_window, - bitmap.bmWidth, bitmap.bmHeight, bitmap.bmBitsPixel); + bitmap.bmWidth, bitmap.bmHeight, physBitmap->pixmap_depth); wine_tsx11_unlock(); if (!physBitmap->pixmap) { @@ -178,7 +184,7 @@ LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) { BITMAP bitmap; X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); - LONG old_height, height; + LONG height; XImage *image; LPBYTE tbuf, startline; int h, w; @@ -188,21 +194,14 @@ LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) TRACE("(bmp=%p, buffer=%p, count=0x%x)\n", hbitmap, buffer, count); wine_tsx11_lock(); - - /* Hack: change the bitmap height temporarily to avoid */ - /* getting unnecessary bitmap rows. */ - - old_height = bitmap.bmHeight; - height = bitmap.bmHeight = count / bitmap.bmWidthBytes; - + height = count / bitmap.bmWidthBytes; image = XGetImage( gdi_display, physBitmap->pixmap, 0, 0, - bitmap.bmWidth, bitmap.bmHeight, AllPlanes, ZPixmap ); - bitmap.bmHeight = old_height; + bitmap.bmWidth, height, AllPlanes, ZPixmap ); /* copy XImage to 16 bit padded image buffer with real bitsperpixel */ startline = buffer; - switch (physBitmap->pixmap_depth) + switch (bitmap.bmBitsPixel) { case 1: for (h=0;h<height;h++) @@ -288,7 +287,7 @@ LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) } break; default: - FIXME("Unhandled bits:%d\n", physBitmap->pixmap_depth); + FIXME("Unhandled bits:%d\n", bitmap.bmBitsPixel); } XDestroyImage( image ); wine_tsx11_unlock(); @@ -334,7 +333,7 @@ LONG X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ) startline = bits; - switch (physBitmap->pixmap_depth) + switch (bitmap.bmBitsPixel) { case 1: for (h=0;h<height;h++) @@ -408,7 +407,7 @@ LONG X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ) } break; default: - FIXME("Unhandled bits:%d\n", physBitmap->pixmap_depth); + FIXME("Unhandled bits:%d\n", bitmap.bmBitsPixel); } XPutImage( gdi_display, physBitmap->pixmap, BITMAP_GC(physBitmap),

1 0

Dmitry Timoshkov : riched20: Add a test that shows that under Win9x RichEdit20W windows are not unicode , but always expect to see unicode input.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 11e01b17de059881c0d99262ef8fd89c0c65832d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11e01b17de059881c0d99262e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Mar 21 18:26:19 2007 +0800 riched20: Add a test that shows that under Win9x RichEdit20W windows are not unicode, but always expect to see unicode input. --- dlls/riched20/editor.c | 66 ++++++++++++++++++++------------ dlls/riched20/editor.h | 1 - dlls/riched20/tests/editor.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 26 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c9e9246..6b09b26 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -237,12 +237,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); +static BOOL ME_RegisterEditorClass(HINSTANCE); + +static const WCHAR RichEdit20W[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0}; +static const WCHAR RichEdit50W[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; +static const WCHAR REListBox20W[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; +static const WCHAR REComboBox20W[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; + int me_debug = 0; HANDLE me_heap = NULL; static BOOL ME_ListBoxRegistered = FALSE; static BOOL ME_ComboBoxRegistered = FALSE; +static inline int is_version_nt(void) +{ + return !(GetVersion() & 0x80000000); +} + static ME_TextBuffer *ME_MakeText(void) { ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); @@ -1232,11 +1244,6 @@ void ME_DestroyEditor(ME_TextEditor *editor) FREE_OBJ(editor); } -static const WCHAR wszClassName[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0}; -static const WCHAR wszClassName50[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; -static const WCHAR wszClassNameListBox[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; -static const WCHAR wszClassNameComboBox[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("\n"); @@ -1245,19 +1252,19 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); me_heap = HeapCreate (0, 0x10000, 0); - ME_RegisterEditorClass(hinstDLL); + if (!ME_RegisterEditorClass(hinstDLL)) return FALSE; LookupInit(); break; case DLL_PROCESS_DETACH: - UnregisterClassW(wszClassName, 0); - UnregisterClassW(wszClassName50, 0); + UnregisterClassW(RichEdit20W, 0); + UnregisterClassW(RichEdit50W, 0); UnregisterClassA("RichEdit20A", 0); UnregisterClassA("RichEdit50A", 0); if (ME_ListBoxRegistered) - UnregisterClassW(wszClassNameListBox, 0); + UnregisterClassW(REListBox20W, 0); if (ME_ComboBoxRegistered) - UnregisterClassW(wszClassNameComboBox, 0); + UnregisterClassW(REComboBox20W, 0); LookupCleanup(); HeapDestroy (me_heap); me_heap = NULL; @@ -1901,7 +1908,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP ME_EmptyUndoStack(editor); ME_SetSelection(editor, 0, 0); ME_UpdateRepaint(editor); - return 0; + return 1; } case EM_CANPASTE: { @@ -2703,9 +2710,8 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int nStart, int nChars, in return nWritten; } -void ME_RegisterEditorClass(HINSTANCE hInstance) +static BOOL ME_RegisterEditorClass(HINSTANCE hInstance) { - BOOL bResult; WNDCLASSW wcW; WNDCLASSA wcA; @@ -2718,12 +2724,22 @@ void ME_RegisterEditorClass(HINSTANCE hInstance) wcW.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_IBEAM)); wcW.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); wcW.lpszMenuName = NULL; - wcW.lpszClassName = wszClassName; - bResult = RegisterClassW(&wcW); - assert(bResult); - wcW.lpszClassName = wszClassName50; - bResult = RegisterClassW(&wcW); - assert(bResult); + + if (is_version_nt()) + { + wcW.lpszClassName = RichEdit20W; + if (!RegisterClassW(&wcW)) return FALSE; + wcW.lpszClassName = RichEdit50W; + if (!RegisterClassW(&wcW)) return FALSE; + } + else + { + /* WNDCLASSA/W have the same layout */ + wcW.lpszClassName = (LPCWSTR)"RichEdit20W"; + if (!RegisterClassA((WNDCLASSA *)&wcW)) return FALSE; + wcW.lpszClassName = (LPCWSTR)"RichEdit50W"; + if (!RegisterClassA((WNDCLASSA *)&wcW)) return FALSE; + } wcA.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS; wcA.lpfnWndProc = RichEditANSIWndProc; @@ -2735,11 +2751,11 @@ void ME_RegisterEditorClass(HINSTANCE hInstance) wcA.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); wcA.lpszMenuName = NULL; wcA.lpszClassName = "RichEdit20A"; - bResult = RegisterClassA(&wcA); - assert(bResult); + if (!RegisterClassA(&wcA)) return FALSE; wcA.lpszClassName = "RichEdit50A"; - bResult = RegisterClassA(&wcA); - assert(bResult); + if (!RegisterClassA(&wcA)) return FALSE; + + return TRUE; } LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -2781,7 +2797,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) { wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS; wcW.lpfnWndProc = REListWndProc; - wcW.lpszClassName = wszClassNameListBox; + wcW.lpszClassName = REListBox20W; if (RegisterClassW(&wcW)) ME_ListBoxRegistered = TRUE; } @@ -2789,7 +2805,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) { wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; wcW.lpfnWndProc = REComboWndProc; - wcW.lpszClassName = wszClassNameComboBox; + wcW.lpszClassName = REComboBox20W; if (RegisterClassW(&wcW)) ME_ComboBoxRegistered = TRUE; } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index ec56e3f..8329203 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -266,7 +266,6 @@ extern LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *); /* wintest.c */ /* editor.c */ -void ME_RegisterEditorClass(HINSTANCE hInstance); ME_TextEditor *ME_MakeEditor(HWND hWnd); void ME_DestroyEditor(ME_TextEditor *editor); void ME_SendOldNotify(ME_TextEditor *editor, int nCode); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 60ab7ab..2d66f74 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1562,6 +1562,89 @@ static void test_EM_StreamIn_Undo(void) } +static void test_unicode_conversions(void) +{ + static const WCHAR textW[] = {'t','e','s','t',0}; + static const char textA[] = "test"; + char bufA[64]; + WCHAR bufW[64]; + HWND hwnd; + int is_win9x, ret; + + is_win9x = GetVersion() & 0x80000000; + +#define set_textA(hwnd, txt) \ + do { \ + ret = SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)txt); \ + ok(ret, "SendMessageA(WM_SETTEXT) error %u\n", GetLastError()); \ + } while(0) +#define expect_textA(hwnd, txt, todo) \ + do { \ + memset(bufA, 0xAA, sizeof(bufA)); \ + ret = SendMessageA(hwnd, WM_GETTEXT, 64, (LPARAM)bufA); \ + ok(ret, "SendMessageA(WM_GETTEXT) error %u\n", GetLastError()); \ + ret = lstrcmpA(bufA, txt); \ + if (todo) \ + todo_wine ok(!ret, "strings not match: expected %s got %s\n", txt, bufA); \ + else \ + ok(!ret, "strings not match: expected %s got %s\n", txt, bufA); \ + } while(0) + +#define set_textW(hwnd, txt) \ + do { \ + ret = SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)txt); \ + ok(ret, "SendMessageW(WM_SETTEXT) error %u\n", GetLastError()); \ + } while(0) +#define expect_textW(hwnd, txt) \ + do { \ + memset(bufW, 0xAA, sizeof(bufW)); \ + ret = SendMessageW(hwnd, WM_GETTEXT, 64, (LPARAM)bufW); \ + ok(ret, "SendMessageW(WM_GETTEXT) error %u\n", GetLastError()); \ + ret = lstrcmpW(bufW, txt); \ + ok(!ret, "strings not match\n"); \ + } while(0) + + hwnd = CreateWindowExA(0, "RichEdit20W", NULL, WS_POPUP, + 0, 0, 200, 60, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + + ret = IsWindowUnicode(hwnd); + if (is_win9x) + ok(!ret, "RichEdit20W should NOT be unicode under Win9x\n"); + else + ok(ret, "RichEdit20W should be unicode under NT\n"); + + if (is_win9x) + set_textA(hwnd, textW); + else + set_textA(hwnd, textA); + expect_textA(hwnd, textA, is_win9x); + + if (!is_win9x) + { + set_textW(hwnd, textW); + expect_textW(hwnd, textW); + } + DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, "RichEdit20A", NULL, WS_POPUP, + 0, 0, 200, 60, 0, 0, 0, 0); + ok(hwnd != 0, "CreateWindowExA error %u\n", GetLastError()); + + ret = IsWindowUnicode(hwnd); + ok(!ret, "RichEdit20A should NOT be unicode\n"); + + set_textA(hwnd, textA); + expect_textA(hwnd, textA, FALSE); + + if (!is_win9x) + { + set_textW(hwnd, textW); + expect_textW(hwnd, textW); + } + DestroyWindow(hwnd); +} + START_TEST( editor ) { MSG msg; @@ -1571,6 +1654,7 @@ START_TEST( editor ) * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + test_EM_FINDTEXT(); test_EM_GETLINE(); test_EM_SCROLLCARET(); @@ -1591,6 +1675,7 @@ START_TEST( editor ) test_EM_EXSETSEL(); test_WM_PASTE(); test_EM_StreamIn_Undo(); + test_unicode_conversions(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Rob Shearman : ole32: The 16-bit version of CoDisconnectObject is not compatible with the 32-bit version , so create a separate stub for the former.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 3acb0a878d562fbc81a5c190fc6c97bd06c9e8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3acb0a878d562fbc81a5c190f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 21 12:37:08 2007 +0000 ole32: The 16-bit version of CoDisconnectObject is not compatible with the 32-bit version, so create a separate stub for the former. --- dlls/ole32/compobj.c | 1 - dlls/ole32/compobj.spec | 2 +- dlls/ole32/ole16.c | 9 +++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index fe180aa..4639831 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -833,7 +833,6 @@ void WINAPI CoUninitialize(void) /****************************************************************************** * CoDisconnectObject [OLE32.@] - * CoDisconnectObject [COMPOBJ.15] * * Disconnects all connections to this object from remote processes. Dispatches * pending RPCs while blocking new RPCs from occurring, and then calls diff --git a/dlls/ole32/compobj.spec b/dlls/ole32/compobj.spec index af94692..078dfc2 100644 --- a/dlls/ole32/compobj.spec +++ b/dlls/ole32/compobj.spec @@ -12,7 +12,7 @@ 12 stub COFREEALLLIBRARIES 13 pascal CoCreateInstance(ptr ptr long ptr ptr) CoCreateInstance16 14 stub STRINGFROMIID -15 pascal CoDisconnectObject(ptr long) CoDisconnectObject +15 pascal CoDisconnectObject(ptr long) CoDisconnectObject16 16 stub CORELEASEMARSHALDATA 17 pascal -ret16 CoFreeUnusedLibraries() CoFreeUnusedLibraries 18 pascal -ret16 IsEqualGUID(ptr ptr) IsEqualGUID16 diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index 410651c..d9c2202 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -648,6 +648,15 @@ HRESULT WINAPI CoCreateInstance16( } /*********************************************************************** + * CoDisconnectObject [COMPOBJ.15] + */ +HRESULT WINAPI CoDisconnectObject16( LPUNKNOWN lpUnk, DWORD reserved ) +{ + FIXME("(%p, 0x%08x): stub!\n", lpUnk, reserved); + return E_NOTIMPL; +} + +/*********************************************************************** * DllGetClassObject [OLE2.4] */ HRESULT WINAPI DllGetClassObject16(REFCLSID rclsid, REFIID iid, LPVOID *ppv)

1 0

Rob Shearman : winedump: Fix the output for Makefile. in with respect to the dependencies line to match that required by the build system .
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 9142716529f5a13b1f9166d84576d5f09837d8cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9142716529f5a13b1f9166d84… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 21 12:35:43 2007 +0000 winedump: Fix the output for Makefile.in with respect to the dependencies line to match that required by the build system. --- tools/winedump/output.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index dff22be..1b325ff 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -440,7 +440,8 @@ void output_makefile (void) fprintf (makefile, " %s", globals.forward_dll); fprintf (makefile, - "\n\nC_SRCS = \\\n\t%s_main.c\n\n@MAKE_DLL_RULES@\n\n### Dependencies:", + "\n\nC_SRCS = \\\n\t%s_main.c\n\n@MAKE_DLL_RULES@\n\n" + "@DEPENDENCIES@ # everything below this line is overwritten by make depend", OUTPUT_DLL_NAME); if (globals.forward_dll)

1 0

Rob Shearman : atl: Add support for the registrar parameter of AtlModuleUpdateRegistryFromResourceD .
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: d51c1c7a04dc471068b3685d72fdd808c78b3fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51c1c7a04dc471068b3685d7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 21 09:30:27 2007 +0000 atl: Add support for the registrar parameter of AtlModuleUpdateRegistryFromResourceD. --- dlls/atl/registrar.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 4282b40..f32ebb3 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -756,12 +756,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) extern HINSTANCE hInst; -static HRESULT do_register_dll_server(LPCOLESTR wszDll, LPCOLESTR wszId, - BOOL do_register, const struct _ATL_REGMAP_ENTRY* pMapEntries) +static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, + LPCOLESTR wszId, BOOL do_register, + const struct _ATL_REGMAP_ENTRY* pMapEntries) { WCHAR buf[MAX_PATH]; HRESULT hres; - IRegistrar *pRegistrar; const struct _ATL_REGMAP_ENTRY *pMapEntry; static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; @@ -769,7 +769,9 @@ static HRESULT do_register_dll_server(LPCOLESTR wszDll, LPCOLESTR wszId, static const WCHAR wszCLSID_ATLRegistrar[] = {'C','L','S','I','D','_','A','T','L','R','e','g','i','s','t','r','a','r',0}; - Registrar_create(NULL, &IID_IRegistrar, (void**)&pRegistrar); + if (!pRegistrar) + Registrar_create(NULL, &IID_IRegistrar, (void**)&pRegistrar); + IRegistrar_AddReplacement(pRegistrar, wszModule, wszDll); for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) @@ -790,7 +792,7 @@ static HRESULT do_register_dll_server(LPCOLESTR wszDll, LPCOLESTR wszId, static HRESULT do_register_server(BOOL do_register) { static const WCHAR wszDll[] = {'a','t','l','.','d','l','l',0}; - return do_register_dll_server(wszDll, MAKEINTRESOURCEW(101), do_register, NULL); + return do_register_dll_server(NULL, wszDll, MAKEINTRESOURCEW(101), do_register, NULL); } /*********************************************************************** @@ -806,11 +808,6 @@ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR */ WCHAR module_name[MAX_PATH]; - if(pReg) { - FIXME("Registrar parameter not supported\n"); - return E_FAIL; - } - if(!GetModuleFileNameW(lhInst, module_name, MAX_PATH)) { FIXME("hinst %p: did not get module name\n", lhInst); @@ -820,7 +817,7 @@ HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR TRACE("%p (%s), %s, %d, %p, %p\n", hInst, debugstr_w(module_name), debugstr_w(lpszRes), bRegister, pMapEntries, pReg); - return do_register_dll_server(module_name, lpszRes, bRegister, pMapEntries); + return do_register_dll_server(pReg, module_name, lpszRes, bRegister, pMapEntries); } /***********************************************************************

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
85
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2007