May 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Make use of GL_ARB_half_float_vertex.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: d2e12a19ca47cbd98b233b000b77f4f5a624247b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e12a19ca47cbd98b233b000… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 19:07:51 2009 +0200 wined3d: Make use of GL_ARB_half_float_vertex. This extension is a subset of GL_NV_half_float that defines support for the stream format(same constant), but doesn't define texture formats or immediate mode entrypoints. --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/directx.c | 8 +++++++- dlls/wined3d/drawprim.c | 2 ++ dlls/wined3d/utils.c | 6 +++--- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_gl.h | 7 +++++++ 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8f68f5d..666de8e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -214,7 +214,7 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, format = attrib->format_desc->format; /* Look for newly appeared conversion */ - if (!GL_SUPPORT(NV_HALF_FLOAT) && (format == WINED3DFMT_R16G16_FLOAT || format == WINED3DFMT_R16G16B16A16_FLOAT)) + if (!GL_SUPPORT(ARB_HALF_FLOAT_VERTEX) && (format == WINED3DFMT_R16G16_FLOAT || format == WINED3DFMT_R16G16B16A16_FLOAT)) { ret = buffer_process_converted_attribute(This, CONV_FLOAT16_2, attrib, stride_this_run); @@ -327,7 +327,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) /* Certain declaration types need some fixups before we can pass them to * opengl. This means D3DCOLOR attributes with fixed function vertex * processing, FLOAT4 POSITIONT with fixed function, and FLOAT16 if - * GL_NV_half_float is not supported. + * GL_ARB_half_float_vertex is not supported. * * Note for d3d8 and d3d9: * The vertex buffer FVF doesn't help with finding them, we have to use diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a859e08..61927fc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -92,6 +92,7 @@ static const struct { {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER, 0 }, {"GL_ARB_shader_objects", ARB_SHADER_OBJECTS, 0 }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD, 0 }, + {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX, 0 }, /* EXT */ {"GL_EXT_blend_color", EXT_BLEND_COLOR, 0 }, @@ -1009,6 +1010,10 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->supported[NV_TEXTURE_SHADER2] = FALSE; gl_info->supported[NV_TEXTURE_SHADER3] = FALSE; } + if(gl_info->supported[NV_HALF_FLOAT]) { + /* GL_ARB_half_float_vertex is a subset of GL_NV_half_float */ + gl_info->supported[ARB_HALF_FLOAT_VERTEX] = TRUE; + } } checkGLcall("extension detection\n"); @@ -3629,7 +3634,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DDTCAPS_UBYTE4N | WINED3DDTCAPS_SHORT2N | WINED3DDTCAPS_SHORT4N; - if (GL_SUPPORT(NV_HALF_FLOAT)) { + if (GL_SUPPORT(ARB_HALF_FLOAT_VERTEX)) { pCaps->DeclTypes |= WINED3DDTCAPS_FLOAT16_2 | WINED3DDTCAPS_FLOAT16_4; } @@ -4340,6 +4345,7 @@ static void fillGLAttribFuncs(const WineD3D_GL_Info *gl_info) multi_texcoord_funcs[WINED3D_FFP_EMIT_DEC3N] = invalid_texcoord_func; if (GL_SUPPORT(NV_HALF_FLOAT)) { + /* Not supported by ARB_HALF_FLOAT_VERTEX, so check for NV_HALF_FLOAT */ multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT16_2] = (glMultiTexCoordFunc)GL_EXTCALL(glMultiTexCoord2hvNV); multi_texcoord_funcs[WINED3D_FFP_EMIT_FLOAT16_4] = (glMultiTexCoordFunc)GL_EXTCALL(glMultiTexCoord4hvNV); } else { diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c96b975..68821b4 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -370,6 +370,7 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, WINED3DFORMAT format * byte float according to the IEEE standard */ if (GL_SUPPORT(NV_HALF_FLOAT)) { + /* Not supported by GL_ARB_half_float_vertex */ GL_EXTCALL(glVertexAttrib2hvNV(index, ptr)); } else { float x = float_16_to_32(((const unsigned short *)ptr) + 0); @@ -379,6 +380,7 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, WINED3DFORMAT format break; case WINED3DFMT_R16G16B16A16_FLOAT: if (GL_SUPPORT(NV_HALF_FLOAT)) { + /* Not supported by GL_ARB_half_float_vertex */ GL_EXTCALL(glVertexAttrib4hvNV(index, ptr)); } else { float x = float_16_to_32(((const unsigned short *)ptr) + 0); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7eb3d59..d697372 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -651,15 +651,15 @@ static void apply_format_fixups(WineD3D_GL_Info *gl_info) gl_info->gl_formats[idx].gl_vtx_format = GL_BGRA; } - if (GL_SUPPORT(NV_HALF_FLOAT)) + if (GL_SUPPORT(ARB_HALF_FLOAT_VERTEX)) { /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. * It is the job of the vertex buffer code to make sure that the vbos have the right format */ idx = getFmtIdx(WINED3DFMT_R16G16_FLOAT); - gl_info->gl_formats[idx].gl_vtx_type = GL_HALF_FLOAT_NV; + gl_info->gl_formats[idx].gl_vtx_type = GL_HALF_FLOAT; /* == GL_HALF_FLOAT_NV */ idx = getFmtIdx(WINED3DFMT_R16G16B16A16_FLOAT); - gl_info->gl_formats[idx].gl_vtx_type = GL_HALF_FLOAT_NV; + gl_info->gl_formats[idx].gl_vtx_type = GL_HALF_FLOAT; } } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 0e41494..2c2b763 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -261,7 +261,7 @@ HRESULT vertexdeclaration_init(IWineD3DVertexDeclarationImpl *This, if (elements[i].format == WINED3DFMT_R16G16_FLOAT || elements[i].format == WINED3DFMT_R16G16B16A16_FLOAT) { - if (!GL_SUPPORT(NV_HALF_FLOAT)) This->half_float_conv_needed = TRUE; + if (!GL_SUPPORT(ARB_HALF_FLOAT_VERTEX)) This->half_float_conv_needed = TRUE; } } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 63763aa..2072391 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -2537,6 +2537,12 @@ typedef void (WINE_GLAPI * PGLFNGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint #define GL_DECR_WRAP_EXT 0x8508 #endif +/* GL_ARB_half_float_vertex */ +#ifndef GL_ARB_half_float_vertex +#define GL_ARB_half_float_vertex +/* No _ARB, see extension spec */ +#define GL_HALF_FLOAT 0x140B +#endif /* GL_NV_half_float */ #ifndef GL_NV_half_float #define GL_NV_half_float 1 @@ -3398,6 +3404,7 @@ typedef enum _GL_SupportedExt { ARB_VERTEX_SHADER, ARB_SHADER_OBJECTS, ARB_SHADER_TEXTURE_LOD, + ARB_HALF_FLOAT_VERTEX, /* EXT */ EXT_BLEND_COLOR, EXT_BLEND_MINMAX,

1 0

Stefan Dösinger : wined3d: Pack ARB srgb constants better.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: df5d82dd5ba50a81082caef743a16411bda8242f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5d82dd5ba50a81082caef74… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 21:31:29 2009 +0200 wined3d: Pack ARB srgb constants better. There's no need to waste constants for repeatedly loading the same value. --- dlls/wined3d/arb_program_shader.c | 44 +++++++++++++----------------------- 1 files changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 16d8421..1fcae76 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -344,16 +344,10 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh } if(device->stateBlock->renderState[WINED3DRS_SRGBWRITEENABLE] && pshader) { - shader_addline(buffer, "PARAM srgb_mul_low = {%f, %f, %f, 1.0};\n", - srgb_mul_low, srgb_mul_low, srgb_mul_low); - shader_addline(buffer, "PARAM srgb_comparison = {%f, %f, %f, %f};\n", - srgb_cmp, srgb_cmp, srgb_cmp, srgb_cmp); - shader_addline(buffer, "PARAM srgb_pow = {%f, %f, %f, 1.0};\n", - srgb_pow, srgb_pow, srgb_pow); - shader_addline(buffer, "PARAM srgb_mul_hi = {%f, %f, %f, 1.0};\n", - srgb_mul_high, srgb_mul_high, srgb_mul_high); - shader_addline(buffer, "PARAM srgb_sub_hi = {%f, %f, %f, 0.0};\n", - srgb_sub_high, srgb_sub_high, srgb_sub_high); + shader_addline(buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", + srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); + shader_addline(buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", + srgb_sub_high, 0.0, 0.0, 0.0); } /* Load local constants using the program-local space, @@ -1958,16 +1952,16 @@ static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcol /* Perform sRGB write correction. See GLX_EXT_framebuffer_sRGB */ /* Calculate the > 0.0031308 case */ - shader_addline(buffer, "POW %s.x, %s.x, srgb_pow.x;\n", tmp1, fragcolor); - shader_addline(buffer, "POW %s.y, %s.y, srgb_pow.y;\n", tmp1, fragcolor); - shader_addline(buffer, "POW %s.z, %s.z, srgb_pow.z;\n", tmp1, fragcolor); - shader_addline(buffer, "MUL %s, %s, srgb_mul_hi;\n", tmp1, tmp1); - shader_addline(buffer, "SUB %s, %s, srgb_sub_hi;\n", tmp1, tmp1); + shader_addline(buffer, "POW %s.x, %s.x, srgb_consts1.z;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.y, %s.y, srgb_consts1.z;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.z, %s.z, srgb_consts1.z;\n", tmp1, fragcolor); + shader_addline(buffer, "MUL %s, %s, srgb_consts1.w;\n", tmp1, tmp1); + shader_addline(buffer, "SUB %s, %s, srgb_consts2.x;\n", tmp1, tmp1); /* Calculate the < case */ - shader_addline(buffer, "MUL %s, srgb_mul_low, %s;\n", tmp2, fragcolor); + shader_addline(buffer, "MUL %s, srgb_consts1.x, %s;\n", tmp2, fragcolor); /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ - shader_addline(buffer, "SLT %s, srgb_comparison, %s;\n", tmp3, fragcolor); - shader_addline(buffer, "SGE %s, srgb_comparison, %s;\n", tmp4, fragcolor); + shader_addline(buffer, "SLT %s, srgb_consts1.y, %s;\n", tmp3, fragcolor); + shader_addline(buffer, "SGE %s, srgb_consts1.y, %s;\n", tmp4, fragcolor); /* Store the components > 0.0031308 in the destination */ shader_addline(buffer, "MUL %s, %s, %s;\n", fragcolor, tmp1, tmp3); /* Add the components that are < 0.0031308 */ @@ -2858,16 +2852,10 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi shader_addline(&buffer, "PARAM specular_enable = program.env[%u];\n", ARB_FFP_CONST_SPECULAR_ENABLE); if(settings->sRGB_write) { - shader_addline(&buffer, "PARAM srgb_mul_low = {%f, %f, %f, 1.0};\n", - srgb_mul_low, srgb_mul_low, srgb_mul_low); - shader_addline(&buffer, "PARAM srgb_comparison = {%f, %f, %f, %f};\n", - srgb_cmp, srgb_cmp, srgb_cmp, srgb_cmp); - shader_addline(&buffer, "PARAM srgb_pow = {%f, %f, %f, 1.0};\n", - srgb_pow, srgb_pow, srgb_pow); - shader_addline(&buffer, "PARAM srgb_mul_hi = {%f, %f, %f, 1.0};\n", - srgb_mul_high, srgb_mul_high, srgb_mul_high); - shader_addline(&buffer, "PARAM srgb_sub_hi = {%f, %f, %f, 0.0};\n", - srgb_sub_high, srgb_sub_high, srgb_sub_high); + shader_addline(&buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n", + srgb_mul_low, srgb_cmp, srgb_pow, srgb_mul_high); + shader_addline(&buffer, "PARAM srgb_consts2 = {%f, %f, %f, %f};\n", + srgb_sub_high, 0.0, 0.0, 0.0); } /* Generate texture sampling instructions) */

1 0

Michael Stefaniuc : notepad: Use the explicit SendMessageW form.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 0c702d140c77b91b9fdf429e80acf05454a0d4ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c702d140c77b91b9fdf429e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 5 12:18:43 2009 +0200 notepad: Use the explicit SendMessageW form. --- programs/notepad/dialog.c | 42 +++++++++++++++++++++--------------------- programs/notepad/main.c | 26 +++++++++++++------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 0abbc33..8a3389b 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -160,7 +160,7 @@ static VOID DoSaveFile(VOID) if (!WriteFile(hFile, pTemp, size, &dwNumWrite, NULL)) ShowLastError(); else - SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); + SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0); SetEndOfFile(hFile); CloseHandle(hFile); @@ -177,7 +177,7 @@ BOOL DoCloseFile(void) int nResult; static const WCHAR empty_strW[] = { 0 }; - if (SendMessage(Globals.hEdit, EM_GETMODIFY, 0, 0)) + if (SendMessageW(Globals.hEdit, EM_GETMODIFY, 0, 0)) { /* prompt user to save changes */ nResult = AlertFileNotSaved(Globals.szFileName); @@ -255,18 +255,18 @@ void DoOpenFile(LPCWSTR szFileName) HeapFree(GetProcessHeap(), 0, pTemp); - SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); - SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); + SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0); + SendMessageW(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SetFocus(Globals.hEdit); /* If the file starts with .LOG, add a time/date at the end and set cursor after */ if (GetWindowTextW(Globals.hEdit, log, sizeof(log)/sizeof(log[0])) && !lstrcmp(log, dotlog)) { static const WCHAR lfW[] = { '\r','\n',0 }; - SendMessage(Globals.hEdit, EM_SETSEL, GetWindowTextLength(Globals.hEdit), -1); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lfW); + SendMessageW(Globals.hEdit, EM_SETSEL, GetWindowTextLength(Globals.hEdit), -1); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lfW); DIALOG_EditTimeDate(); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lfW); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)lfW); } SetFileName(szFileName); @@ -280,7 +280,7 @@ VOID DIALOG_FileNew(VOID) /* Close any files and prompt to save changes */ if (DoCloseFile()) { SetWindowText(Globals.hEdit, empty_strW); - SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); + SendMessageW(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SetFocus(Globals.hEdit); } } @@ -618,32 +618,32 @@ VOID DIALOG_FileExit(VOID) VOID DIALOG_EditUndo(VOID) { - SendMessage(Globals.hEdit, EM_UNDO, 0, 0); + SendMessageW(Globals.hEdit, EM_UNDO, 0, 0); } VOID DIALOG_EditCut(VOID) { - SendMessage(Globals.hEdit, WM_CUT, 0, 0); + SendMessageW(Globals.hEdit, WM_CUT, 0, 0); } VOID DIALOG_EditCopy(VOID) { - SendMessage(Globals.hEdit, WM_COPY, 0, 0); + SendMessageW(Globals.hEdit, WM_COPY, 0, 0); } VOID DIALOG_EditPaste(VOID) { - SendMessage(Globals.hEdit, WM_PASTE, 0, 0); + SendMessageW(Globals.hEdit, WM_PASTE, 0, 0); } VOID DIALOG_EditDelete(VOID) { - SendMessage(Globals.hEdit, WM_CLEAR, 0, 0); + SendMessageW(Globals.hEdit, WM_CLEAR, 0, 0); } VOID DIALOG_EditSelectAll(VOID) { - SendMessage(Globals.hEdit, EM_SETSEL, 0, (LPARAM)-1); + SendMessageW(Globals.hEdit, EM_SETSEL, 0, -1); } VOID DIALOG_EditTimeDate(VOID) @@ -655,12 +655,12 @@ VOID DIALOG_EditTimeDate(VOID) GetLocalTime(&st); GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, szDate, MAX_STRING_LEN); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)spaceW); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)spaceW); GetDateFormat(LOCALE_USER_DEFAULT, 0, &st, NULL, szDate, MAX_STRING_LEN); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); } VOID DIALOG_EditWrap(VOID) @@ -681,16 +681,16 @@ VOID DIALOG_EditWrap(VOID) return; } GetWindowText(Globals.hEdit, pTemp, size); - modify = SendMessage(Globals.hEdit, EM_GETMODIFY, 0, 0); + modify = SendMessageW(Globals.hEdit, EM_GETMODIFY, 0, 0); DestroyWindow(Globals.hEdit); GetClientRect(Globals.hMainWnd, &rc); if( Globals.bWrapLongLines ) dwStyle |= WS_HSCROLL | ES_AUTOHSCROLL; Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, dwStyle, 0, 0, rc.right, rc.bottom, Globals.hMainWnd, NULL, Globals.hInstance, NULL); - SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE); + SendMessageW(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE); SetWindowTextW(Globals.hEdit, pTemp); - SendMessage(Globals.hEdit, EM_SETMODIFY, (WPARAM)modify, 0); + SendMessageW(Globals.hEdit, EM_SETMODIFY, modify, 0); SetFocus(Globals.hEdit); HeapFree(GetProcessHeap(), 0, pTemp); @@ -716,7 +716,7 @@ VOID DIALOG_SelectFont(VOID) Globals.hFont=CreateFontIndirect( &lf ); Globals.lfFont=lf; - SendMessage( Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)TRUE ); + SendMessageW( Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, TRUE ); if( currfont!=NULL ) DeleteObject( currfont ); } diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 33b4859..5d462a0 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -343,10 +343,10 @@ static VOID NOTEPAD_InitMenuPopup(HMENU menu, int index) int enable; EnableMenuItem(menu, CMD_UNDO, - SendMessage(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); + SendMessageW(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(menu, CMD_PASTE, IsClipboardFormatAvailable(CF_TEXT) ? MF_ENABLED : MF_GRAYED); - enable = SendMessage(Globals.hEdit, EM_GETSEL, 0, 0); + enable = SendMessageW(Globals.hEdit, EM_GETSEL, 0, 0); enable = (HIWORD(enable) == LOWORD(enable)) ? MF_GRAYED : MF_ENABLED; EnableMenuItem(menu, CMD_CUT, enable); EnableMenuItem(menu, CMD_COPY, enable); @@ -385,7 +385,7 @@ void NOTEPAD_DoFind(FINDREPLACE *fr) if (!content) return; GetWindowText(Globals.hEdit, content, fileLen); - SendMessage(Globals.hEdit, EM_GETSEL, 0, (LPARAM)&pos); + SendMessageW(Globals.hEdit, EM_GETSEL, 0, (LPARAM)&pos); switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) { case 0: @@ -412,7 +412,7 @@ void NOTEPAD_DoFind(FINDREPLACE *fr) return; } - SendMessage(Globals.hEdit, EM_SETSEL, found - content, found - content + len); + SendMessageW(Globals.hEdit, EM_SETSEL, found - content, found - content + len); } void NOTEPAD_DoReplace(FINDREPLACE *fr) @@ -428,16 +428,16 @@ void NOTEPAD_DoReplace(FINDREPLACE *fr) if (!content) return; GetWindowText(Globals.hEdit, content, fileLen); - SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM)&pos_start, (LPARAM)&pos); + SendMessageW(Globals.hEdit, EM_GETSEL, (WPARAM)&pos_start, (LPARAM)&pos); switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) { case FR_DOWN: if ( pos-pos_start == len && StrCmpNI(fr->lpstrFindWhat, content+pos_start, len) == 0) - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); break; case FR_DOWN|FR_MATCHCASE: if ( pos-pos_start == len && StrCmpN(fr->lpstrFindWhat, content+pos_start, len) == 0) - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); break; default: /* shouldn't happen */ return; @@ -455,14 +455,14 @@ void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) int fileLen; DWORD pos; - SendMessage(Globals.hEdit, EM_SETSEL, 0, 0); + SendMessageW(Globals.hEdit, EM_SETSEL, 0, 0); while(TRUE){ fileLen = GetWindowTextLength(Globals.hEdit) + 1; content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(TCHAR)); if (!content) return; GetWindowText(Globals.hEdit, content, fileLen); - SendMessage(Globals.hEdit, EM_GETSEL, 0, (LPARAM)&pos); + SendMessageW(Globals.hEdit, EM_GETSEL, 0, (LPARAM)&pos); switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) { case FR_DOWN: @@ -478,11 +478,11 @@ void NOTEPAD_DoReplaceAll(FINDREPLACE *fr) if(found == NULL) { - SendMessage(Globals.hEdit, EM_SETSEL, 0, 0); + SendMessageW(Globals.hEdit, EM_SETSEL, 0, 0); return; } - SendMessage(Globals.hEdit, EM_SETSEL, found - content, found - content + len); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); + SendMessageW(Globals.hEdit, EM_SETSEL, found - content, found - content + len); + SendMessageW(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)fr->lpstrReplaceWith); } } @@ -535,7 +535,7 @@ static LRESULT WINAPI NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, NULL, Globals.hInstance, NULL); Globals.hFont = CreateFontIndirect(&Globals.lfFont); - SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)FALSE); + SendMessageW(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, FALSE); break; }

1 0

Hans Leidekker : ole32: Add tests to show that COM needs to be initialized only once for multi-threaded apartments .
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: d2820c06845a3b40fde24f67a1416907463736ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2820c06845a3b40fde24f67a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 5 12:48:33 2009 +0200 ole32: Add tests to show that COM needs to be initialized only once for multi-threaded apartments. --- dlls/ole32/tests/compobj.c | 103 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 97 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d0c6281..4dd0ace 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -218,11 +218,36 @@ static void test_StringFromGUID2(void) ok(len == 0, "len: %d (expected 0)\n", len); } +struct info +{ + HANDLE wait, stop; +}; + +static DWORD CALLBACK ole_initialize_thread(LPVOID pv) +{ + HRESULT hr; + struct info *info = pv; + + hr = pCoInitializeEx(NULL, COINIT_MULTITHREADED); + + SetEvent(info->wait); + WaitForSingleObject(info->stop, INFINITE); + + CoUninitialize(); + return hr; +} + static void test_CoCreateInstance(void) { - REFCLSID rclsid = &CLSID_MyComputer; - IUnknown *pUnk = (IUnknown *)0xdeadbeef; - HRESULT hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + HRESULT hr; + HANDLE thread; + DWORD tid, exitcode; + IUnknown *pUnk; + struct info info; + REFCLSID rclsid = &CLSID_InternetZoneManager; + + pUnk = (IUnknown *)0xdeadbeef; + hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); ok(pUnk == NULL, "CoCreateInstance should have changed the passed in pointer to NULL, instead of %p\n", pUnk); @@ -234,19 +259,85 @@ static void test_CoCreateInstance(void) hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); ok(hr == CO_E_NOTINITIALIZED, "CoCreateInstance should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + + /* show that COM doesn't have to be initialized for multi-threaded apartments if another + thread has already done so */ + + info.wait = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + info.stop = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + + WaitForSingleObject(info.wait, INFINITE); + + pUnk = (IUnknown *)0xdeadbeef; + hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); + todo_wine ok(hr == S_OK, "CoCreateInstance should have returned S_OK instead of 0x%08x\n", hr); + if (pUnk) IUnknown_Release(pUnk); + + SetEvent(info.stop); + WaitForSingleObject(thread, INFINITE); + + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); + + CloseHandle(thread); + CloseHandle(info.wait); + CloseHandle(info.stop); } static void test_CoGetClassObject(void) { - IUnknown *pUnk = (IUnknown *)0xdeadbeef; - HRESULT hr = CoGetClassObject(&CLSID_MyComputer, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); + HRESULT hr; + HANDLE thread; + DWORD tid, exitcode; + IUnknown *pUnk; + struct info info; + REFCLSID rclsid = &CLSID_InternetZoneManager; + + hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); ok(hr == CO_E_NOTINITIALIZED, "CoGetClassObject should have returned CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); ok(pUnk == NULL, "CoGetClassObject should have changed the passed in pointer to NULL, instead of %p\n", pUnk); - hr = CoGetClassObject(&CLSID_MyComputer, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, NULL); + hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, NULL); ok(hr == E_INVALIDARG || broken(hr == CO_E_NOTINITIALIZED), /* win9x */ "CoGetClassObject should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + /* show that COM doesn't have to be initialized for multi-threaded apartments if another + thread has already done so */ + + info.wait = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.wait != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + info.stop = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(info.stop != NULL, "CreateEvent failed with error %d\n", GetLastError()); + + thread = CreateThread(NULL, 0, ole_initialize_thread, &info, 0, &tid); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + + WaitForSingleObject(info.wait, INFINITE); + + pUnk = (IUnknown *)0xdeadbeef; + hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); + todo_wine ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); + if (pUnk) IUnknown_Release(pUnk); + + SetEvent(info.stop); + WaitForSingleObject(thread, INFINITE); + + GetExitCodeThread(thread, &exitcode); + hr = exitcode; + ok(hr == S_OK, "thread should have returned S_OK instead of 0x%08x\n", hr); + + CloseHandle(thread); + CloseHandle(info.wait); + CloseHandle(info.stop); } static ATOM register_dummy_class(void)

1 0

Hans Leidekker : ole32: Use existing MTA in CoGetClassObject and CoCreateInstance.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: bd4975acb0b682bbf2b4934d12f942ea629f5bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4975acb0b682bbf2b4934d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 5 12:49:17 2009 +0200 ole32: Use existing MTA in CoGetClassObject and CoCreateInstance. Custom actions in the CS3 installer depend on this. --- dlls/ole32/compobj.c | 56 +++++++++++++++++++++++++++++++++++++++---- dlls/ole32/tests/compobj.c | 4 +- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4a57009..4440d77 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -493,6 +493,31 @@ static APARTMENT *apartment_findmain(void) return result; } +/* gets the multi-threaded apartment if it exists. The caller must + * release the reference from the apartment as soon as the apartment pointer + * is no longer required. */ +static APARTMENT *apartment_find_multi_threaded(void) +{ + APARTMENT *result = NULL; + struct list *cursor; + + EnterCriticalSection(&csApartment); + + LIST_FOR_EACH( cursor, &apts ) + { + struct apartment *apt = LIST_ENTRY( cursor, struct apartment, entry ); + if (apt->multi_threaded) + { + result = apt; + apartment_addref(result); + break; + } + } + + LeaveCriticalSection(&csApartment); + return result; +} + struct host_object_params { HKEY hkeydll; @@ -2237,6 +2262,7 @@ HRESULT WINAPI CoGetClassObject( LPUNKNOWN regClassObject; HRESULT hres = E_UNEXPECTED; APARTMENT *apt; + BOOL release_apt = FALSE; TRACE("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); @@ -2245,11 +2271,14 @@ HRESULT WINAPI CoGetClassObject( *ppv = NULL; - apt = COM_CurrentApt(); - if (!apt) + if (!(apt = COM_CurrentApt())) { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; + if (!(apt = apartment_find_multi_threaded())) + { + ERR("apartment not initialised\n"); + return CO_E_NOTINITIALIZED; + } + release_apt = TRUE; } if (pServerInfo) { @@ -2273,7 +2302,7 @@ HRESULT WINAPI CoGetClassObject( * is good since we are not returning it in the "out" parameter. */ IUnknown_Release(regClassObject); - + if (release_apt) apartment_release(apt); return hres; } @@ -2284,7 +2313,10 @@ HRESULT WINAPI CoGetClassObject( HKEY hkey; if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) + { + if (release_apt) apartment_release(apt); return FTMarshalCF_Create(iid, ppv); + } hres = COM_OpenKeyForCLSID(rclsid, wszInprocServer32, KEY_READ, &hkey); if (FAILED(hres)) @@ -2308,7 +2340,10 @@ HRESULT WINAPI CoGetClassObject( /* return if we got a class, otherwise fall through to one of the * other types */ if (SUCCEEDED(hres)) + { + if (release_apt) apartment_release(apt); return hres; + } } /* Next try in-process handler */ @@ -2339,8 +2374,12 @@ HRESULT WINAPI CoGetClassObject( /* return if we got a class, otherwise fall through to one of the * other types */ if (SUCCEEDED(hres)) + { + if (release_apt) apartment_release(apt); return hres; + } } + if (release_apt) apartment_release(apt); /* Next try out of process */ if (CLSCTX_LOCAL_SERVER & dwClsContext) @@ -2418,6 +2457,7 @@ HRESULT WINAPI CoCreateInstance( { HRESULT hres; LPCLASSFACTORY lpclf = 0; + APARTMENT *apt; TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); @@ -2433,10 +2473,14 @@ HRESULT WINAPI CoCreateInstance( */ *ppv = 0; - if (!COM_CurrentApt()) + if (!(apt = COM_CurrentApt())) { + if (!(apt = apartment_find_multi_threaded())) + { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; + } + apartment_release(apt); } /* diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 4dd0ace..7363f30 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -276,7 +276,7 @@ static void test_CoCreateInstance(void) pUnk = (IUnknown *)0xdeadbeef; hr = CoCreateInstance(rclsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); - todo_wine ok(hr == S_OK, "CoCreateInstance should have returned S_OK instead of 0x%08x\n", hr); + ok(hr == S_OK, "CoCreateInstance should have returned S_OK instead of 0x%08x\n", hr); if (pUnk) IUnknown_Release(pUnk); SetEvent(info.stop); @@ -325,7 +325,7 @@ static void test_CoGetClassObject(void) pUnk = (IUnknown *)0xdeadbeef; hr = CoGetClassObject(rclsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); - todo_wine ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); + ok(hr == S_OK, "CoGetClassObject should have returned S_OK instead of 0x%08x\n", hr); if (pUnk) IUnknown_Release(pUnk); SetEvent(info.stop);

1 0

Alexandre Julliard : winex11: Limit window dimensions to 65535 to avoid 16-bit truncation issues.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: a4644f126b79c9501592b499ea8b9ed53767598c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4644f126b79c9501592b499e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 5 15:36:25 2009 +0200 winex11: Limit window dimensions to 65535 to avoid 16-bit truncation issues. --- dlls/winex11.drv/window.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 8eccfe1..56f99cb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -334,7 +334,9 @@ static Window create_client_window( Display *display, struct x11drv_win_data *da mask = CWEventMask | CWBitGravity | CWWinGravity | CWBackingStore; if ((cx = data->client_rect.right - data->client_rect.left) <= 0) cx = 1; + else if (cx > 65535) cx = 65535; if ((cy = data->client_rect.bottom - data->client_rect.top) <= 0) cy = 1; + else if (cy > 65535) cy = 65535; wine_tsx11_lock(); @@ -711,11 +713,13 @@ static int get_window_changes( XWindowChanges *changes, const RECT *old, const R if (old->right - old->left != new->right - new->left ) { if ((changes->width = new->right - new->left) <= 0) changes->width = 1; + else if (changes->width > 65535) changes->width = 65535; mask |= CWWidth; } if (old->bottom - old->top != new->bottom - new->top) { if ((changes->height = new->bottom - new->top) <= 0) changes->height = 1; + else if (changes->height > 65535) changes->height = 65535; mask |= CWHeight; } if (old->left != new->left) @@ -1289,6 +1293,8 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data changes.height = data->whole_rect.bottom - data->whole_rect.top; /* if window rect is empty force size to 1x1 */ if (changes.width <= 0 || changes.height <= 0) changes.width = changes.height = 1; + if (changes.width > 65535) changes.width = 65535; + if (changes.height > 65535) changes.height = 65535; mask |= CWWidth | CWHeight; } @@ -1438,7 +1444,9 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat DWORD layered_flags; if (!(cx = data->window_rect.right - data->window_rect.left)) cx = 1; + else if (cx > 65535) cx = 65535; if (!(cy = data->window_rect.bottom - data->window_rect.top)) cy = 1; + else if (cy > 65535) cy = 65535; if (!data->managed && is_window_managed( data->hwnd, SWP_NOACTIVATE, &data->window_rect )) {

1 0

Alexandre Julliard : wininet: Pass the complete redirected URL in INTERNET_STATUS_REDIRECT callbacks.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 9ee1b060560c86337bfc554f6d515c6ff91e7dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee1b060560c86337bfc554f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 4 20:49:15 2009 +0200 wininet: Pass the complete redirected URL in INTERNET_STATUS_REDIRECT callbacks. --- dlls/wininet/http.c | 156 ++++++++++++++++++++++++++++---------------------- 1 files changed, 87 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ee1b060560c86337bfc5…

1 0

Vitaliy Margolen : xinput1_3: Better match native export order.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 6f60208401a2d7eb6bc43a229eaebec1a25c7678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f60208401a2d7eb6bc43a229… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon May 4 11:35:18 2009 -0600 xinput1_3: Better match native export order. --- dlls/xinput1_3/xinput1_3.spec | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3.spec b/dlls/xinput1_3/xinput1_3.spec index be1f411..5b7f1b9 100644 --- a/dlls/xinput1_3/xinput1_3.spec +++ b/dlls/xinput1_3/xinput1_3.spec @@ -1,7 +1,8 @@ -@ stdcall XInputEnable(long) -@ stdcall XInputSetState(long ptr) -@ stdcall XInputGetState(long ptr) -@ stdcall XInputGetKeystroke(long long ptr) -@ stdcall XInputGetCapabilities(long long ptr) -@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) -@ stdcall XInputGetBatteryInformation(long ptr ptr) +1 stdcall DllMain(long long ptr) +2 stdcall XInputGetState(long ptr) +3 stdcall XInputSetState(long ptr) +4 stdcall XInputGetCapabilities(long long ptr) +5 stdcall XInputEnable(long) +6 stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) +7 stdcall XInputGetBatteryInformation(long ptr ptr) +8 stdcall XInputGetKeystroke(long long ptr)

1 0

Detlef Riekenberg : msi/tests: Run tests again with older msi versions ( MsiApplyMultiplePatchesA).
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: a31e9a1bfa509bbd96c0c4fc4be95c7412e9766e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a31e9a1bfa509bbd96c0c4fc4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon May 4 23:08:52 2009 +0200 msi/tests: Run tests again with older msi versions (MsiApplyMultiplePatchesA). --- dlls/msi/tests/package.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 82b7110..a7e5261 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -32,6 +32,8 @@ static const char msifile[] = "winetest.msi"; char CURR_DIR[MAX_PATH]; +static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); + static void get_user_sid(LPSTR *usersid) { HANDLE token; @@ -11537,13 +11539,18 @@ static void test_MsiApplyMultiplePatches(void) { UINT r, type = GetDriveType(NULL); - r = MsiApplyMultiplePatchesA(NULL, NULL, NULL); + if (!pMsiApplyMultiplePatchesA) { + win_skip("MsiApplyMultiplePatchesA not found\n"); + return; + } + + r = pMsiApplyMultiplePatchesA(NULL, NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); - r = MsiApplyMultiplePatchesA("", NULL, NULL); + r = pMsiApplyMultiplePatchesA("", NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); - r = MsiApplyMultiplePatchesA(";", NULL, NULL); + r = pMsiApplyMultiplePatchesA(";", NULL, NULL); todo_wine { if (type == DRIVE_FIXED) @@ -11554,7 +11561,7 @@ static void test_MsiApplyMultiplePatches(void) "Expected ERROR_INVALID_NAME, got %u\n", r); } - r = MsiApplyMultiplePatchesA(" ;", NULL, NULL); + r = pMsiApplyMultiplePatchesA(" ;", NULL, NULL); todo_wine { if (type == DRIVE_FIXED) @@ -11565,7 +11572,7 @@ static void test_MsiApplyMultiplePatches(void) "Expected ERROR_INVALID_NAME, got %u\n", r); } - r = MsiApplyMultiplePatchesA(";;", NULL, NULL); + r = pMsiApplyMultiplePatchesA(";;", NULL, NULL); todo_wine { if (type == DRIVE_FIXED) @@ -11576,10 +11583,10 @@ static void test_MsiApplyMultiplePatches(void) "Expected ERROR_INVALID_NAME, got %u\n", r); } - r = MsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); + r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); - r = MsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); + r = pMsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); todo_wine { if (type == DRIVE_FIXED) @@ -11590,15 +11597,19 @@ static void test_MsiApplyMultiplePatches(void) "Expected ERROR_INVALID_NAME, got %u\n", r); } - r = MsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); + r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); - r = MsiApplyMultiplePatchesA(" nosuchpatchpackage ; nosuchpatchpackage ", NULL, NULL); + r = pMsiApplyMultiplePatchesA(" nosuchpatchpackage ; nosuchpatchpackage ", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); } START_TEST(package) { + HMODULE hmsi = GetModuleHandleA("msi.dll"); + + pMsiApplyMultiplePatchesA = (void *)GetProcAddress(hmsi, "MsiApplyMultiplePatchesA"); + GetCurrentDirectoryA(MAX_PATH, CURR_DIR); test_createpackage();

1 0

Vincent Povirk : gdiplus: Implement GdipSetLineSigmaBlend.
by Alexandre Julliard 05 May '09

05 May '09

Module: wine Branch: master Commit: 1860b3261813166452efe5cdd4773c9804ad1704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1860b3261813166452efe5cdd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon May 4 17:53:48 2009 -0500 gdiplus: Implement GdipSetLineSigmaBlend. --- dlls/gdiplus/brush.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 74e7764..60d5970 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1193,15 +1193,57 @@ GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient *line, GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient *line, REAL focus, REAL scale) { - static int calls; + REAL factors[33]; + REAL positions[33]; + int num_points = 0; + int i; + const int precision = 16; + REAL erf_range; /* we use values erf(-erf_range) through erf(+erf_range) */ + REAL min_erf; + REAL scale_erf; + + TRACE("(%p, %0.2f, %0.2f)\n", line, focus, scale); if(!line || focus < 0.0 || focus > 1.0 || scale < 0.0 || scale > 1.0) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + /* we want 2 standard deviations */ + erf_range = 2.0 / sqrt(2); - return NotImplemented; + /* calculate the constants we need to normalize the error function to be + between 0.0 and scale over the range we need */ + min_erf = erf(-erf_range); + scale_erf = scale / (-2.0 * min_erf); + + if (focus != 0.0) + { + positions[0] = 0.0; + factors[0] = 0.0; + for (i=1; i<precision; i++) + { + positions[i] = focus * i / precision; + factors[i] = scale_erf * (erf(2 * erf_range * i / precision - erf_range) - min_erf); + } + num_points += precision; + } + + positions[num_points] = focus; + factors[num_points] = scale; + num_points += 1; + + if (focus != 1.0) + { + for (i=1; i<precision; i++) + { + positions[i+num_points-1] = (focus + ((1.0-focus) * i / precision)); + factors[i+num_points-1] = scale_erf * (erf(erf_range - 2 * erf_range * i / precision) - min_erf); + } + num_points += precision; + positions[num_points-1] = 1.0; + factors[num_points-1] = 0.0; + } + + return GdipSetLineBlend(line, factors, positions, num_points); } GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient *line,

1 0