January 2009 - Wine-commits

Allan Tong : wined3d: Add code to cleanup device multistate_funcs.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 29dd286d79fceff109e408503d8b221290362f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29dd286d79fceff109e408503… Author: Allan Tong <actong88(a)gmail.com> Date: Tue Jan 6 20:20:08 2009 -0500 wined3d: Add code to cleanup device multistate_funcs. --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/directx.c | 10 +++++++++- dlls/wined3d/state.c | 33 ++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fb9dd6e..ed343dd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -164,6 +164,13 @@ static ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) { TRACE("(%p) : Releasing from %d\n", This, refCount + 1); if (!refCount) { + UINT i; + + for (i = 0; i < sizeof(This->multistate_funcs)/sizeof(This->multistate_funcs[0]); ++i) { + HeapFree(GetProcessHeap(), 0, This->multistate_funcs[i]); + This->multistate_funcs[i] = NULL; + } + /* TODO: Clean up all the surfaces and textures! */ /* NOTE: You must release the parent if the object was created via a callback ** ***************************/ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 639b07e..b9a63ab 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3631,6 +3631,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, const struct fragment_pipeline *frag_pipeline = NULL; int i; struct fragment_caps ffp_caps; + HRESULT hr; /* Validate the adapter number. If no adapters are available(no GL), ignore the adapter * number and create a device without a 3D adapter for 2D only operation. @@ -3689,9 +3690,16 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, frag_pipeline->get_caps(DeviceType, &GLINFO_LOCATION, &ffp_caps); object->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; object->max_ffp_texture_stages = ffp_caps.MaxTextureBlendStages; - compile_state_table(object->StateTable, object->multistate_funcs, &GLINFO_LOCATION, + hr = compile_state_table(object->StateTable, object->multistate_funcs, &GLINFO_LOCATION, ffp_vertexstate_template, frag_pipeline, misc_state_template); + if (FAILED(hr)) { + IWineD3D_Release(object->wineD3D); + HeapFree(GetProcessHeap(), 0, object); + + return hr; + } + object->blitter = select_blit_implementation(Adapter, DeviceType); /* set the state of the device to valid */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index b054ee1..9d97283 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5488,7 +5488,7 @@ static void multistate_apply_3(DWORD state, IWineD3DStateBlockImpl *stateblock, stateblock->wineD3DDevice->multistate_funcs[state][2](state, stateblock, context); } -void compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, const WineD3D_GL_Info *gl_info, const struct StateEntryTemplate *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) { @@ -5520,6 +5520,7 @@ void compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_mul memset(set, 0, sizeof(set)); for(i = 0; cur[i].state; i++) { + APPLYSTATEFUNC *funcs_array; /* Only use the first matching state with the available extension from one template. * e.g. @@ -5552,17 +5553,24 @@ void compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_mul dev_multistate_funcs[cur[i].state] = HeapAlloc(GetProcessHeap(), 0, sizeof(**dev_multistate_funcs) * 2); + if (!dev_multistate_funcs[cur[i].state]) { + goto out_of_mem; + } + dev_multistate_funcs[cur[i].state][0] = multistate_funcs[cur[i].state][0]; dev_multistate_funcs[cur[i].state][1] = multistate_funcs[cur[i].state][1]; break; case 2: StateTable[cur[i].state].apply = multistate_apply_3; - HeapFree(GetProcessHeap(), 0, multistate_funcs[cur[i].state]); - dev_multistate_funcs[cur[i].state] = HeapAlloc(GetProcessHeap(), - 0, - sizeof(**dev_multistate_funcs) * 3); - dev_multistate_funcs[cur[i].state][0] = multistate_funcs[cur[i].state][0]; - dev_multistate_funcs[cur[i].state][1] = multistate_funcs[cur[i].state][1]; + funcs_array = HeapReAlloc(GetProcessHeap(), + 0, + dev_multistate_funcs[cur[i].state], + sizeof(**dev_multistate_funcs) * 3); + if (!funcs_array) { + goto out_of_mem; + } + + dev_multistate_funcs[cur[i].state] = funcs_array; dev_multistate_funcs[cur[i].state][2] = multistate_funcs[cur[i].state][2]; break; default: @@ -5578,5 +5586,16 @@ void compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_mul StateTable[cur[i].state].representative = cur[i].content.representative; } } + + return WINED3D_OK; + +out_of_mem: + for (i = 0; i <= STATE_HIGHEST; ++i) { + HeapFree(GetProcessHeap(), 0, dev_multistate_funcs[i]); + } + + memset(dev_multistate_funcs, 0, (STATE_HIGHEST + 1)*sizeof(*dev_multistate_funcs)); + + return E_OUTOFMEMORY; } #undef GLINFO_LOCATION diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 43b1ae0..11b8680 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -760,7 +760,7 @@ extern const struct fragment_pipeline nvts_fragment_pipeline; extern const struct fragment_pipeline nvrc_fragment_pipeline; /* "Base" state table */ -void compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, const WineD3D_GL_Info *gl_info, const struct StateEntryTemplate *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc);

1 0

Rico Schüller : wined3d: Add a checkGLcall() after glReadBuffer.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 5e79b0608d93546cac057ac6fcfe1e0f6c028849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e79b0608d93546cac057ac6f… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Jan 9 11:23:04 2009 +0100 wined3d: Add a checkGLcall() after glReadBuffer. --- dlls/wined3d/surface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 771291f..dea6c0a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -963,6 +963,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) TRACE("Locking offscreen render target\n"); ENTER_GL(); glReadBuffer(device->offscreenBuffer); + checkGLcall("glReadBuffer"); LEAVE_GL(); }

1 0

Rich Ercolani : winefile: Fix NULL pointer deref in read_tree.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: ae48e099dab2ec266598d2cb6f2704135e689e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae48e099dab2ec266598d2cb6… Author: Rich Ercolani <Rincebrain+wine(a)gmail.com> Date: Sat Jan 10 04:48:54 2009 -0500 winefile: Fix NULL pointer deref in read_tree. --- programs/winefile/winefile.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index b3e5471..2caff8e 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -3781,8 +3781,15 @@ static void refresh_child(ChildWnd* child) scan_entry(child, &child->root.entry, 0, child->hwnd); #ifdef _SHELL_FOLDERS + if (child->root.entry.etype == ET_SHELL) - entry = read_tree(&child->root, NULL, get_path_pidl(path,child->hwnd), drv, child->sortOrder, child->hwnd); + { + LPITEMIDLIST local_pidl = get_path_pidl(path,child->hwnd); + if (local_pidl) + entry = read_tree(&child->root, NULL, local_pidl , drv, child->sortOrder, child->hwnd); + else + entry = NULL; + } else #endif entry = read_tree(&child->root, path, NULL, drv, child->sortOrder, child->hwnd);

1 0

Ge van Geldorp : mshtml/tests: Skip a couple of tests when IE is running in Enhanced Security Configuration .
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: b67f0de1c64fcfc2fa6d6f5ce453b7b0f0323666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b67f0de1c64fcfc2fa6d6f5ce… Author: Ge van Geldorp <ge(a)gse.nl> Date: Thu Jan 8 13:34:42 2009 +0100 mshtml/tests: Skip a couple of tests when IE is running in Enhanced Security Configuration. --- dlls/mshtml/tests/dom.c | 27 ++++++++++++++++++++++++++- dlls/mshtml/tests/script.c | 33 +++++++++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 46136c1..03068d1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4001,6 +4001,27 @@ static void gecko_installer_workaround(BOOL disable) RegCloseKey(hkey); } +/* Check if Internet Explorer is configured to run in "Enhanced Security Configuration" (aka hardened mode) */ +/* Note: this code is duplicated in dlls/mshtml/tests/dom.c, dlls/mshtml/tests/script.c and dlls/urlmon/tests/misc.c */ +static BOOL is_ie_hardened() +{ + HKEY zone_map; + DWORD ie_harden, type, size; + + ie_harden = 0; + if(RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap", + 0, KEY_QUERY_VALUE, &zone_map) == ERROR_SUCCESS) { + size = sizeof(DWORD); + if (RegQueryValueEx(zone_map, "IEHarden", NULL, &type, (LPBYTE) &ie_harden, &size) != ERROR_SUCCESS || + type != REG_DWORD) { + ie_harden = 0; + } + RegCloseKey(zone_map); + } + + return ie_harden != 0; +} + START_TEST(dom) { gecko_installer_workaround(TRUE); @@ -4009,7 +4030,11 @@ START_TEST(dom) run_domtest(doc_str1, test_doc_elem); run_domtest(range_test_str, test_txtrange); run_domtest(range_test2_str, test_txtrange2); - run_domtest(elem_test_str, test_elems); + if (winetest_interactive || ! is_ie_hardened()) { + run_domtest(elem_test_str, test_elems); + }else { + skip("IE running in Enhanced Security Configuration\n"); + } run_domtest(doc_blank, test_create_elems); run_domtest(doc_blank, test_defaults); run_domtest(indent_test_str, test_indent); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 32f0974..30be52c 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1137,16 +1137,41 @@ static void gecko_installer_workaround(BOOL disable) RegCloseKey(hkey); } +/* Check if Internet Explorer is configured to run in "Enhanced Security Configuration" (aka hardened mode) */ +/* Note: this code is duplicated in dlls/mshtml/tests/dom.c, dlls/mshtml/tests/script.c and dlls/urlmon/tests/misc.c */ +static BOOL is_ie_hardened() +{ + HKEY zone_map; + DWORD ie_harden, type, size; + + ie_harden = 0; + if(RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap", + 0, KEY_QUERY_VALUE, &zone_map) == ERROR_SUCCESS) { + size = sizeof(DWORD); + if (RegQueryValueEx(zone_map, "IEHarden", NULL, &type, (LPBYTE) &ie_harden, &size) != ERROR_SUCCESS || + type != REG_DWORD) { + ie_harden = 0; + } + RegCloseKey(zone_map); + } + + return ie_harden != 0; +} + START_TEST(script) { gecko_installer_workaround(TRUE); CoInitialize(NULL); - if(register_script_engine()) { - test_simple_script(); - init_registry(FALSE); + if(winetest_interactive || ! is_ie_hardened()) { + if(register_script_engine()) { + test_simple_script(); + init_registry(FALSE); + }else { + skip("Could not register TestScript engine\n"); + } }else { - skip("Could not register TestScript engine\n"); + skip("IE running in Enhanced Security Configuration\n"); } CoUninitialize();

1 0

Ge van Geldorp : urlmon/tests: Skip a couple of tests when IE is running in Enhanced Security Configuration .
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 7f22f1c68df6f8a51f6d03a04c2027dec4056899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f22f1c68df6f8a51f6d03a04… Author: Ge van Geldorp <ge(a)gse.nl> Date: Thu Jan 8 13:34:42 2009 +0100 urlmon/tests: Skip a couple of tests when IE is running in Enhanced Security Configuration. --- dlls/urlmon/tests/misc.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 1de010d..b40341e 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -823,6 +823,27 @@ static void test_SecurityManager(void) IInternetSecurityManager_Release(secmgr); } +/* Check if Internet Explorer is configured to run in "Enhanced Security Configuration" (aka hardened mode) */ +/* Note: this code is duplicated in dlls/mshtml/tests/dom.c, dlls/mshtml/tests/script.c and dlls/urlmon/tests/misc.c */ +static BOOL is_ie_hardened() +{ + HKEY zone_map; + DWORD ie_harden, type, size; + + ie_harden = 0; + if(RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap", + 0, KEY_QUERY_VALUE, &zone_map) == ERROR_SUCCESS) { + size = sizeof(DWORD); + if (RegQueryValueEx(zone_map, "IEHarden", NULL, &type, (LPBYTE) &ie_harden, &size) != ERROR_SUCCESS || + type != REG_DWORD) { + ie_harden = 0; + } + RegCloseKey(zone_map); + } + + return ie_harden != 0; +} + static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManager *zonemgr, DWORD action) { DWORD res, size, policy, reg_policy; @@ -863,15 +884,19 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag ok(policy == reg_policy, "(%x) policy=%x, expected %x\n", action, policy, reg_policy); if(policy != URLPOLICY_QUERY) { - policy = 0xdeadbeef; - hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy, - sizeof(WCHAR), NULL, 0, 0, 0); - if(reg_policy == URLPOLICY_DISALLOW) - ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); - else - ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres); - ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); - } + if(winetest_interactive || ! is_ie_hardened()) { + policy = 0xdeadbeef; + hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy, + sizeof(WCHAR), NULL, 0, 0, 0); + if(reg_policy == URLPOLICY_DISALLOW) + ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); + else + ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres); + ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); + }else { + skip("IE running in Enhanced Security Configuration\n"); + } + } } static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZoneManager *zonemgr, DWORD action)

1 0

Vincent Povirk : winex11: Select StructureNotifyMask input on all windows.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 538cf8b847ed0a4ea0fbabce47846eb730dbb1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=538cf8b847ed0a4ea0fbabce4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Dec 15 18:47:24 2008 -0600 winex11: Select StructureNotifyMask input on all windows. --- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/window.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index e45b4e7..a5d2e85 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -803,7 +803,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if (!hwnd) return; if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->mapped || data->iconic) return; + if (!data->mapped || data->iconic || !data->managed) return; /* Get geometry */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index db34f20..99156b6 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -307,8 +307,9 @@ static int get_window_attributes( Display *display, struct x11drv_win_data *data attr->backing_store = NotUseful; attr->event_mask = (ExposureMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask | - KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask); - if (data->managed) attr->event_mask |= StructureNotifyMask | PropertyChangeMask; + KeyPressMask | KeyReleaseMask | FocusChangeMask | + KeymapStateMask | StructureNotifyMask); + if (data->managed) attr->event_mask |= PropertyChangeMask; return (CWOverrideRedirect | CWSaveUnder | CWColormap | CWCursor | CWEventMask | CWBitGravity | CWBackingStore);

1 0

Michael Stefaniuc : include: Change from long to LONG in the remaining DirectMusic headers.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: ad2dfca6ab7a07370bf879cfc4f845937668e15f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2dfca6ab7a07370bf879cfc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 10 02:45:24 2009 +0100 include: Change from long to LONG in the remaining DirectMusic headers. --- include/dmdls.h | 8 ++++---- include/dmusicc.h | 4 ++-- include/dmusicf.h | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/dmdls.h b/include/dmdls.h index e9f9501..b40ef88 100644 --- a/include/dmdls.h +++ b/include/dmdls.h @@ -25,10 +25,10 @@ /***************************************************************************** * Typedef definitions */ -typedef long GCENT; -typedef long PCENT; -typedef long PERCENT; -typedef long TCENT; +typedef LONG GCENT; +typedef LONG PCENT; +typedef LONG PERCENT; +typedef LONG TCENT; typedef LONGLONG REFERENCE_TIME, *LPREFERENCE_TIME; diff --git a/include/dmusicc.h b/include/dmusicc.h index c109a0f..7aac00b 100644 --- a/include/dmusicc.h +++ b/include/dmusicc.h @@ -330,7 +330,7 @@ struct _DMUS_SYNTHSTATS { DWORD dwCPUPerVoice; DWORD dwLostNotes; DWORD dwFreeMemory; - long lPeakVolume; + LONG lPeakVolume; }; struct _DMUS_SYNTHSTATS8 { @@ -341,7 +341,7 @@ struct _DMUS_SYNTHSTATS8 { DWORD dwCPUPerVoice; DWORD dwLostNotes; DWORD dwFreeMemory; - long lPeakVolume; + LONG lPeakVolume; DWORD dwSynthMemUse; }; diff --git a/include/dmusicf.h b/include/dmusicf.h index d4aa48b..6906ecc 100644 --- a/include/dmusicf.h +++ b/include/dmusicf.h @@ -627,7 +627,7 @@ struct _DMUS_IO_COMMAND { struct _DMUS_IO_TOOL_HEADER { GUID guidClassID; - long lIndex; + LONG lIndex; DWORD cPChannels; FOURCC ckid; FOURCC fccType; @@ -685,12 +685,12 @@ struct _DMUS_IO_WAVE_HEADER { }; struct _DMUS_IO_WAVE_TRACK_HEADER { - long lVolume; + LONG lVolume; DWORD dwFlags; }; struct _DMUS_IO_WAVE_PART_HEADER { - long lVolume; + LONG lVolume; DWORD dwVariations; DWORD dwPChannel; DWORD dwLockToPart; @@ -699,8 +699,8 @@ struct _DMUS_IO_WAVE_PART_HEADER { }; struct _DMUS_IO_WAVE_ITEM_HEADER { - long lVolume; - long lPitch; + LONG lVolume; + LONG lPitch; DWORD dwVariations; REFERENCE_TIME rtTime; REFERENCE_TIME rtStartOffset;

1 0

Michael Stefaniuc : widl: Move "inline" right after the storage class specifier.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 91922973454fa38354f57c464819da9a1daafe26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91922973454fa38354f57c464… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 10 02:43:54 2009 +0100 widl: Move "inline" right after the storage class specifier. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7d2b751..2b0e414 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1271,7 +1271,7 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) *tfsoff += 2; } -static unsigned char inline make_signed(unsigned char fc) +static inline unsigned char make_signed(unsigned char fc) { switch(fc) {

1 0

Michael Stefaniuc : include: Use LONG instead of long in dmusics. h for Win64 compatibility.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: ca91850a30f884209f9a9261a4ac7e5b510f8afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca91850a30f884209f9a9261a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 10 02:45:10 2009 +0100 include: Use LONG instead of long in dmusics.h for Win64 compatibility. --- dlls/dmsynth/synth.c | 4 ++-- include/dmusics.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index c85b711..fe960ca 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -172,9 +172,9 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetAppend (LPDIRECTMUSICSYNTH8 ifac } /* IDirectMusicSynth8Impl IDirectMusicSynth8 part: */ -static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, long prPitch, long vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) { +static HRESULT WINAPI IDirectMusicSynth8Impl_PlayVoice (LPDIRECTMUSICSYNTH8 iface, REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, LONG prPitch, LONG vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) { IDirectMusicSynth8Impl *This = (IDirectMusicSynth8Impl *)iface; - FIXME("(%p, 0x%s, %d, %d, %d, %d, %li, %li,0x%s, 0x%s, 0x%s): stub\n", + FIXME("(%p, 0x%s, %d, %d, %d, %d, %i, %i,0x%s, 0x%s, 0x%s): stub\n", This, wine_dbgstr_longlong(rt), dwVoiceId, dwChannelGroup, dwChannel, dwDLId, prPitch, vrVolume, wine_dbgstr_longlong(stVoiceStart), wine_dbgstr_longlong(stLoopStart), wine_dbgstr_longlong(stLoopEnd)); return S_OK; diff --git a/include/dmusics.h b/include/dmusics.h index 779b4c6..7d48e93 100644 --- a/include/dmusics.h +++ b/include/dmusics.h @@ -156,7 +156,7 @@ DECLARE_INTERFACE_(IDirectMusicSynth8,IDirectMusicSynth) STDMETHOD(GetFormat)(THIS_ LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSiz) PURE; STDMETHOD(GetAppend)(THIS_ DWORD *pdwAppend) PURE; /*** IDirectMusicSynth8 methods ***/ - STDMETHOD(PlayVoice)(THIS_ REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, long prPitch, long vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) PURE; + STDMETHOD(PlayVoice)(THIS_ REFERENCE_TIME rt, DWORD dwVoiceId, DWORD dwChannelGroup, DWORD dwChannel, DWORD dwDLId, LONG prPitch, LONG vrVolume, SAMPLE_TIME stVoiceStart, SAMPLE_TIME stLoopStart, SAMPLE_TIME stLoopEnd) PURE; STDMETHOD(StopVoice)(THIS_ REFERENCE_TIME rt, DWORD dwVoiceId) PURE; STDMETHOD(GetVoiceState)(THIS_ DWORD dwVoice[], DWORD cbVoice, DMUS_VOICE_STATE dwVoiceState[]) PURE; STDMETHOD(Refresh)(THIS_ DWORD dwDownloadID, DWORD dwFlags) PURE;

1 0

Michael Stefaniuc : include: Change to LONG/ULONG in xcmc. h for Win64 compatibility.
by Alexandre Julliard 10 Jan '09

10 Jan '09

Module: wine Branch: master Commit: 3e948a838497fd673bd1fb848ffc1b2681cb71d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e948a838497fd673bd1fb848… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Jan 10 02:45:44 2009 +0100 include: Change to LONG/ULONG in xcmc.h for Win64 compatibility. --- include/xcmc.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/xcmc.h b/include/xcmc.h index 2cb1d1f..ceca1e4 100644 --- a/include/xcmc.h +++ b/include/xcmc.h @@ -25,9 +25,9 @@ extern "C" { typedef char CMC_sint8; typedef short CMC_sint16; -typedef long int CMC_sint32; +typedef LONG CMC_sint32; typedef unsigned short int CMC_uint16; -typedef unsigned long int CMC_uint32; +typedef ULONG CMC_uint32; typedef void* CMC_buffer; typedef char* CMC_string;

1 0