December 2008 - Wine-commits

Christian Costa : winealsa.drv: Initialize correctly the header before adding it to the queue.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: c983cd6423038f2c4709ddf5f832296da0177694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c983cd6423038f2c4709ddf5f… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Dec 18 21:21:45 2008 +0100 winealsa.drv: Initialize correctly the header before adding it to the queue. --- dlls/winealsa.drv/midi.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index cabe9e2..bcb39cd 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -578,7 +578,10 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) return MIDIERR_UNPREPARED; EnterCriticalSection(&crit_sect); + lpMidiHdr->dwFlags &= ~WHDR_DONE; lpMidiHdr->dwFlags |= MHDR_INQUEUE; + lpMidiHdr->dwBytesRecorded = 0; + lpMidiHdr->lpNext = 0; if (MidiInDev[wDevID].lpQueueHdr == 0) { MidiInDev[wDevID].lpQueueHdr = lpMidiHdr; } else {

1 0

Nikolay Sivov : ole32: Make OleSetClipboard affected by previous OleInitialize() calls.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 0eeb042067fde019d02674858cef2241ed8231b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eeb042067fde019d02674858… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Dec 18 23:20:35 2008 +0300 ole32: Make OleSetClipboard affected by previous OleInitialize() calls. --- dlls/ole32/clipboard.c | 9 +++++++++ dlls/ole32/tests/clipboard.c | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 5320988..762afc7 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -78,6 +78,8 @@ #include "storage32.h" +#include "compobj_private.h" + #define HANDLE_ERROR(err) { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; } WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -313,6 +315,7 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) IEnumFORMATETC* penumFormatetc = NULL; FORMATETC rgelt; BOOL bClipboardOpen = FALSE; + struct oletls *info = COM_CurrentInfo(); /* HGLOBAL hDataObject = 0; OLEClipbrd **ppDataObject; @@ -320,6 +323,12 @@ HRESULT WINAPI OleSetClipboard(IDataObject* pDataObj) TRACE("(%p)\n", pDataObj); + if(!info) + WARN("Could not allocate tls\n"); + else + if(!info->ole_inits) + return CO_E_NOTINITIALIZED; + /* * Make sure we have a clipboard object */ diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index e714064..7e3809e 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -439,12 +439,10 @@ static void test_set_clipboard(void) return; hr = OleSetClipboard(data1); - todo_wine ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard should have failed with CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); CoInitialize(NULL); hr = OleSetClipboard(data1); - todo_wine ok(hr == CO_E_NOTINITIALIZED || hr == CLIPBRD_E_CANT_SET, /* win9x */ "OleSetClipboard should have failed with "

1 0

Juan Lang : crypt32: Make a function static.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: a29ba27361ab9d175e5e8c4c2f8be41d4a7a0da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29ba27361ab9d175e5e8c4c2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 14:50:56 2008 -0800 crypt32: Make a function static. --- dlls/crypt32/context.c | 2 +- dlls/crypt32/crypt32_private.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index fa08581..fa7922f 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -288,7 +288,7 @@ void ContextList_Delete(struct ContextList *list, void *context) list->contextInterface->free(context); } -void ContextList_Empty(struct ContextList *list) +static void ContextList_Empty(struct ContextList *list) { struct list *entry, *next; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index b0f6101..46d4797 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -379,8 +379,6 @@ void *ContextList_Enum(struct ContextList *list, void *pPrev); void ContextList_Delete(struct ContextList *list, void *context); -void ContextList_Empty(struct ContextList *list); - void ContextList_Free(struct ContextList *list); /**

1 0

Andrew Talbot : kernel32: Remove unused Wine debug channel.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: a1e31e580ef69354d17ee7e39f66a3f094195e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e31e580ef69354d17ee7e39… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 18 20:19:49 2008 +0000 kernel32: Remove unused Wine debug channel. --- dlls/kernel32/fiber.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index fda5f92..f828cdc 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -34,9 +34,6 @@ #include "winternl.h" #include "wine/exception.h" #include "wine/library.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(fiber); struct fiber_data {

1 0

Andrew Talbot : jscript: Remove unused Wine debug channel.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: ebf3a680c71c18a6610ea7cd4658783e938c39e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf3a680c71c18a6610ea7cd4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 18 20:19:45 2008 +0000 jscript: Remove unused Wine debug channel. --- dlls/jscript/parser.y | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 9f3b6d4..96ba29c 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -21,10 +21,6 @@ #include "jscript.h" #include "engine.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); - #define YYLEX_PARAM ctx #define YYPARSE_PARAM ctx

1 0

Hwang YunSong(황윤성) : oleview: Updated Korean resource.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: a4a64dc6ef21525968fe59dfb81ff6976a32b05e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a64dc6ef21525968fe59dfb… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Dec 15 09:51:10 2008 +0900 oleview: Updated Korean resource. --- programs/oleview/Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/oleview/Ko.rc b/programs/oleview/Ko.rc index 94d5a53..23d88bd 100644 --- a/programs/oleview/Ko.rc +++ b/programs/oleview/Ko.rc @@ -98,7 +98,7 @@ STRINGTABLE IDS_ABOUTVER "�� 1.0" IDS_TYPELIBTITLE "ITypeLib ��" IDS_OPEN "��" - IDS_OPEN_TYPELIB_FILTER "TypeLib Files (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" + IDS_OPEN_TYPELIB_FILTER "TypeLib �� (*.tlb;*.olb;*.dll;*.ocx;*.exe)\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0All Files (*.*)\0*.*\0\0" IDM_BIND, "�� " IDM_TYPELIB, "Ÿ�� ̺귯�� "

1 0

Andrew Talbot : ole32: Remove unused Wine debug channel.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 96d7c6e2ea00056c830554b4617d4b3c0d3ef6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d7c6e2ea00056c830554b46… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 18 20:19:58 2008 +0000 ole32: Remove unused Wine debug channel. --- dlls/ole32/oleproxy.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index dfc3bc1..11a3ad1 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -41,10 +41,6 @@ #include "moniker.h" #include "comcat.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ole); - /*********************************************************************** * DllGetClassObject [OLE32.@] */

1 0

Andrew Talbot : msvcrt40: Remove unused Wine debug channel.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: bebbc4b7808cb1880a360990f885c5875becc10c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebbc4b7808cb1880a360990f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 18 20:19:55 2008 +0000 msvcrt40: Remove unused Wine debug channel. --- dlls/msvcrt40/msvcrt40.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt40/msvcrt40.c b/dlls/msvcrt40/msvcrt40.c index 48e4af0..f178ea0 100644 --- a/dlls/msvcrt40/msvcrt40.c +++ b/dlls/msvcrt40/msvcrt40.c @@ -22,9 +22,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcrt40); BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) {

1 0

Andrew Talbot : msvcr71: Remove unused Wine debug channel.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: c1526fd33a227f7d00da64423b91759392c3c64a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1526fd33a227f7d00da64423… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 18 20:19:52 2008 +0000 msvcr71: Remove unused Wine debug channel. --- dlls/msvcr71/msvcr71.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr71/msvcr71.c b/dlls/msvcr71/msvcr71.c index 3ada089..6134982 100644 --- a/dlls/msvcr71/msvcr71.c +++ b/dlls/msvcr71/msvcr71.c @@ -22,9 +22,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcr71); BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) {

1 0

Stefan Dösinger : wined3d: Use the ps_compile_args struct in glsl.
by Alexandre Julliard 19 Dec '08

19 Dec '08

Module: wine Branch: master Commit: 7d92b54a974027bcc9e7486d92c7da3c090a2cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d92b54a974027bcc9e7486d9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 15 19:31:52 2008 +0100 wined3d: Use the ps_compile_args struct in glsl. --- dlls/wined3d/glsl_shader.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 968acbb..59e3427 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -544,7 +544,8 @@ static void shader_glsl_update_float_pixel_constants(IWineD3DDevice *iface, UINT /** Generate the variable & register declarations for the GLSL output target */ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const shader_reg_maps *reg_maps, - SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info) + SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, + const struct ps_compile_args *ps_args) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; @@ -618,7 +619,7 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s ps_impl->numbumpenvmatconsts++; } - if(device->stateBlock->renderState[WINED3DRS_SRGBWRITEENABLE]) { + if(ps_args->srgb_correction) { shader_addline(buffer, "const vec4 srgb_mul_low = vec4(%f, %f, %f, %f);\n", srgb_mul_low, srgb_mul_low, srgb_mul_low, srgb_mul_low); shader_addline(buffer, "const vec4 srgb_comparison = vec4(%f, %f, %f, %f);\n", @@ -3633,16 +3634,11 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, SHADER_BU } /* Base Declarations */ - shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION); + shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, args); /* Pack 3.0 inputs */ - if (reg_maps->shader_version >= WINED3DPS_VERSION(3,0)) - { - if(((IWineD3DDeviceImpl *) This->baseShader.device)->strided_streams.u.s.position_transformed) { - pshader_glsl_input_pack(buffer, This->semantics_in, iface, pretransformed); - } else if(!use_vs((IWineD3DDeviceImpl *) This->baseShader.device)) { - pshader_glsl_input_pack(buffer, This->semantics_in, iface, fixedfunction); - } + if (reg_maps->shader_version >= WINED3DPS_VERSION(3,0) && args->vp_mode != vertexshader) { + pshader_glsl_input_pack(buffer, This->semantics_in, iface, args->vp_mode); } /* Base Shader Body */ @@ -3708,7 +3704,7 @@ static void shader_glsl_generate_vshader(IWineD3DVertexShader *iface, SHADER_BUF shader_addline(buffer, "#version 120\n"); /* Base Declarations */ - shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION); + shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, NULL); /* Base Shader Body */ shader_generate_main( (IWineD3DBaseShader*) This, buffer, reg_maps, function);

1 0